summary refs log tree commit diff
path: root/nixos/modules/tasks/network-interfaces.nix
diff options
context:
space:
mode:
authordanbst <abcz2.uprola@gmail.com>2019-08-05 14:01:45 +0300
committerdanbst <abcz2.uprola@gmail.com>2019-08-05 14:01:45 +0300
commit91bb646e98808d594b339d3386f7963a546ccfb4 (patch)
tree4390925c6087d284c11183193044835152f6cea5 /nixos/modules/tasks/network-interfaces.nix
parent3b0534310c89d04fc3a9c5714b5a4d0f9fb0efca (diff)
downloadnixpkgs-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.nix')
-rw-r--r--nixos/modules/tasks/network-interfaces.nix12
1 files changed, 6 insertions, 6 deletions
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 2af20e05b05..f9b0eb330bf 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -926,7 +926,7 @@ in
     warnings = concatMap (i: i.warnings) interfaces;
 
     assertions =
-      (foreach interfaces (i: {
+      (flip map interfaces (i: {
         # With the linux kernel, interface name length is limited by IFNAMSIZ
         # to 16 bytes, including the trailing null byte.
         # See include/linux/if.h in the kernel sources
@@ -934,12 +934,12 @@ in
         message = ''
           The name of networking.interfaces."${i.name}" is too long, it needs to be less than 16 characters.
         '';
-      })) ++ (foreach slaveIfs (i: {
+      })) ++ (flip map slaveIfs (i: {
         assertion = i.ipv4.addresses == [ ] && i.ipv6.addresses == [ ];
         message = ''
           The networking.interfaces."${i.name}" must not have any defined ips when it is a slave.
         '';
-      })) ++ (foreach interfaces (i: {
+      })) ++ (flip map interfaces (i: {
         assertion = i.preferTempAddress -> cfg.enableIPv6;
         message = ''
           Temporary addresses are only needed when IPv6 is enabled.
@@ -967,8 +967,8 @@ in
       "net.ipv6.conf.default.disable_ipv6" = mkDefault (!cfg.enableIPv6);
       "net.ipv6.conf.all.forwarding" = mkDefault (any (i: i.proxyARP) interfaces);
     } // listToAttrs (flip concatMap (filter (i: i.proxyARP) interfaces)
-        (i: foreach [ "4" "6" ] (v: nameValuePair "net.ipv${v}.conf.${i.name}.proxy_arp" true)))
-      // listToAttrs (foreach (filter (i: i.preferTempAddress) interfaces)
+        (i: flip map [ "4" "6" ] (v: nameValuePair "net.ipv${v}.conf.${i.name}.proxy_arp" true)))
+      // listToAttrs (flip map (filter (i: i.preferTempAddress) interfaces)
         (i: nameValuePair "net.ipv6.conf.${i.name}.use_tempaddr" 2));
 
     # Capabilities won't work unless we have at-least a 4.3 Linux
@@ -1051,7 +1051,7 @@ in
           ${cfg.localCommands}
         '';
       };
-    } // (listToAttrs (foreach interfaces (i:
+    } // (listToAttrs (flip map interfaces (i:
       let
         deviceDependency = if (config.boot.isContainer || i.name == "lo")
           then []