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:
Eelco Dolstra 2013-03-26 11:53:36 +01:00
parent 78de3c912d
commit 993fc7206d

View File

@ -7,26 +7,18 @@ with import ../../pkgs/lib;
let
trace = if builtins.getEnv "VERBOSE" == "1" then builtins.trace else (x: y: y);
rel = removeAttrs (import ../../pkgs/top-level/release.nix) [ "tarball" "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
));
rel = removeAttrs (import ../../pkgs/top-level/release.nix { }) [ "tarball" "unstable" "xbursttools" ];
# Add the recurseForDerivations attribute to ensure that
# nix-instantiate recurses into nested attribute sets.
recurse = attrs:
if isDerivation attrs
then attrs
else { recurseForDerivations = true; } // mapAttrs (n: v: recurse v) attrs;
if (builtins.tryEval attrs).success then
if isDerivation 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