mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 23:13:19 +00:00
hare: use _experimental-update-script-combinators
This commit is contained in:
parent
b7e1f2fbc8
commit
8cd47cdd7d
@ -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; };
|
||||
|
@ -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;
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user