Skip to content

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

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.

Sign up for GitHub

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

Closed
niklaskorz wants to merge 2 commits into from
Closed

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5b0c68
matomo: ignore prereleases in updateScript
niklaskorz Feb 3, 2025
37d8d3a
matomo: make src overridable
niklaskorz Feb 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions pkgs/by-name/ma/matomo/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@
nixosTests,
nix-update-script,
}:

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

@Ma27 Ma27 Feb 11, 2025

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

@niklaskorz niklaskorz Feb 11, 2025

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

@niklaskorz niklaskorz Feb 11, 2025

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.

in
stdenv.mkDerivation (finalAttrs: {
pname = "matomo";
version = "5.2.2";

src = fetchurl {
src = fetchurl' {
url = "https://builds.matomo.org/matomo-${finalAttrs.version}.tar.gz";
hash = "sha256-ZEwz/KKZZwTFsKfwR0iKZM1ta4CUXJsWgBXika+pjb0=";
};
Expand Down Expand Up @@ -95,6 +97,8 @@ stdenv.mkDerivation (finalAttrs: {
extraArgs = [
"--url"
"https://github.com/matomo-org/matomo"
"--version-regex"
"^(\\d+\\.\\d+\\.\\d+)$"
];
};
tests = lib.optionalAttrs stdenv.hostPlatform.isLinux {
Expand Down