From b5b0c6896b178f4d0aa35d3fd1dc5ae5c21c691f Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Mon, 3 Feb 2025 11:38:58 +0100 Subject: [PATCH 1/2] matomo: ignore prereleases in updateScript --- pkgs/by-name/ma/matomo/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ma/matomo/package.nix b/pkgs/by-name/ma/matomo/package.nix index ba607cbd1c1f0..9b745dc559f80 100644 --- a/pkgs/by-name/ma/matomo/package.nix +++ b/pkgs/by-name/ma/matomo/package.nix @@ -95,6 +95,8 @@ stdenv.mkDerivation (finalAttrs: { extraArgs = [ "--url" "https://github.com/matomo-org/matomo" + "--version-regex" + "^(\\d+\\.\\d+\\.\\d+)$" ]; }; tests = lib.optionalAttrs stdenv.hostPlatform.isLinux { From 37d8d3a6987a0437da138bc14f2490510adbc101 Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Mon, 3 Feb 2025 12:30:41 +0100 Subject: [PATCH 2/2] matomo: make src overridable --- pkgs/by-name/ma/matomo/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/matomo/package.nix b/pkgs/by-name/ma/matomo/package.nix index 9b745dc559f80..7fa7a96481836 100644 --- a/pkgs/by-name/ma/matomo/package.nix +++ b/pkgs/by-name/ma/matomo/package.nix @@ -7,12 +7,14 @@ nixosTests, nix-update-script, }: - +let + fetchurl' = lib.makeOverridable fetchurl; +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="; };