eval-release.nix: Handle the new job structure
Now that we don't need to pass "system" arguments anymore, this thing is *almost* obsolete. (Except for the need to handle assertion failures, you could just do "nix-instantiate --eval-only ..." on release.nix.)
This commit is contained in:
parent
78de3c912d
commit
993fc7206d
@ -7,26 +7,18 @@ with import ../../pkgs/lib;
|
|||||||
let
|
let
|
||||||
trace = if builtins.getEnv "VERBOSE" == "1" then builtins.trace else (x: y: y);
|
trace = if builtins.getEnv "VERBOSE" == "1" then builtins.trace else (x: y: y);
|
||||||
|
|
||||||
rel = removeAttrs (import ../../pkgs/top-level/release.nix) [ "tarball" "xbursttools" ];
|
rel = removeAttrs (import ../../pkgs/top-level/release.nix { }) [ "tarball" "unstable" "xbursttools" ];
|
||||||
|
|
||||||
seqList = xs: res: fold (x: xs: seq x xs) res xs;
|
|
||||||
|
|
||||||
strictAttrs = as: seqList (attrValues as) as;
|
|
||||||
|
|
||||||
maybe = as: let y = builtins.tryEval (strictAttrs as); in if y.success then y.value else builtins.trace "FAIL" {};
|
|
||||||
|
|
||||||
call = attrs: flip mapAttrs attrs
|
|
||||||
(n: v: trace n (
|
|
||||||
if builtins.isFunction v then maybe (v { system = "x86_64-linux"; })
|
|
||||||
else if builtins.isAttrs v then call v
|
|
||||||
else null
|
|
||||||
));
|
|
||||||
|
|
||||||
# Add the ‘recurseForDerivations’ attribute to ensure that
|
# Add the ‘recurseForDerivations’ attribute to ensure that
|
||||||
# nix-instantiate recurses into nested attribute sets.
|
# nix-instantiate recurses into nested attribute sets.
|
||||||
recurse = attrs:
|
recurse = attrs:
|
||||||
if isDerivation attrs
|
if (builtins.tryEval attrs).success then
|
||||||
then attrs
|
if isDerivation attrs
|
||||||
else { recurseForDerivations = true; } // mapAttrs (n: v: recurse v) attrs;
|
then
|
||||||
|
if (builtins.tryEval attrs.outPath).success
|
||||||
|
then attrs
|
||||||
|
else { }
|
||||||
|
else { recurseForDerivations = true; } // mapAttrs (n: v: recurse v) attrs
|
||||||
|
else { };
|
||||||
|
|
||||||
in recurse (call rel)
|
in recurse rel
|
||||||
|
Loading…
Reference in New Issue
Block a user