From 23ef4c4f7903eff3c35fa58536b271cb03f5a170 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 4 Nov 2009 18:37:11 +0000 Subject: [PATCH] * Before selecting an attribute from `x', check whether it's an attribute set. `tryEval' no longer catches this. svn path=/nixpkgs/trunk/; revision=18113 --- pkgs/top-level/release.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index f04dac4f7dce..ad5e85c35756 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