summary refs log tree commit diff
path: root/lib
diff options
context:
space:
mode:
authorSander van der Burg <s.vanderburg@tudelft.nl>2010-08-02 16:51:33 +0000
committerSander van der Burg <s.vanderburg@tudelft.nl>2010-08-02 16:51:33 +0000
commit21eb6ed4128090df34496c51882070c6ab7511d6 (patch)
tree1192584f30ced0184cd6bba9d2c606ed1198ce94 /lib
parent58204f0a8afc555311f5d9367974b57281a188d3 (diff)
downloadnixlib-21eb6ed4128090df34496c51882070c6ab7511d6.tar
nixlib-21eb6ed4128090df34496c51882070c6ab7511d6.tar.gz
nixlib-21eb6ed4128090df34496c51882070c6ab7511d6.tar.bz2
nixlib-21eb6ed4128090df34496c51882070c6ab7511d6.tar.lz
nixlib-21eb6ed4128090df34496c51882070c6ab7511d6.tar.xz
nixlib-21eb6ed4128090df34496c51882070c6ab7511d6.tar.zst
nixlib-21eb6ed4128090df34496c51882070c6ab7511d6.zip
Renamed lib.zip into lib.zipTwoLists, since it refers to the wrong function
svn path=/nixos/trunk/; revision=22888
Diffstat (limited to 'lib')
-rw-r--r--lib/build-vms.nix4
1 files 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}";