Author: raskin
Date: Fri Sep 3 08:15:45 2010
New Revision: 23608
URL: https://svn.nixos.org/websvn/nix/?rev=23608&sc=1
Log:
Adding a list-in-list checker for builderDefs closePropagation
Modified:
nixpkgs/branches/stdenv-updates/pkgs/lib/misc.nix
Modified: nixpkgs/branches/stdenv-updates/pkgs/lib/misc.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/lib/misc.nix Fri Sep 3 07:16:57
2010 (r23607)
+++ nixpkgs/branches/stdenv-updates/pkgs/lib/misc.nix Fri Sep 3 08:15:45
2010 (r23608)
@@ -215,11 +215,15 @@
innerClosePropagation = ready: list: if list == [] then ready else
- innerClosePropagation
- (ready ++ [(head list)])
- ((tail list)
- ++ (maybeAttrNullable "propagatedBuildInputs" [] (head list))
- ++ (maybeAttrNullable "propagatedBuildNativeInputs" [] (head list)));
+ if ! isAttrs (head list) then
+ builtins.trace ("not an attrSet: ${lib.showVal (head list)}")
+ innerClosePropagation ready (tail list)
+ else
+ innerClosePropagation
+ (ready ++ [(head list)])
+ ((tail list)
+ ++ (maybeAttrNullable "propagatedBuildInputs" [] (head list))
+ ++ (maybeAttrNullable "propagatedBuildNativeInputs" [] (head
list)));
closePropagation = list: (uniqList {inputList = (innerClosePropagation []
list);});
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
