commit 936f450e3d80d9fe42ad4d825313e766e40919a1 · pyrox.dev/nixpkgs

+1 -1

nixos/modules/services/cluster/kubernetes/kubelet.nix

···

       266
       266
        
                 gitMinimal

     

       267
       267
        
                 openssh

     

       268
       268
        
                 util-linux

     

       269
       269
       -
                 iproute

     

       269
       269
       +
                 iproute2

     

       270
       270
        
                 ethtool

     

       271
       271
        
                 thin-provisioning-tools

     

       272
       272
        
                 iptables

+1 -1

nixos/modules/services/networking/gvpe.nix

···

       27
       27
        
           text = ''

     

       28
       28
        
             #! /bin/sh

     

       29
       29
        
       

     

       30
       30
       -
             export PATH=$PATH:${pkgs.iproute}/sbin

     

       30
       30
       +
             export PATH=$PATH:${pkgs.iproute2}/sbin

     

       31
       31
        
       

     

       32
       32
        
             ip link set $IFNAME up

     

       33
       33
        
             ip address add ${cfg.ipAddress} dev $IFNAME

+3 -3

nixos/modules/services/networking/libreswan.nix

···

       91
       91
        
             description = "Internet Key Exchange (IKE) Protocol Daemon for IPsec";

     

       92
       92
        
             path = [

     

       93
       93
        
               "${pkgs.libreswan}"

     

       94
       94
       -
               "${pkgs.iproute}"

     

       94
       94
       +
               "${pkgs.iproute2}"

     

       95
       95
        
               "${pkgs.procps}"

     

       96
       96
        
               "${pkgs.nssTools}"

     

       97
       97
        
               "${pkgs.iptables}"

     
···

       115
       115
        
               ExecStart = "${libexec}/pluto --config ${configFile} --nofork \$PLUTO_OPTIONS";

     

       116
       116
        
               ExecStop = "${libexec}/whack --shutdown";

     

       117
       117
        
               ExecStopPost = [

     

       118
       118
       -
                 "${pkgs.iproute}/bin/ip xfrm policy flush"

     

       119
       119
       -
                 "${pkgs.iproute}/bin/ip xfrm state flush"

     

       118
       118
       +
                 "${pkgs.iproute2}/bin/ip xfrm policy flush"

     

       119
       119
       +
                 "${pkgs.iproute2}/bin/ip xfrm state flush"

     

       120
       120
        
                 "${ipsec} --stopnflog"

     

       121
       121
        
               ];

     

       122
       122
        
               ExecReload = "${libexec}/whack --listen";

+1 -1

nixos/modules/services/networking/mullvad-vpn.nix

···

       28
       28
        
               "systemd-resolved.service"

     

       29
       29
        
             ];

     

       30
       30
        
             path = [

     

       31
       31
       -
               pkgs.iproute

     

       31
       31
       +
               pkgs.iproute2

     

       32
       32
        
               # Needed for ping

     

       33
       33
        
               "/run/wrappers"

     

       34
       34
        
             ];

+1 -1

nixos/modules/services/networking/nomad.nix

···

       119
       119
        
             path = cfg.extraPackages ++ (with pkgs; [

     

       120
       120
        
               # Client mode requires at least the following:

     

       121
       121
        
               coreutils

     

       122
       122
       -
               iproute

     

       122
       122
       +
               iproute2

     

       123
       123
        
               iptables

     

       124
       124
        
             ]);

     

       125
       125

+1 -1

nixos/modules/services/networking/quagga.nix

···

       164
       164
        
                         preStart = ''

     

       165
       165
        
                           install -m 0755 -o quagga -g quagga -d /run/quagga

     

       166
       166
        
       

     

       167
       167
       -
                           ${pkgs.iproute}/bin/ip route flush proto zebra

     

       167
       167
       +
                           ${pkgs.iproute2}/bin/ip route flush proto zebra

     

       168
       168
        
                         '';

     

       169
       169
        
                       }

     

       170
       170
        
                     else

+2 -2

nixos/modules/services/networking/rxe.nix

···

       39
       39
        
               Type = "oneshot";

     

       40
       40
        
               RemainAfterExit = true;

     

       41
       41
        
               ExecStart = map ( x:

     

       42
       42
       -
                 "${pkgs.iproute}/bin/rdma link add rxe_${x} type rxe netdev ${x}"

     

       42
       42
       +
                 "${pkgs.iproute2}/bin/rdma link add rxe_${x} type rxe netdev ${x}"

     

       43
       43
        
                 ) cfg.interfaces;

     

       44
       44
        
       

     

       45
       45
        
               ExecStop = map ( x:

     

       46
       46
       -
                 "${pkgs.iproute}/bin/rdma link delete rxe_${x}"

     

       46
       46
       +
                 "${pkgs.iproute2}/bin/rdma link delete rxe_${x}"

     

       47
       47
        
                 ) cfg.interfaces;

     

       48
       48
        
             };

     

       49
       49
        
           };

