-
-
Notifications
You must be signed in to change notification settings - Fork 14.7k
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’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
matomo: refactor, matomo-beta: remove #374022
base: master
Are you sure you want to change the base?
Conversation
8a133e3
to
4e557b0
Compare
726b78d
to
36d489d
Compare
The large test changes might clash with #373894, let's see how this goes. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Code LGTM, still waiting for the aarch64 CI runs.
If you prefer I can undo most test-related changes and only apply the removal of matomo-beta to the tests. |
@niklaskorz Let's keep your test-related changes, the test diff for #373894 is pretty small. So if we commit to merging this PR first, I can rebase and adjust my PR. |
Although, now that I think of it, #373894 might be a bit more urgent and it's important that it can be backported to 24.11. Because the matomo-5.2.x there currently is affected by the issue fixed there. |
In that case feel free to merge that first and I can rebase this PR afterwards. I'll also review your PR in a moment. |
cb4d84d
to
50b42fe
Compare
Rebased and resolved conflicts with changes from #373894 |
50b42fe
to
7c2e8f1
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks!
matomo.overrideAttrs
, e.g.:Once this is merged, I will make a follow-up PR on release-24.11 to make automatic backports possible again, as the last few updates had to be manually backported due to the rename of
matomo_5
tomatomo
.Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Add a 👍 reaction to pull requests you find important.