Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

matomo: 3.11.0 -> 3.13.0 #74319

Merged
merged 1 commit into from Dec 6, 2019
Merged

matomo: 3.11.0 -> 3.13.0 #74319

merged 1 commit into from Dec 6, 2019

Conversation

@Kiwi
Copy link
Contributor

@Kiwi Kiwi commented Nov 27, 2019

Motivation for this change

The long awaited update to Matomo 3.12.0 has finally arrived! Here it comes... wait what do you mean you missed it?! Oh no, too slow! Well here's 3.13.0 instead!

Things done

I checked out this other PR before I made these additional changes. Now that one is clearly inferior at this point and should be closed in favor of this one so that I don't have to redo everything. 馃槃

I had to add an additional file to the list to fix; and then add in a check to keep the builds succeeding. The matomo-beta would fail when wc tried to count a non-existent file that is only in the latest and greatest. No file? No problem! nop!
I also removed the recently (within the last few months, I'm sure) deprecated PermissionsStartOnly; and while I'm not certain that there aren't additional necessary changes that I am unaware of I do know I've been running it in production...

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @florianjacob @aanderse @dasJ @Kiwi

@aanderse
Copy link
Contributor

@aanderse aanderse commented Nov 27, 2019

@Kiwi please rebase as I merged the PR for your first commit.

@Kiwi Kiwi force-pushed the Kiwi:matomo-consistency-3.13.0 branch from 816d00b to 2da6f99 Nov 27, 2019
@ofborg ofborg bot removed the 8.has: documentation label Nov 28, 2019
@Kiwi
Copy link
Contributor Author

@Kiwi Kiwi commented Nov 28, 2019

@Kiwi please rebase as I merged the PR for your first commit.

You just love to make me work don't you :P

@Kiwi Kiwi force-pushed the Kiwi:matomo-consistency-3.13.0 branch from 2da6f99 to 5594fdf Dec 2, 2019
@ajs124
ajs124 approved these changes Dec 2, 2019
Copy link
Contributor

@Lassulus Lassulus left a comment

tested with nix-review

@Lassulus Lassulus merged commit 42d815d into NixOS:master Dec 6, 2019
16 checks passed
16 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
matomo on aarch64-linux Success
Details
matomo on x86_64-darwin Success
Details
matomo on x86_64-linux Success
Details
Copy link
Contributor

@florianjacob florianjacob left a comment

Thanks to all for testing that Matomo 3.13 indeed fixes our problems with 3.12. Let's rework and rethink PermissionsStartOnly / the PreStart script later. I did not know of stateVersion at the time which would have been the right thing to do, but we can probably start to just drop the migration code and maybe even the piwik aliases by now as 19.09 is the second stable release with the renaming.

florianjacob added a commit to florianjacob/nixpkgs that referenced this pull request Dec 11, 2019
backport of NixOS#74319 without the file consistency checks.
3.12 was rated a major security update but was broken for NixOS, therefore jump to 3.13 which incorporates the necessary fix.
@florianjacob florianjacob mentioned this pull request Dec 11, 2019
4 of 10 tasks complete
florianjacob added a commit to florianjacob/nixpkgs that referenced this pull request Dec 11, 2019
backport of NixOS#74319 without the file consistency checks.
3.12 was rated a major security update but was broken for NixOS, therefore jump to 3.13 which incorporates the necessary fix.
@florianjacob florianjacob mentioned this pull request Dec 11, 2019
4 of 10 tasks complete
FRidh added a commit that referenced this pull request Dec 11, 2019
backport of #74319 without the file consistency checks.
3.12 was rated a major security update but was broken for NixOS, therefore jump to 3.13 which incorporates the necessary fix.
@Kiwi Kiwi deleted the Kiwi:matomo-consistency-3.13.0 branch Jan 10, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can鈥檛 perform that action at this time.