diff options
| author | Sander van der Burg <s.vanderburg@tudelft.nl> | 2010-08-02 16:48:19 +0000 |
|---|---|---|
| committer | Sander van der Burg <s.vanderburg@tudelft.nl> | 2010-08-02 16:48:19 +0000 |
| commit | 1e9dc2b2543084a8d2950c9a2d62edfb1a1ff516 (patch) | |
| tree | 3624e2360b7308d1db58de253706769ef46e066a /pkgs | |
| parent | d17f0f9cbca38fabb71624f069cd4c0d6feace92 (diff) | |
| download | nixpkgs-1e9dc2b2543084a8d2950c9a2d62edfb1a1ff516.tar nixpkgs-1e9dc2b2543084a8d2950c9a2d62edfb1a1ff516.tar.gz nixpkgs-1e9dc2b2543084a8d2950c9a2d62edfb1a1ff516.tar.bz2 nixpkgs-1e9dc2b2543084a8d2950c9a2d62edfb1a1ff516.tar.lz nixpkgs-1e9dc2b2543084a8d2950c9a2d62edfb1a1ff516.tar.xz nixpkgs-1e9dc2b2543084a8d2950c9a2d62edfb1a1ff516.tar.zst nixpkgs-1e9dc2b2543084a8d2950c9a2d62edfb1a1ff516.zip | |
It seems that lib.zip is already taken from attributesets, therefore renaming it to zipTwoLists
svn path=/nixpkgs/trunk/; revision=22887
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/lib/lists.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/lib/lists.nix b/pkgs/lib/lists.nix index e279d6a80f4..36fa236304d 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 []; } |