diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-28 08:26:42 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-28 08:26:42 +0200 |
| commit | 5061fe0c2c7743370e1d379d6fa60eed26ff1470 (patch) | |
| tree | 4a4ee79a6e0694d3c7ad6fbeff33343d83458e6c /nixos/lib | |
| parent | a2538606e3115e16db2e5075ecf37b886ad64ede (diff) | |
| parent | 98640fd48212f8e6552517f667bba1901f5936d4 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'nixos/lib')
| -rw-r--r-- | nixos/lib/build-vms.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix index b622a4d59e89c..1bad63b9194ce 100644 --- a/nixos/lib/build-vms.nix +++ b/nixos/lib/build-vms.nix @@ -54,11 +54,11 @@ rec { machinesNumbered = zipLists machines (range 1 254); - nodes_ = flip map machinesNumbered (m: nameValuePair m.fst + nodes_ = forEach machinesNumbered (m: nameValuePair m.fst [ ( { config, nodes, ... }: let interfacesNumbered = zipLists config.virtualisation.vlans (range 1 255); - interfaces = flip map interfacesNumbered ({ fst, snd }: + interfaces = forEach interfacesNumbered ({ fst, snd }: nameValuePair "eth${toString snd}" { ipv4.addresses = [ { address = "192.168.${toString fst}.${toString m.snd}"; prefixLength = 24; @@ -88,7 +88,7 @@ rec { "${config.networking.hostName}\n")); virtualisation.qemu.options = - flip map interfacesNumbered + forEach interfacesNumbered ({ fst, snd }: qemuNICFlags snd fst m.snd); }; } |