diff options
author | danbst <abcz2.uprola@gmail.com> | 2019-08-05 14:01:45 +0300 |
---|---|---|
committer | danbst <abcz2.uprola@gmail.com> | 2019-08-05 14:01:45 +0300 |
commit | 91bb646e98808d594b339d3386f7963a546ccfb4 (patch) | |
tree | 4390925c6087d284c11183193044835152f6cea5 /nixos/modules/tasks/network-interfaces-systemd.nix | |
parent | 3b0534310c89d04fc3a9c5714b5a4d0f9fb0efca (diff) | |
download | nixpkgs-91bb646e98808d594b339d3386f7963a546ccfb4.tar nixpkgs-91bb646e98808d594b339d3386f7963a546ccfb4.tar.gz nixpkgs-91bb646e98808d594b339d3386f7963a546ccfb4.tar.bz2 nixpkgs-91bb646e98808d594b339d3386f7963a546ccfb4.tar.lz nixpkgs-91bb646e98808d594b339d3386f7963a546ccfb4.tar.xz nixpkgs-91bb646e98808d594b339d3386f7963a546ccfb4.tar.zst nixpkgs-91bb646e98808d594b339d3386f7963a546ccfb4.zip |
Revert "mass replace "flip map -> foreach""
This reverts commit 3b0534310c89d04fc3a9c5714b5a4d0f9fb0efca.
Diffstat (limited to 'nixos/modules/tasks/network-interfaces-systemd.nix')
-rw-r--r-- | nixos/modules/tasks/network-interfaces-systemd.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index 2612d13da4f..857aaf1e6e3 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -74,7 +74,7 @@ in enable = true; networks."99-main" = genericNetwork mkDefault; } - (mkMerge (foreach interfaces (i: { + (mkMerge (flip map interfaces (i: { netdevs = mkIf i.virtual ({ "40-${i.name}" = { netdevConfig = { @@ -90,7 +90,7 @@ in name = mkDefault i.name; DHCP = mkForce (dhcpStr (if i.useDHCP != null then i.useDHCP else cfg.useDHCP && interfaceIps i == [ ])); - address = foreach (interfaceIps i) + address = flip map (interfaceIps i) (ip: "${ip.address}/${toString ip.prefixLength}"); networkConfig.IPv6PrivacyExtensions = "kernel"; } ]; @@ -102,7 +102,7 @@ in Kind = "bridge"; }; }; - networks = listToAttrs (foreach bridge.interfaces (bi: + networks = listToAttrs (flip map bridge.interfaces (bi: nameValuePair "40-${bi}" (mkMerge [ (genericNetwork (mkOverride 999)) { DHCP = mkOverride 0 (dhcpStr false); networkConfig.Bridge = name; @@ -173,7 +173,7 @@ in }; - networks = listToAttrs (foreach bond.interfaces (bi: + networks = listToAttrs (flip map bond.interfaces (bi: nameValuePair "40-${bi}" (mkMerge [ (genericNetwork (mkOverride 999)) { DHCP = mkOverride 0 (dhcpStr false); networkConfig.Bond = name; |