public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Before selecting an attribute from `x', check whether it's an 

attribute set.  `tryEval' no longer catches this.

svn path=/nixpkgs/trunk/; revision=18113
This commit is contained in:
Eelco Dolstra 2009-11-04 18:37:11 +00:00
parent 4c0ff006f3
commit 23ef4c4f79
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/top-level/release.nix
View File

@ -38,8 +38,9 @@ let
packagesWithMetaPlatform = attrSet:
if builtins ? tryEval then
let pairs = pkgs.lib.concatMap
(x: let val = builtins.tryEval (processPackage (builtins.getAttr x attrSet)); in
if val.success && val.value != [] then [{name=x; value=val.value;}] else [])
(x:
let val = builtins.tryEval (processPackage (builtins.getAttr x attrSet)); in
if builtins.isAttrs x && val.success && val.value != [] then [{name=x; value=val.value;}] else [])
(builtins.attrNames attrSet);
in
builtins.listToAttrs pairs