From 1e9dc2b2543084a8d2950c9a2d62edfb1a1ff516 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Mon, 2 Aug 2010 16:48:19 +0000
Subject: [PATCH] It seems that lib.zip is already taken from attributesets,
 therefore renaming it to zipTwoLists

svn path=/nixpkgs/trunk/; revision=22887
---
 pkgs/lib/lists.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/lib/lists.nix b/pkgs/lib/lists.nix
index e279d6a80f47..36fa236304da 100644
--- a/pkgs/lib/lists.nix
+++ b/pkgs/lib/lists.nix
@@ -178,9 +178,9 @@ rec {
     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 [];
 }