diff --git a/pkgs/by-name/ha/hare/package.nix b/pkgs/by-name/ha/hare/package.nix index c809d73c3897..763d8638fd58 100644 --- a/pkgs/by-name/ha/hare/package.nix +++ b/pkgs/by-name/ha/hare/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromSourcehut, harec, - gitUpdater, scdoc, tzdata, mailcap, @@ -154,7 +153,6 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - updateScript = gitUpdater { }; tests = lib.optionalAttrs enableCrossCompilation { crossCompilation = callPackage ./cross-compilation-tests.nix { hare = finalAttrs.finalPackage; }; diff --git a/pkgs/by-name/ha/harec/package.nix b/pkgs/by-name/ha/harec/package.nix index 692ea76cb89e..c80e8cb0126b 100644 --- a/pkgs/by-name/ha/harec/package.nix +++ b/pkgs/by-name/ha/harec/package.nix @@ -1,4 +1,5 @@ { + _experimental-update-script-combinators, fetchFromSourcehut, gitUpdater, lib, @@ -52,7 +53,19 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - updateScript = gitUpdater { }; + updateScript = _experimental-update-script-combinators.sequence ( + builtins.map (item: item.command) [ + (gitUpdater { + attrPath = "harec"; + ignoredVersions = [ "-rc[0-9]{1,}" ]; + }) + (gitUpdater { + attrPath = "hare"; + url = "https://git.sr.ht/~sircmpwn/hare"; + ignoredVersions = [ "-rc[0-9]{1,}" ]; + }) + ] + ); # To be kept in sync with the hare package. inherit qbe; };