git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #118805 from helsinki-systems/fix/eval/no-aliases-iproute2

treewide: fix eval without aliases after 9378fdf87e0626e8c63a90a378c3…

commit936f450e3d80d9fe42ad4d825313e766e40919a1 authorSandro <sandro.jaeckel@gmail.com> dateThu 8 Apr 2021, 14:20 (6 years ago) parent5a1bd5fc6d4dae
12 files changed+18−18
nixos/modules/services/cluster/kubernetes/kubelet.nix+1−1 nixos/modules/services/networking/gvpe.nix+1−1 nixos/modules/services/networking/libreswan.nix+3−3 nixos/modules/services/networking/mullvad-vpn.nix+1−1 nixos/modules/services/networking/nomad.nix+1−1 nixos/modules/services/networking/quagga.nix+1−1 nixos/modules/services/networking/rxe.nix+2−2 nixos/modules/services/networking/wg-quick.nix+4−4 nixos/modules/services/system/cloud-init.nix+1−1 nixos/modules/system/boot/initrd-openvpn.nix+1−1 nixos/modules/tasks/network-interfaces.nix+1−1 nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix+1−1
nixos/modules/services/cluster/kubernetes/kubelet.nix+1−1
@@ -266,7 +266,7 @@ in
266266 gitMinimal
267267 openssh
268268 util-linux
269− iproute
269+ iproute2
270270 ethtool
271271 thin-provisioning-tools
272272 iptables
nixos/modules/services/networking/gvpe.nix+1−1
@@ -27,7 +27,7 @@ let
2727 text = ''
2828 #! /bin/sh
2929
30− export PATH=$PATH:${pkgs.iproute}/sbin
30+ export PATH=$PATH:${pkgs.iproute2}/sbin
3131
3232 ip link set $IFNAME up
3333 ip address add ${cfg.ipAddress} dev $IFNAME
nixos/modules/services/networking/libreswan.nix+3−3
@@ -91,7 +91,7 @@ in
9191 description = "Internet Key Exchange (IKE) Protocol Daemon for IPsec";
9292 path = [
9393 "${pkgs.libreswan}"
94− "${pkgs.iproute}"
94+ "${pkgs.iproute2}"
9595 "${pkgs.procps}"
9696 "${pkgs.nssTools}"
9797 "${pkgs.iptables}"
@@ -115,8 +115,8 @@ in
115115 ExecStart = "${libexec}/pluto --config ${configFile} --nofork \$PLUTO_OPTIONS";
116116 ExecStop = "${libexec}/whack --shutdown";
117117 ExecStopPost = [
118− "${pkgs.iproute}/bin/ip xfrm policy flush"
119− "${pkgs.iproute}/bin/ip xfrm state flush"
118+ "${pkgs.iproute2}/bin/ip xfrm policy flush"
119+ "${pkgs.iproute2}/bin/ip xfrm state flush"
120120 "${ipsec} --stopnflog"
121121 ];
122122 ExecReload = "${libexec}/whack --listen";
nixos/modules/services/networking/mullvad-vpn.nix+1−1
@@ -28,7 +28,7 @@ with lib;
2828 "systemd-resolved.service"
2929 ];
3030 path = [
31− pkgs.iproute
31+ pkgs.iproute2
3232 # Needed for ping
3333 "/run/wrappers"
3434 ];
nixos/modules/services/networking/nomad.nix+1−1
@@ -119,7 +119,7 @@ in
119119 path = cfg.extraPackages ++ (with pkgs; [
120120 # Client mode requires at least the following:
121121 coreutils
122− iproute
122+ iproute2
123123 iptables
124124 ]);
125125
nixos/modules/services/networking/quagga.nix+1−1
@@ -164,7 +164,7 @@ in
164164 preStart = ''
165165 install -m 0755 -o quagga -g quagga -d /run/quagga
166166
167− ${pkgs.iproute}/bin/ip route flush proto zebra
167+ ${pkgs.iproute2}/bin/ip route flush proto zebra
168168 '';
169169 }
170170 else
nixos/modules/services/networking/rxe.nix+2−2
@@ -39,11 +39,11 @@ in {
3939 Type = "oneshot";
4040 RemainAfterExit = true;
4141 ExecStart = map ( x:
42− "${pkgs.iproute}/bin/rdma link add rxe_${x} type rxe netdev ${x}"
42+ "${pkgs.iproute2}/bin/rdma link add rxe_${x} type rxe netdev ${x}"
4343 ) cfg.interfaces;
4444
4545 ExecStop = map ( x:
46− "${pkgs.iproute}/bin/rdma link delete rxe_${x}"
46+ "${pkgs.iproute2}/bin/rdma link delete rxe_${x}"
4747 ) cfg.interfaces;
4848 };
4949 };
nixos/modules/services/networking/wg-quick.nix+4−4
@@ -57,7 +57,7 @@ let
5757
5858 preUp = mkOption {
5959 example = literalExample ''
60− ${pkgs.iproute}/bin/ip netns add foo
60+ ${pkgs.iproute2}/bin/ip netns add foo
6161 '';
6262 default = "";
6363 type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines;
@@ -68,7 +68,7 @@ let
6868
6969 preDown = mkOption {
7070 example = literalExample ''
71− ${pkgs.iproute}/bin/ip netns del foo
71+ ${pkgs.iproute2}/bin/ip netns del foo
7272 '';
7373 default = "";
7474 type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines;
@@ -79,7 +79,7 @@ let
7979
8080 postUp = mkOption {
8181 example = literalExample ''
82− ${pkgs.iproute}/bin/ip netns add foo
82+ ${pkgs.iproute2}/bin/ip netns add foo
8383 '';
8484 default = "";
8585 type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines;
@@ -90,7 +90,7 @@ let
9090
9191 postDown = mkOption {
9292 example = literalExample ''
93− ${pkgs.iproute}/bin/ip netns del foo
93+ ${pkgs.iproute2}/bin/ip netns del foo
9494 '';
9595 default = "";
9696 type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines;
nixos/modules/services/system/cloud-init.nix+1−1
@@ -5,7 +5,7 @@ with lib;
55let cfg = config.services.cloud-init;
66 path = with pkgs; [
77 cloud-init
8− iproute
8+ iproute2
99 nettools
1010 openssh
1111 shadow
nixos/modules/system/boot/initrd-openvpn.nix+1−1
@@ -55,7 +55,7 @@ in
5555 # The shared libraries are required for DNS resolution
5656 boot.initrd.extraUtilsCommands = ''
5757 copy_bin_and_libs ${pkgs.openvpn}/bin/openvpn
58− copy_bin_and_libs ${pkgs.iproute}/bin/ip
58+ copy_bin_and_libs ${pkgs.iproute2}/bin/ip
5959
6060 cp -pv ${pkgs.glibc}/lib/libresolv.so.2 $out/lib
6161 cp -pv ${pkgs.glibc}/lib/libnss_dns.so.2 $out/lib
nixos/modules/tasks/network-interfaces.nix+1−1
@@ -1144,7 +1144,7 @@ in
11441144
11451145 environment.systemPackages =
11461146 [ pkgs.host
1147− pkgs.iproute
1147+ pkgs.iproute2
11481148 pkgs.iputils
11491149 pkgs.nettools
11501150 ]
nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix+1−1
@@ -43,7 +43,7 @@ import ./make-test-python.nix ({pkgs, ...}: {
4343 # Everyone on the "isp" machine will be able to add routes to the kernel.
4444 security.wrappers.add-dhcpd-lease = {
4545 source = pkgs.writeShellScript "add-dhcpd-lease" ''
46− exec ${pkgs.iproute}/bin/ip -6 route replace "$1" via "$2"
46+ exec ${pkgs.iproute2}/bin/ip -6 route replace "$1" via "$2"
4747 '';
4848 capabilities = "cap_net_admin+ep";
4949 };