Skip to content

matomo: ignore prereleases in updateScript and make src overridable#379069

Closed
niklaskorz wants to merge 2 commits intoNixOS:masterfrom
niklaskorz:push-vllxkxpkoyur
Closed

matomo: ignore prereleases in updateScript and make src overridable#379069
niklaskorz wants to merge 2 commits intoNixOS:masterfrom
niklaskorz:push-vllxkxpkoyur

Conversation

@niklaskorz
Copy link
Member

@niklaskorz niklaskorz commented Feb 3, 2025

The update script now does its job as seen in #378885, but currently also updates to pre-releases. This is fixed by adding the --version-regex parameter to the update script.

I also noticed today that fetchurl is not overrideable by default (see #158018), which makes the matomo-beta example in #374022 not work.
This is fixed by applying lib.makeOverridable to fetchurl.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Feb 3, 2025
@niklaskorz niklaskorz changed the title matomo: ignore prereleases in updateScript matomo: ignore prereleases in updateScript and make src overrideable Feb 3, 2025
@niklaskorz niklaskorz changed the title matomo: ignore prereleases in updateScript and make src overrideable matomo: ignore prereleases in updateScript and make src overridable Feb 3, 2025
}:

let
fetchurl' = lib.makeOverridable fetchurl;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any reason fetchurl isn't overridable in the first place?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a pending PR in #158018

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To be clear, I don't exactly want fetchurl' = lib.makeOverridable fetchurl to become a widespread pattern, but seeing we removed matomo-beta in unstable, I think in this particular case we still want to make it easy to override the matomo src before that PR lands.

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one person. label Feb 18, 2025
@niklaskorz niklaskorz closed this Feb 20, 2025
@niklaskorz niklaskorz deleted the push-vllxkxpkoyur branch February 20, 2025 17:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants