diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-11-04 18:37:11 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-11-04 18:37:11 +0000 |
| commit | 23ef4c4f7903eff3c35fa58536b271cb03f5a170 (patch) | |
| tree | 9769961ede23125055d21dc5df1819c557bb5bf9 /pkgs | |
| parent | 4c0ff006f32f3444176cedca5cf834e0d992846f (diff) | |
* Before selecting an attribute from `x', check whether it's an
attribute set. `tryEval' no longer catches this. svn path=/nixpkgs/trunk/; revision=18113
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/top-level/release.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index f04dac4f7dceb..ad5e85c357562 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -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 |