hare: use _experimental-update-script-combinators

This commit is contained in:
Coutinho de Souza 2024-08-08 15:56:40 -03:00
parent b7e1f2fbc8
commit 8cd47cdd7d
No known key found for this signature in database
GPG Key ID: 59081FCB8F9AABB5
2 changed files with 14 additions and 3 deletions

View File

@ -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; };

View File

@ -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;
};