Author: sandervanderburg
Date: Mon Aug 2 16:48:19 2010
New Revision: 22887
URL: https://svn.nixos.org/websvn/nix/?rev=22887&sc=1
Log:
It seems that lib.zip is already taken from attributesets, therefore renaming
it to zipTwoLists
Modified:
nixpkgs/trunk/pkgs/lib/lists.nix
Modified: nixpkgs/trunk/pkgs/lib/lists.nix
==============================================================================
--- nixpkgs/trunk/pkgs/lib/lists.nix Mon Aug 2 16:31:05 2010 (r22886)
+++ nixpkgs/trunk/pkgs/lib/lists.nix Mon Aug 2 16:48:19 2010 (r22887)
@@ -178,9 +178,9 @@
loop list;
# Zip two lists together.
- zip = xs: ys:
+ zipTwoLists = xs: ys:
if xs != [] && ys != [] then
[ {first = head xs; second = head ys;} ]
- ++ zip (tail xs) (tail ys)
+ ++ zipTwoLists (tail xs) (tail ys)
else [];
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
