From 21eb6ed4128090df34496c51882070c6ab7511d6 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Mon, 2 Aug 2010 16:51:33 +0000
Subject: [PATCH] Renamed lib.zip into lib.zipTwoLists, since it refers to the
 wrong function

svn path=/nixos/trunk/; revision=22888
---
 lib/build-vms.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/build-vms.nix b/lib/build-vms.nix
index ba3e3eb5bbd8..7505f6f49f3b 100644
--- a/lib/build-vms.nix
+++ b/lib/build-vms.nix
@@ -73,12 +73,12 @@ rec {
     
       machines = lib.attrNames nodes;
 
-      machinesNumbered = lib.zip machines (lib.range 1 254);
+      machinesNumbered = lib.zipTwoLists machines (lib.range 1 254);
 
       nodes_ = lib.flip map machinesNumbered (m: lib.nameValuePair m.first
         [ ( { config, pkgs, nodes, ... }:
             let
-              interfacesNumbered = lib.zip config.virtualisation.vlans (lib.range 1 255);
+              interfacesNumbered = lib.zipTwoLists config.virtualisation.vlans (lib.range 1 255);
               interfaces = 
                 lib.flip map interfacesNumbered ({ first, second }:
                   { name = "eth${toString second}";