+4 -4

nixos/modules/services/networking/wg-quick.nix

···

       57
       57
        
       

     

       58
       58
        
             preUp = mkOption {

     

       59
       59
        
               example = literalExample ''

     

       60
       60
       -
                 ${pkgs.iproute}/bin/ip netns add foo

     

       60
       60
       +
                 ${pkgs.iproute2}/bin/ip netns add foo

     

       61
       61
        
               '';

     

       62
       62
        
               default = "";

     

       63
       63
        
               type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines;

     
···

       68
       68
        
       

     

       69
       69
        
             preDown = mkOption {

     

       70
       70
        
               example = literalExample ''

     

       71
       71
       -
                 ${pkgs.iproute}/bin/ip netns del foo

     

       71
       71
       +
                 ${pkgs.iproute2}/bin/ip netns del foo

     

       72
       72
        
               '';

     

       73
       73
        
               default = "";

     

       74
       74
        
               type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines;

     
···

       79
       79
        
       

     

       80
       80
        
             postUp = mkOption {

     

       81
       81
        
               example = literalExample ''

     

       82
       82
       -
                 ${pkgs.iproute}/bin/ip netns add foo

     

       82
       82
       +
                 ${pkgs.iproute2}/bin/ip netns add foo

     

       83
       83
        
               '';

     

       84
       84
        
               default = "";

     

       85
       85
        
               type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines;

     
···

       90
       90
        
       

     

       91
       91
        
             postDown = mkOption {

     

       92
       92
        
               example = literalExample ''

     

       93
       93
       -
                 ${pkgs.iproute}/bin/ip netns del foo

     

       93
       93
       +
                 ${pkgs.iproute2}/bin/ip netns del foo

     

       94
       94
        
               '';

     

       95
       95
        
               default = "";

     

       96
       96
        
               type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines;

+1 -1

nixos/modules/services/system/cloud-init.nix

···

       5
       5
        
       let cfg = config.services.cloud-init;

     

       6
       6
        
           path = with pkgs; [

     

       7
       7
        
             cloud-init

     

       8
       8
       -
             iproute

     

       8
       8
       +
             iproute2

     

       9
       9
        
             nettools

     

       10
       10
        
             openssh

     

       11
       11
        
             shadow

+1 -1

nixos/modules/system/boot/initrd-openvpn.nix

···

       55
       55
        
           # The shared libraries are required for DNS resolution

     

       56
       56
        
           boot.initrd.extraUtilsCommands = ''

     

       57
       57
        
             copy_bin_and_libs ${pkgs.openvpn}/bin/openvpn

     

       58
       58
       -
             copy_bin_and_libs ${pkgs.iproute}/bin/ip

     

       58
       58
       +
             copy_bin_and_libs ${pkgs.iproute2}/bin/ip

     

       59
       59
        
       

     

       60
       60
        
             cp -pv ${pkgs.glibc}/lib/libresolv.so.2 $out/lib

     

       61
       61
        
             cp -pv ${pkgs.glibc}/lib/libnss_dns.so.2 $out/lib

+1 -1

nixos/modules/tasks/network-interfaces.nix

···

       1144
       1144
        
       

     

       1145
       1145
        
           environment.systemPackages =

     

       1146
       1146
        
             [ pkgs.host

     

       1147
       1147
       -
               pkgs.iproute

     

       1147
       1147
       +
               pkgs.iproute2

     

       1148
       1148
        
               pkgs.iputils

     

       1149
       1149
        
               pkgs.nettools

     

       1150
       1150
        
             ]

+1 -1

nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix

···

       43
       43
        
             # Everyone on the "isp" machine will be able to add routes to the kernel.

     

       44
       44
        
             security.wrappers.add-dhcpd-lease = {

     

       45
       45
        
               source = pkgs.writeShellScript "add-dhcpd-lease" ''

     

       46
       46
       -
                 exec ${pkgs.iproute}/bin/ip -6 route replace "$1" via "$2"

     

       46
       46
       +
                 exec ${pkgs.iproute2}/bin/ip -6 route replace "$1" via "$2"

     

       47
       47
        
               '';

     

       48
       48
        
               capabilities = "cap_net_admin+ep";

     

       49
       49
        
             };