diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-01-12 16:59:58 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-01-12 16:59:58 +0000 |
commit | d62848cd2c4bf3d20c92782b89d90739df5e9e8c (patch) | |
tree | 579d96e26e479f0a0ead49abcf05677e43502e5f /maintainers | |
parent | c3cf936ff12d174720830aa0aa78ebaa9de95449 (diff) | |
download | nixpkgs-d62848cd2c4bf3d20c92782b89d90739df5e9e8c.tar nixpkgs-d62848cd2c4bf3d20c92782b89d90739df5e9e8c.tar.gz nixpkgs-d62848cd2c4bf3d20c92782b89d90739df5e9e8c.tar.bz2 nixpkgs-d62848cd2c4bf3d20c92782b89d90739df5e9e8c.tar.lz nixpkgs-d62848cd2c4bf3d20c92782b89d90739df5e9e8c.tar.xz nixpkgs-d62848cd2c4bf3d20c92782b89d90739df5e9e8c.tar.zst nixpkgs-d62848cd2c4bf3d20c92782b89d90739df5e9e8c.zip |
* eval-release.nix: force nix-instantiate to include nested attribute
sets. svn path=/nixpkgs/trunk/; revision=31500
Diffstat (limited to 'maintainers')
-rw-r--r-- | maintainers/scripts/eval-release.nix | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/maintainers/scripts/eval-release.nix b/maintainers/scripts/eval-release.nix index 3d4458699c7..836e4312c44 100644 --- a/maintainers/scripts/eval-release.nix +++ b/maintainers/scripts/eval-release.nix @@ -2,23 +2,30 @@ # attribute with the expected `system' argument). Too bad # nix-instantiate can't to do this. -let +with import ../../pkgs/lib; - lib = (import ../.. {}).lib; +let rel = removeAttrs (import ../../pkgs/top-level/release.nix) [ "tarball" "xbursttools" ]; - seqList = xs: res: lib.fold (x: xs: lib.seq x xs) res xs; + seqList = xs: res: fold (x: xs: seq x xs) res xs; - strictAttrs = as: seqList (lib.attrValues as) as; + 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" null; - call = attrs: lib.flip lib.mapAttrs attrs - (n: v: builtins.trace n ( + call = attrs: flip mapAttrs attrs + (n: v: /* builtins.trace n */ ( if builtins.isFunction v then maybe (v { system = "i686-linux"; }) else if builtins.isAttrs v then call v else null )); -in call rel + # 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; + +in recurse (call rel) |