Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

treewide: fix eval without aliases after 9378fdf87e0626e8c63a90a378c38444ff54808b

ajs124 c6d4dae3 5db7e33f

+18 -18
+1 -1
nixos/modules/services/cluster/kubernetes/kubelet.nix
··· 266 gitMinimal 267 openssh 268 util-linux 269 - iproute 270 ethtool 271 thin-provisioning-tools 272 iptables
··· 266 gitMinimal 267 openssh 268 util-linux 269 + iproute2 270 ethtool 271 thin-provisioning-tools 272 iptables
+1 -1
nixos/modules/services/networking/gvpe.nix
··· 27 text = '' 28 #! /bin/sh 29 30 - export PATH=$PATH:${pkgs.iproute}/sbin 31 32 ip link set $IFNAME up 33 ip address add ${cfg.ipAddress} dev $IFNAME
··· 27 text = '' 28 #! /bin/sh 29 30 + export PATH=$PATH:${pkgs.iproute2}/sbin 31 32 ip link set $IFNAME up 33 ip address add ${cfg.ipAddress} dev $IFNAME
+3 -3
nixos/modules/services/networking/libreswan.nix
··· 91 description = "Internet Key Exchange (IKE) Protocol Daemon for IPsec"; 92 path = [ 93 "${pkgs.libreswan}" 94 - "${pkgs.iproute}" 95 "${pkgs.procps}" 96 "${pkgs.nssTools}" 97 "${pkgs.iptables}" ··· 115 ExecStart = "${libexec}/pluto --config ${configFile} --nofork \$PLUTO_OPTIONS"; 116 ExecStop = "${libexec}/whack --shutdown"; 117 ExecStopPost = [ 118 - "${pkgs.iproute}/bin/ip xfrm policy flush" 119 - "${pkgs.iproute}/bin/ip xfrm state flush" 120 "${ipsec} --stopnflog" 121 ]; 122 ExecReload = "${libexec}/whack --listen";
··· 91 description = "Internet Key Exchange (IKE) Protocol Daemon for IPsec"; 92 path = [ 93 "${pkgs.libreswan}" 94 + "${pkgs.iproute2}" 95 "${pkgs.procps}" 96 "${pkgs.nssTools}" 97 "${pkgs.iptables}" ··· 115 ExecStart = "${libexec}/pluto --config ${configFile} --nofork \$PLUTO_OPTIONS"; 116 ExecStop = "${libexec}/whack --shutdown"; 117 ExecStopPost = [ 118 + "${pkgs.iproute2}/bin/ip xfrm policy flush" 119 + "${pkgs.iproute2}/bin/ip xfrm state flush" 120 "${ipsec} --stopnflog" 121 ]; 122 ExecReload = "${libexec}/whack --listen";
+1 -1
nixos/modules/services/networking/mullvad-vpn.nix
··· 28 "systemd-resolved.service" 29 ]; 30 path = [ 31 - pkgs.iproute 32 # Needed for ping 33 "/run/wrappers" 34 ];
··· 28 "systemd-resolved.service" 29 ]; 30 path = [ 31 + pkgs.iproute2 32 # Needed for ping 33 "/run/wrappers" 34 ];
+1 -1
nixos/modules/services/networking/nomad.nix
··· 119 path = cfg.extraPackages ++ (with pkgs; [ 120 # Client mode requires at least the following: 121 coreutils 122 - iproute 123 iptables 124 ]); 125
··· 119 path = cfg.extraPackages ++ (with pkgs; [ 120 # Client mode requires at least the following: 121 coreutils 122 + iproute2 123 iptables 124 ]); 125
+1 -1
nixos/modules/services/networking/quagga.nix
··· 164 preStart = '' 165 install -m 0755 -o quagga -g quagga -d /run/quagga 166 167 - ${pkgs.iproute}/bin/ip route flush proto zebra 168 ''; 169 } 170 else
··· 164 preStart = '' 165 install -m 0755 -o quagga -g quagga -d /run/quagga 166 167 + ${pkgs.iproute2}/bin/ip route flush proto zebra 168 ''; 169 } 170 else
+2 -2
nixos/modules/services/networking/rxe.nix
··· 39 Type = "oneshot"; 40 RemainAfterExit = true; 41 ExecStart = map ( x: 42 - "${pkgs.iproute}/bin/rdma link add rxe_${x} type rxe netdev ${x}" 43 ) cfg.interfaces; 44 45 ExecStop = map ( x: 46 - "${pkgs.iproute}/bin/rdma link delete rxe_${x}" 47 ) cfg.interfaces; 48 }; 49 };
··· 39 Type = "oneshot"; 40 RemainAfterExit = true; 41 ExecStart = map ( x: 42 + "${pkgs.iproute2}/bin/rdma link add rxe_${x} type rxe netdev ${x}" 43 ) cfg.interfaces; 44 45 ExecStop = map ( x: 46 + "${pkgs.iproute2}/bin/rdma link delete rxe_${x}" 47 ) cfg.interfaces; 48 }; 49 };
+4 -4
nixos/modules/services/networking/wg-quick.nix
··· 57 58 preUp = mkOption { 59 example = literalExample '' 60 - ${pkgs.iproute}/bin/ip netns add foo 61 ''; 62 default = ""; 63 type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines; ··· 68 69 preDown = mkOption { 70 example = literalExample '' 71 - ${pkgs.iproute}/bin/ip netns del foo 72 ''; 73 default = ""; 74 type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines; ··· 79 80 postUp = mkOption { 81 example = literalExample '' 82 - ${pkgs.iproute}/bin/ip netns add foo 83 ''; 84 default = ""; 85 type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines; ··· 90 91 postDown = mkOption { 92 example = literalExample '' 93 - ${pkgs.iproute}/bin/ip netns del foo 94 ''; 95 default = ""; 96 type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines;
··· 57 58 preUp = mkOption { 59 example = literalExample '' 60 + ${pkgs.iproute2}/bin/ip netns add foo 61 ''; 62 default = ""; 63 type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines; ··· 68 69 preDown = mkOption { 70 example = literalExample '' 71 + ${pkgs.iproute2}/bin/ip netns del foo 72 ''; 73 default = ""; 74 type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines; ··· 79 80 postUp = mkOption { 81 example = literalExample '' 82 + ${pkgs.iproute2}/bin/ip netns add foo 83 ''; 84 default = ""; 85 type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines; ··· 90 91 postDown = mkOption { 92 example = literalExample '' 93 + ${pkgs.iproute2}/bin/ip netns del foo 94 ''; 95 default = ""; 96 type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines;
+1 -1
nixos/modules/services/system/cloud-init.nix
··· 5 let cfg = config.services.cloud-init; 6 path = with pkgs; [ 7 cloud-init 8 - iproute 9 nettools 10 openssh 11 shadow
··· 5 let cfg = config.services.cloud-init; 6 path = with pkgs; [ 7 cloud-init 8 + iproute2 9 nettools 10 openssh 11 shadow
+1 -1
nixos/modules/system/boot/initrd-openvpn.nix
··· 55 # The shared libraries are required for DNS resolution 56 boot.initrd.extraUtilsCommands = '' 57 copy_bin_and_libs ${pkgs.openvpn}/bin/openvpn 58 - copy_bin_and_libs ${pkgs.iproute}/bin/ip 59 60 cp -pv ${pkgs.glibc}/lib/libresolv.so.2 $out/lib 61 cp -pv ${pkgs.glibc}/lib/libnss_dns.so.2 $out/lib
··· 55 # The shared libraries are required for DNS resolution 56 boot.initrd.extraUtilsCommands = '' 57 copy_bin_and_libs ${pkgs.openvpn}/bin/openvpn 58 + copy_bin_and_libs ${pkgs.iproute2}/bin/ip 59 60 cp -pv ${pkgs.glibc}/lib/libresolv.so.2 $out/lib 61 cp -pv ${pkgs.glibc}/lib/libnss_dns.so.2 $out/lib
+1 -1
nixos/modules/tasks/network-interfaces.nix
··· 1144 1145 environment.systemPackages = 1146 [ pkgs.host 1147 - pkgs.iproute 1148 pkgs.iputils 1149 pkgs.nettools 1150 ]
··· 1144 1145 environment.systemPackages = 1146 [ pkgs.host 1147 + pkgs.iproute2 1148 pkgs.iputils 1149 pkgs.nettools 1150 ]
+1 -1
nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix
··· 43 # Everyone on the "isp" machine will be able to add routes to the kernel. 44 security.wrappers.add-dhcpd-lease = { 45 source = pkgs.writeShellScript "add-dhcpd-lease" '' 46 - exec ${pkgs.iproute}/bin/ip -6 route replace "$1" via "$2" 47 ''; 48 capabilities = "cap_net_admin+ep"; 49 };
··· 43 # Everyone on the "isp" machine will be able to add routes to the kernel. 44 security.wrappers.add-dhcpd-lease = { 45 source = pkgs.writeShellScript "add-dhcpd-lease" '' 46 + exec ${pkgs.iproute2}/bin/ip -6 route replace "$1" via "$2" 47 ''; 48 capabilities = "cap_net_admin+ep"; 49 };