commit 9378fdf87e0626e8c63a90a378c38444ff54808b · pyrox.dev/nixpkgs

+1 -1

nixos/modules/programs/mininet.nix

···

       8
       8
        
         cfg  = config.programs.mininet;

     

       9
       9
        
       

     

       10
       10
        
         generatedPath = with pkgs; makeSearchPath "bin"  [

     

       11
       11
       -
           iperf ethtool iproute socat

     

       11
       11
       +
           iperf ethtool iproute2 socat

     

       12
       12
        
         ];

     

       13
       13
        
       

     

       14
       14
        
         pyEnv = pkgs.python.withPackages(ps: [ ps.mininet-python ]);

+1 -1

nixos/modules/services/misc/mame.nix

···

       53
       53
        
             description = "MAME TUN/TAP Ethernet interface";

     

       54
       54
        
             after = [ "network.target" ];

     

       55
       55
        
             wantedBy = [ "multi-user.target" ];

     

       56
       56
       -
             path = [ pkgs.iproute ];

     

       56
       56
       +
             path = [ pkgs.iproute2 ];

     

       57
       57
        
             serviceConfig = {

     

       58
       58
        
               Type = "oneshot";

     

       59
       59
        
               RemainAfterExit = true;

+2 -2

nixos/modules/services/monitoring/datadog-agent.nix

···

       225
       225
        
           };

     

       226
       226
        
         };

     

       227
       227
        
         config = mkIf cfg.enable {

     

       228
       228
       -
           environment.systemPackages = [ datadogPkg pkgs.sysstat pkgs.procps pkgs.iproute ];

     

       228
       228
       +
           environment.systemPackages = [ datadogPkg pkgs.sysstat pkgs.procps pkgs.iproute2 ];

     

       229
       229
        
       

     

       230
       230
        
           users.users.datadog = {

     

       231
       231
        
             description = "Datadog Agent User";

     
···

       239
       239
        
       

     

       240
       240
        
           systemd.services = let

     

       241
       241
        
             makeService = attrs: recursiveUpdate {

     

       242
       242
       -
               path = [ datadogPkg pkgs.python pkgs.sysstat pkgs.procps pkgs.iproute ];

     

       242
       242
       +
               path = [ datadogPkg pkgs.python pkgs.sysstat pkgs.procps pkgs.iproute2 ];

     

       243
       243
        
               wantedBy = [ "multi-user.target" ];

     

       244
       244
        
               serviceConfig = {

     

       245
       245
        
                 User = "datadog";

+1 -1

nixos/modules/services/monitoring/scollector.nix

···

       113
       113
        
             description = "scollector metrics collector (part of Bosun)";

     

       114
       114
        
             wantedBy = [ "multi-user.target" ];

     

       115
       115
        
       

     

       116
       116
       -
             path = [ pkgs.coreutils pkgs.iproute ];

     

       116
       116
       +
             path = [ pkgs.coreutils pkgs.iproute2 ];

     

       117
       117
        
       

     

       118
       118
        
             serviceConfig = {

     

       119
       119
        
               User = cfg.user;

+1 -1

nixos/modules/services/networking/consul.nix

···

       191
       191
        
                 ExecStop = "${cfg.package}/bin/consul leave";

     

       192
       192
        
               });

     

       193
       193
        
       

     

       194
       194
       -
               path = with pkgs; [ iproute gnugrep gawk consul ];

     

       194
       194
       +
               path = with pkgs; [ iproute2 gnugrep gawk consul ];

     

       195
       195
        
               preStart = ''

     

       196
       196
        
                 mkdir -m 0700 -p ${dataDir}

     

       197
       197
        
                 chown -R consul ${dataDir}

+1 -1

nixos/modules/services/networking/ircd-hybrid/default.nix

···

       10
       10
        
           name = "ircd-hybrid-service";

     

       11
       11
        
           scripts = [ "=>/bin" ./control.in ];

     

       12
       12
        
           substFiles = [ "=>/conf" ./ircd.conf ];

     

       13
       13
       -
           inherit (pkgs) ircdHybrid coreutils su iproute gnugrep procps;

     

       13
       13
       +
           inherit (pkgs) ircdHybrid coreutils su iproute2 gnugrep procps;

     

       14
       14
        
       

     

       15
       15
        
           ipv6Enabled = boolToString config.networking.enableIPv6;

     

       16
       16

+1 -1

nixos/modules/services/networking/libreswan.nix

···

       85
       85
        
       

     

       86
       86
        
         config = mkIf cfg.enable {

     

       87
       87
        
       

     

       88
       88
       -
           environment.systemPackages = [ pkgs.libreswan pkgs.iproute ];

     

       88
       88
       +
           environment.systemPackages = [ pkgs.libreswan pkgs.iproute2 ];

     

       89
       89
        
       

     

       90
       90
        
           systemd.services.ipsec = {

     

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

+1 -1

nixos/modules/services/networking/networkmanager.nix

···

       465
       465
        
             restartTriggers = [ configFile overrideNameserversScript ];

     

       466
       466
        
       

     

       467
       467
        
             # useful binaries for user-specified hooks

     

       468
       468
       -
             path = [ pkgs.iproute pkgs.util-linux pkgs.coreutils ];

     

       468
       468
       +
             path = [ pkgs.iproute2 pkgs.util-linux pkgs.coreutils ];

     

       469
       469
        
             aliases = [ "dbus-org.freedesktop.nm-dispatcher.service" ];

     

       470
       470
        
           };

     

       471
       471

+1 -1

nixos/modules/services/networking/openvpn.nix

···

       63
       63
        
             wantedBy = optional cfg.autoStart "multi-user.target";

     

       64
       64
        
             after = [ "network.target" ];

     

       65
       65
        
       

     

       66
       66
       -
             path = [ pkgs.iptables pkgs.iproute pkgs.nettools ];

     

       66
       66
       +
             path = [ pkgs.iptables pkgs.iproute2 pkgs.nettools ];

     

       67
       67
        
       

     

       68
       68
        
             serviceConfig.ExecStart = "@${openvpn}/sbin/openvpn openvpn --suppress-timestamps --config ${configFile}";

     

       69
       69
        
             serviceConfig.Restart = "always";

+1 -1

nixos/modules/services/networking/sslh.nix

···

       132
       132
        
                 { table = "mangle"; command = "OUTPUT ! -o lo -p tcp -m connmark --mark 0x02/0x0f -j CONNMARK --restore-mark --mask 0x0f"; }

     

       133
       133
        
               ];

     

       134
       134
        
             in {

     

       135
       135
       -
               path = [ pkgs.iptables pkgs.iproute pkgs.procps ];

     

       135
       135
       +
               path = [ pkgs.iptables pkgs.iproute2 pkgs.procps ];

     

       136
       136
        
       

     

       137
       137
        
               preStart = ''

     

       138
       138
        
                 # Cleanup old iptables entries which might be still there

+1 -1

nixos/modules/services/networking/strongswan-swanctl/module.nix

···

       63
       63
        
             description = "strongSwan IPsec IKEv1/IKEv2 daemon using swanctl";

     

       64
       64
        
             wantedBy = [ "multi-user.target" ];

     

       65
       65
        
             after    = [ "network-online.target" ];

     

       66
       66
       -
             path     = with pkgs; [ kmod iproute iptables util-linux ];

     

       66
       66
       +
             path     = with pkgs; [ kmod iproute2 iptables util-linux ];

     

       67
       67
        
             environment = {

     

       68
       68
        
               STRONGSWAN_CONF = pkgs.writeTextFile {

     

       69
       69
        
                 name = "strongswan.conf";

+1 -1

nixos/modules/services/networking/strongswan.nix

···

       152
       152
        
           systemd.services.strongswan = {

     

       153
       153
        
             description = "strongSwan IPSec Service";

     

       154
       154
        
             wantedBy = [ "multi-user.target" ];

     

       155
       155
       -
             path = with pkgs; [ kmod iproute iptables util-linux ]; # XXX Linux

     

       155
       155
       +
             path = with pkgs; [ kmod iproute2 iptables util-linux ]; # XXX Linux

     

       156
       156
        
             after = [ "network-online.target" ];

     

       157
       157
        
             environment = {

     

       158
       158
        
               STRONGSWAN_CONF = strongswanConf { inherit setup connections ca secretsFile managePlugins enabledPlugins; };

+3 -3

nixos/modules/services/networking/wireguard.nix

···

       63
       63
        
       

     

       64
       64
        
             preSetup = mkOption {

     

       65
       65
        
               example = literalExample ''

     

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

     

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

     

       67
       67
        
               '';

     

       68
       68
        
               default = "";

     

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

     
···

       278
       278
        
               wantedBy = [ "multi-user.target" "wireguard-${interfaceName}.service" ];

     

       279
       279
        
               environment.DEVICE = interfaceName;

     

       280
       280
        
               environment.WG_ENDPOINT_RESOLUTION_RETRIES = "infinity";

     

       281
       281
       -
               path = with pkgs; [ iproute wireguard-tools ];

     

       281
       281
       +
               path = with pkgs; [ iproute2 wireguard-tools ];

     

       282
       282
        
       

     

       283
       283
        
               serviceConfig = {

     

       284
       284
        
                 Type = "oneshot";

     
···

       333
       333
        
               after = [ "network.target" "network-online.target" ];

     

       334
       334
        
               wantedBy = [ "multi-user.target" ];

     

       335
       335
        
               environment.DEVICE = name;

     

       336
       336
       -
               path = with pkgs; [ kmod iproute wireguard-tools ];

     

       336
       336
       +
               path = with pkgs; [ kmod iproute2 wireguard-tools ];

     

       337
       337
        
       

     

       338
       338
        
               serviceConfig = {

     

       339
       339
        
                 Type = "oneshot";

+1 -1

nixos/modules/services/security/fail2ban.nix

···

       243
       243
        
             restartTriggers = [ fail2banConf jailConf pathsConf ];

     

       244
       244
        
             reloadIfChanged = true;

     

       245
       245
        
       

     

       246
       246
       -
             path = [ cfg.package cfg.packageFirewall pkgs.iproute ];

     

       246
       246
       +
             path = [ cfg.package cfg.packageFirewall pkgs.iproute2 ];

     

       247
       247
        
       

     

       248
       248
        
             unitConfig.Documentation = "man:fail2ban(1)";

     

       249
       249

+2 -2

nixos/modules/services/security/sshguard.nix

···

       108
       108
        
             partOf = optional config.networking.firewall.enable "firewall.service";

     

       109
       109
        
       

     

       110
       110
        
             path = with pkgs; if config.networking.nftables.enable

     

       111
       111
       -
               then [ nftables iproute systemd ]

     

       112
       112
       -
               else [ iptables ipset iproute systemd ];

     

       111
       111
       +
               then [ nftables iproute2 systemd ]

     

       112
       112
       +
               else [ iptables ipset iproute2 systemd ];

     

       113
       113
        
       

     

       114
       114
        
             # The sshguard ipsets must exist before we invoke

     

       115
       115
        
             # iptables. sshguard creates the ipsets after startup if

+9 -9

nixos/modules/tasks/network-interfaces-scripted.nix

···

       101
       101
        
       

     

       102
       102
        
                   unitConfig.ConditionCapability = "CAP_NET_ADMIN";

     

       103
       103
        
       

     

       104
       104
       -
                   path = [ pkgs.iproute ];

     

       104
       104
       +
                   path = [ pkgs.iproute2 ];

     

       105
       105
        
       

     

       106
       106
        
                   serviceConfig = {

     

       107
       107
        
                     Type = "oneshot";

     
···

       185
       185
        
                   # Restart rather than stop+start this unit to prevent the

     

       186
       186
        
                   # network from dying during switch-to-configuration.

     

       187
       187
        
                   stopIfChanged = false;

     

       188
       188
       -
                   path = [ pkgs.iproute ];

     

       188
       188
       +
                   path = [ pkgs.iproute2 ];

     

       189
       189
        
                   script =

     

       190
       190
        
                     ''

     

       191
       191
        
                       state="/run/nixos/network/addresses/${i.name}"

     
···

       258
       258
        
                   wantedBy = [ "network-setup.service" (subsystemDevice i.name) ];

     

       259
       259
        
                   partOf = [ "network-setup.service" ];

     

       260
       260
        
                   before = [ "network-setup.service" ];

     

       261
       261
       -
                   path = [ pkgs.iproute ];

     

       261
       261
       +
                   path = [ pkgs.iproute2 ];

     

       262
       262
        
                   serviceConfig = {

     

       263
       263
        
                     Type = "oneshot";

     

       264
       264
        
                     RemainAfterExit = true;

     
···

       284
       284
        
                   before = [ "network-setup.service" ];

     

       285
       285
        
                   serviceConfig.Type = "oneshot";

     

       286
       286
        
                   serviceConfig.RemainAfterExit = true;

     

       287
       287
       -
                   path = [ pkgs.iproute ];

     

       287
       287
       +
                   path = [ pkgs.iproute2 ];

     

       288
       288
        
                   script = ''

     

       289
       289
        
                     # Remove Dead Interfaces

     

       290
       290
        
                     echo "Removing old bridge ${n}..."

     
···

       372
       372
        
                   wants = deps; # if one or more interface fails, the switch should continue to run

     

       373
       373
        
                   serviceConfig.Type = "oneshot";

     

       374
       374
        
                   serviceConfig.RemainAfterExit = true;

     

       375
       375
       -
                   path = [ pkgs.iproute config.virtualisation.vswitch.package ];

     

       375
       375
       +
                   path = [ pkgs.iproute2 config.virtualisation.vswitch.package ];

     

       376
       376
        
                   preStart = ''

     

       377
       377
        
                     echo "Resetting Open vSwitch ${n}..."

     

       378
       378
        
                     ovs-vsctl --if-exists del-br ${n} -- add-br ${n} \

     
···

       413
       413
        
                   before = [ "network-setup.service" ];

     

       414
       414
        
                   serviceConfig.Type = "oneshot";

     

       415
       415
        
                   serviceConfig.RemainAfterExit = true;

     

       416
       416
       -
                   path = [ pkgs.iproute pkgs.gawk ];

     

       416
       416
       +
                   path = [ pkgs.iproute2 pkgs.gawk ];

     

       417
       417
        
                   script = ''

     

       418
       418
        
                     echo "Destroying old bond ${n}..."

     

       419
       419
        
                     ${destroyBond n}

     
···

       451
       451
        
                   before = [ "network-setup.service" ];

     

       452
       452
        
                   serviceConfig.Type = "oneshot";

     

       453
       453
        
                   serviceConfig.RemainAfterExit = true;

     

       454
       454
       -
                   path = [ pkgs.iproute ];

     

       454
       454
       +
                   path = [ pkgs.iproute2 ];

     

       455
       455
        
                   script = ''

     

       456
       456
        
                     # Remove Dead Interfaces

     

       457
       457
        
                     ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}"

     
···

       476
       476
        
                   before = [ "network-setup.service" ];

     

       477
       477
        
                   serviceConfig.Type = "oneshot";

     

       478
       478
        
                   serviceConfig.RemainAfterExit = true;

     

       479
       479
       -
                   path = [ pkgs.iproute ];

     

       479
       479
       +
                   path = [ pkgs.iproute2 ];

     

       480
       480
        
                   script = ''

     

       481
       481
        
                     # Remove Dead Interfaces

     

       482
       482
        
                     ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}"

     
···

       504
       504
        
                   before = [ "network-setup.service" ];

     

       505
       505
        
                   serviceConfig.Type = "oneshot";

     

       506
       506
        
                   serviceConfig.RemainAfterExit = true;

     

       507
       507
       -
                   path = [ pkgs.iproute ];

     

       507
       507
       +
                   path = [ pkgs.iproute2 ];

     

       508
       508
        
                   script = ''

     

       509
       509
        
                     # Remove Dead Interfaces

     

       510
       510
        
                     ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}"

+1 -1

nixos/modules/tasks/network-interfaces-systemd.nix

···

       259
       259
        
                   wants = deps; # if one or more interface fails, the switch should continue to run

     

       260
       260
        
                   serviceConfig.Type = "oneshot";

     

       261
       261
        
                   serviceConfig.RemainAfterExit = true;

     

       262
       262
       -
                   path = [ pkgs.iproute config.virtualisation.vswitch.package ];

     

       262
       262
       +
                   path = [ pkgs.iproute2 config.virtualisation.vswitch.package ];

     

       263
       263
        
                   preStart = ''

     

       264
       264
        
                     echo "Resetting Open vSwitch ${n}..."

     

       265
       265
        
                     ovs-vsctl --if-exists del-br ${n} -- add-br ${n} \

+3 -3

nixos/modules/tasks/network-interfaces.nix

···

       1171
       1171
        
               wantedBy = [ "network.target" ];

     

       1172
       1172
        
               after = [ "network-pre.target" ];

     

       1173
       1173
        
               unitConfig.ConditionCapability = "CAP_NET_ADMIN";

     

       1174
       1174
       -
               path = [ pkgs.iproute ];

     

       1174
       1174
       +
               path = [ pkgs.iproute2 ];

     

       1175
       1175
        
               serviceConfig.Type = "oneshot";

     

       1176
       1176
        
               serviceConfig.RemainAfterExit = true;

     

       1177
       1177
        
               script = ''

     
···

       1249
       1249
        
                     ${optionalString (current.type == "mesh" && current.meshID!=null) "${pkgs.iw}/bin/iw dev ${device} set meshid ${current.meshID}"}

     

       1250
       1250
        
                     ${optionalString (current.type == "monitor" && current.flags!=null) "${pkgs.iw}/bin/iw dev ${device} set monitor ${current.flags}"}

     

       1251
       1251
        
                     ${optionalString (current.type == "managed" && current.fourAddr!=null) "${pkgs.iw}/bin/iw dev ${device} set 4addr ${if current.fourAddr then "on" else "off"}"}

     

       1252
       1252
       -
                     ${optionalString (current.mac != null) "${pkgs.iproute}/bin/ip link set dev ${device} address ${current.mac}"}

     

       1252
       1252
       +
                     ${optionalString (current.mac != null) "${pkgs.iproute2}/bin/ip link set dev ${device} address ${current.mac}"}

     

       1253
       1253
        
                   '';

     

       1254
       1254
        
       

     

       1255
       1255
        
                   # Udev script to execute for a new WLAN interface. The script configures the new WLAN interface.

     
···

       1260
       1260
        
                     ${optionalString (new.type == "mesh" && new.meshID!=null) "${pkgs.iw}/bin/iw dev ${device} set meshid ${new.meshID}"}

     

       1261
       1261
        
                     ${optionalString (new.type == "monitor" && new.flags!=null) "${pkgs.iw}/bin/iw dev ${device} set monitor ${new.flags}"}

     

       1262
       1262
        
                     ${optionalString (new.type == "managed" && new.fourAddr!=null) "${pkgs.iw}/bin/iw dev ${device} set 4addr ${if new.fourAddr then "on" else "off"}"}

     

       1263
       1263
       -
                     ${optionalString (new.mac != null) "${pkgs.iproute}/bin/ip link set dev ${device} address ${new.mac}"}

     

       1263
       1263
       +
                     ${optionalString (new.mac != null) "${pkgs.iproute2}/bin/ip link set dev ${device} address ${new.mac}"}

     

       1264
       1264
        
                   '';

     

       1265
       1265
        
       

     

       1266
       1266
        
                   # Udev attributes for systemd to name the device and to create a .device target.

+1 -1

nixos/modules/virtualisation/brightbox-image.nix

···

       119
       119
        
             wants = [ "network-online.target" ];

     

       120
       120
        
             after = [ "network-online.target" ];

     

       121
       121
        
       

     

       122
       122
       -
             path = [ pkgs.wget pkgs.iproute ];

     

       122
       122
       +
             path = [ pkgs.wget pkgs.iproute2 ];

     

       123
       123
        
       

     

       124
       124
        
             script =

     

       125
       125
        
               ''

+1 -1

nixos/modules/virtualisation/ec2-data.nix

···

       19
       19
        
               wantedBy = [ "multi-user.target" "sshd.service" ];

     

       20
       20
        
               before = [ "sshd.service" ];

     

       21
       21
        
       

     

       22
       22
       -
               path = [ pkgs.iproute ];

     

       22
       22
       +
               path = [ pkgs.iproute2 ];

     

       23
       23
        
       

     

       24
       24
        
               script =

     

       25
       25
        
                 ''

+1 -1

nixos/modules/virtualisation/google-compute-config.nix

···

       110
       110
        
         systemd.services.google-network-daemon = {

     

       111
       111
        
           description = "Google Compute Engine Network Daemon";

     

       112
       112
        
           after = [ "network-online.target" "network.target" "google-instance-setup.service" ];

     

       113
       113
       -
           path = with pkgs; [ iproute ];

     

       113
       113
       +
           path = with pkgs; [ iproute2 ];

     

       114
       114
        
           serviceConfig = {

     

       115
       115
        
             ExecStart = "${gce}/bin/google_network_daemon";

     

       116
       116
        
             StandardOutput="journal+console";

+1 -1

nixos/modules/virtualisation/nixos-containers.nix

···

       739
       739
        
       

     

       740
       740
        
             unitConfig.RequiresMountsFor = "/var/lib/containers/%i";

     

       741
       741
        
       

     

       742
       742
       -
             path = [ pkgs.iproute ];

     

       742
       742
       +
             path = [ pkgs.iproute2 ];

     

       743
       743
        
       

     

       744
       744
        
             environment = {

     

       745
       745
        
               root = "/var/lib/containers/%i";

+1 -1

nixos/modules/virtualisation/xe-guest-utilities.nix

···

       17
       17
        
             wantedBy    = [ "multi-user.target" ];

     

       18
       18
        
             after = [ "xe-linux-distribution.service" ];

     

       19
       19
        
             requires = [ "proc-xen.mount" ];

     

       20
       20
       -
             path = [ pkgs.coreutils pkgs.iproute ];

     

       20
       20
       +
             path = [ pkgs.coreutils pkgs.iproute2 ];

     

       21
       21
        
             serviceConfig = {

     

       22
       22
        
               PIDFile = "/run/xe-daemon.pid";

     

       23
       23
        
               ExecStart = "${pkgs.xe-guest-utilities}/bin/xe-daemon -p /run/xe-daemon.pid";

+1 -1

nixos/modules/virtualisation/xen-dom0.nix

···

       248
       248
        
           # Xen provides udev rules.

     

       249
       249
        
           services.udev.packages = [ cfg.package ];

     

       250
       250
        
       

     

       251
       251
       -
           services.udev.path = [ pkgs.bridge-utils pkgs.iproute ];

     

       251
       251
       +
           services.udev.path = [ pkgs.bridge-utils pkgs.iproute2 ];

     

       252
       252
        
       

     

       253
       253
        
           systemd.services.xen-store = {

     

       254
       254
        
             description = "Xen Store Daemon";

+1 -1

nixos/tests/mysql/mariadb-galera-mariabackup.nix

···

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         mysqlenv-common      = pkgs.buildEnv { name = "mysql-path-env-common";      pathsToLink = [ "/bin" ]; paths = with pkgs; [ bash gawk gnutar inetutils which ]; };

     

       5
       5
       -
         mysqlenv-mariabackup = pkgs.buildEnv { name = "mysql-path-env-mariabackup"; pathsToLink = [ "/bin" ]; paths = with pkgs; [ gzip iproute netcat procps pv socat ]; };

     

       5
       5
       +
         mysqlenv-mariabackup = pkgs.buildEnv { name = "mysql-path-env-mariabackup"; pathsToLink = [ "/bin" ]; paths = with pkgs; [ gzip iproute2 netcat procps pv socat ]; };

     

       6
       6
        
       

     

       7
       7
        
       in {

     

       8
       8
        
         name = "mariadb-galera-mariabackup";

+3 -3

nixos/tests/wireguard/basic.nix

···

       52
       52
        
                     inherit (wg-snakeoil-keys.peer0) publicKey;

     

       53
       53
        
                   };

     

       54
       54
        
       

     

       55
       55
       -
                   postSetup = let inherit (pkgs) iproute; in ''

     

       56
       56
       -
                     ${iproute}/bin/ip route replace 10.23.42.1/32 dev wg0

     

       57
       57
       -
                     ${iproute}/bin/ip route replace fc00::1/128 dev wg0

     

       55
       55
       +
                   postSetup = let inherit (pkgs) iproute2; in ''

     

       56
       56
       +
                     ${iproute2}/bin/ip route replace 10.23.42.1/32 dev wg0

     

       57
       57
       +
                     ${iproute2}/bin/ip route replace fc00::1/128 dev wg0

     

       58
       58
        
                   '';

     

       59
       59
        
                 };

     

       60
       60
        
               };

+2 -2

pkgs/applications/misc/bashSnippets/default.nix

···

       1
       1
        
       { stdenv, lib, fetchFromGitHub, makeWrapper

     

       2
       2
       -
       , curl, python3, bind, iproute, bc, gitMinimal }:

     

       2
       2
       +
       , curl, python3, bind, iproute2, bc, gitMinimal }:

     

       3
       3
        
       let

     

       4
       4
        
         version = "1.23.0";

     

       5
       5
        
         deps = lib.makeBinPath [

     

       6
       6
        
           curl

     

       7
       7
        
           python3

     

       8
       8
        
           bind.dnsutils

     

       9
       9
       -
           iproute

     

       9
       9
       +
           iproute2

     

       10
       10
        
           bc

     

       11
       11
        
           gitMinimal

     

       12
       12
        
         ];

+2 -2

pkgs/applications/networking/appgate-sdp/default.nix

···

       17
       17
        
       , glib

     

       18
       18
        
       , gtk3

     

       19
       19
        
       , icu

     

       20
       20
       -
       , iproute

     

       20
       20
       +
       , iproute2

     

       21
       21
        
       , krb5

     

       22
       22
        
       , lib

     

       23
       23
        
       , mesa

     
···

       169
       169
        
             patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "$ORIGIN:$out/opt/appgate/service/:$out/opt/appgate/:${rpath}" $binary

     

       170
       170
        
           done

     

       171
       171
        
       

     

       172
       172
       -
           wrapProgram $out/opt/appgate/appgate-driver --prefix PATH : ${lib.makeBinPath [ iproute networkmanager dnsmasq ]}

     

       172
       172
       +
           wrapProgram $out/opt/appgate/appgate-driver --prefix PATH : ${lib.makeBinPath [ iproute2 networkmanager dnsmasq ]}

     

       173
       173
        
           wrapProgram $out/opt/appgate/linux/set_dns --set PYTHONPATH $PYTHONPATH

     

       174
       174
        
         '';

     

       175
       175
        
         meta = with lib; {

+2 -2

pkgs/applications/networking/cluster/k3s/default.nix

···

       3
       3
        
       , makeWrapper

     

       4
       4
        
       , socat

     

       5
       5
        
       , iptables

     

       6
       6
       -
       , iproute

     

       6
       6
       +
       , iproute2

     

       7
       7
        
       , bridge-utils

     

       8
       8
        
       , conntrack-tools

     

       9
       9
        
       , buildGoPackage

     
···

       240
       240
        
           kmod

     

       241
       241
        
           socat

     

       242
       242
        
           iptables

     

       243
       243
       -
           iproute

     

       243
       243
       +
           iproute2

     

       244
       244
        
           bridge-utils

     

       245
       245
        
           ethtool

     

       246
       246
        
           util-linux

+2 -2

pkgs/applications/networking/firehol/default.nix

···

       1
       1
        
       { stdenv, lib, fetchFromGitHub, pkgs

     

       2
       2
       -
       , autoconf, automake, curl, iprange, iproute, ipset, iptables, iputils

     

       2
       2
       +
       , autoconf, automake, curl, iprange, iproute2, ipset, iptables, iputils

     

       3
       3
        
       , kmod, nettools, procps, tcpdump, traceroute, util-linux, whois

     

       4
       4
        
       

     

       5
       5
        
       # If true, just install FireQOS without FireHOL

     
···

       35
       35
        
       

     

       36
       36
        
         nativeBuildInputs = [ autoconf automake ];

     

       37
       37
        
         buildInputs = [

     

       38
       38
       -
           curl iprange iproute ipset iptables iputils kmod

     

       38
       38
       +
           curl iprange iproute2 ipset iptables iputils kmod

     

       39
       39
        
           nettools procps tcpdump traceroute util-linux whois

     

       40
       40
        
         ];

     

       41
       41

+2 -2

pkgs/applications/networking/ike/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, fetchpatch, cmake, openssl, libedit, flex, bison, qt4, makeWrapper

     

       2
       2
       -
       , gcc, nettools, iproute, linuxHeaders }:

     

       2
       2
       +
       , gcc, nettools, iproute2, linuxHeaders }:

     

       3
       3
        
       

     

       4
       4
        
       # NOTE: use $out/etc/iked.conf as sample configuration and also set: dhcp_file "/etc/iked.dhcp";

     

       5
       5
        
       # launch with "iked -f /etc/iked.conf"

     
···

       26
       26
        
         ];

     

       27
       27
        
       

     

       28
       28
        
         nativeBuildInputs = [ cmake flex bison makeWrapper ];

     

       29
       29
       -
         buildInputs = [ openssl libedit qt4 nettools iproute ];

     

       29
       29
       +
         buildInputs = [ openssl libedit qt4 nettools iproute2 ];

     

       30
       30
        
       

     

       31
       31
        
         postPatch = ''

     

       32
       32
        
           # fix build with bison3

+2 -2

pkgs/applications/networking/remote/x2goserver/default.nix

···

       1
       1
        
       { stdenv, lib, fetchurl, perlPackages, makeWrapper, perl, which, nx-libs

     

       2
       2
        
       , util-linux, coreutils, glibc, gawk, gnused, gnugrep, findutils, xorg

     

       3
       3
       -
       , nettools, iproute, bc, procps, psmisc, lsof, pwgen, openssh, sshfs, bash

     

       3
       3
       +
       , nettools, iproute2, bc, procps, psmisc, lsof, pwgen, openssh, sshfs, bash

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       let

     
···

       31
       31
        
       

     

       32
       32
        
         binaryDeps = [

     

       33
       33
        
           perlEnv which nx-libs util-linux coreutils glibc.bin gawk gnused gnugrep

     

       34
       34
       -
           findutils nettools iproute bc procps psmisc lsof pwgen openssh sshfs

     

       34
       34
       +
           findutils nettools iproute2 bc procps psmisc lsof pwgen openssh sshfs

     

       35
       35
        
           xorg.xauth xorg.xinit xorg.xrandr xorg.xmodmap xorg.xwininfo xorg.fontutil

     

       36
       36
        
           xorg.xkbcomp xorg.setxkbmap

     

       37
       37
        
         ];

+2 -2

pkgs/applications/virtualization/docker/default.nix

···

       13
       13
        
             , stdenv, fetchFromGitHub, fetchpatch, buildGoPackage

     

       14
       14
        
             , makeWrapper, installShellFiles, pkg-config

     

       15
       15
        
             , go-md2man, go, containerd, runc, docker-proxy, tini, libtool

     

       16
       16
       -
             , sqlite, iproute, lvm2, systemd, docker-buildx

     

       16
       16
       +
             , sqlite, iproute2, lvm2, systemd, docker-buildx

     

       17
       17
        
             , btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git

     

       18
       18
        
             , procps, libseccomp

     

       19
       19
        
             , nixosTests

     
···

       72
       72
        
             nativeBuildInputs = [ makeWrapper pkg-config go-md2man go libtool installShellFiles ];

     

       73
       73
        
             buildInputs = [ sqlite lvm2 btrfs-progs systemd libseccomp ];

     

       74
       74
        
       

     

       75
       75
       -
             extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps util-linux git ]);

     

       75
       75
       +
             extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute2 iptables e2fsprogs xz xfsprogs procps util-linux git ]);

     

       76
       76
        
       

     

       77
       77
        
             buildPhase = ''

     

       78
       78
        
               export GOCACHE="$TMPDIR/go-cache"

+2 -2

pkgs/applications/virtualization/gvisor/default.nix

···

       5
       5
        
       , git

     

       6
       6
        
       , glibcLocales

     

       7
       7
        
       , go

     

       8
       8
       -
       , iproute

     

       8
       8
       +
       , iproute2

     

       9
       9
        
       , iptables

     

       10
       10
        
       , makeWrapper

     

       11
       11
        
       , procps

     
···

       87
       87
        
       

     

       88
       88
        
             # Needed for the 'runsc do' subcomand

     

       89
       89
        
             wrapProgram $out/bin/runsc \

     

       90
       90
       -
               --prefix PATH : ${lib.makeBinPath [ iproute iptables procps ]}

     

       90
       90
       +
               --prefix PATH : ${lib.makeBinPath [ iproute2 iptables procps ]}

     

       91
       91
        
           '';

     

       92
       92
        
         };

     

       93
       93

+2 -2

pkgs/applications/virtualization/open-vm-tools/default.nix

···

       1
       1
        
       { stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook,

     

       2
       2
        
         fuse, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libtirpc, rpcsvc-proto,

     

       3
       3
        
         libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst,

     

       4
       4
       -
         pkg-config, glib, gdk-pixbuf-xlib, gtk3, gtkmm3, iproute, dbus, systemd, which,

     

       4
       4
       +
         pkg-config, glib, gdk-pixbuf-xlib, gtk3, gtkmm3, iproute2, dbus, systemd, which,

     

       5
       5
        
         withX ? true }:

     

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     
···

       59
       59
        
       

     

       60
       60
        
         postInstall = ''

     

       61
       61
        
           wrapProgram "$out/etc/vmware-tools/scripts/vmware/network" \

     

       62
       62
       -
             --prefix PATH ':' "${lib.makeBinPath [ iproute dbus systemd which ]}"

     

       62
       62
       +
             --prefix PATH ':' "${lib.makeBinPath [ iproute2 dbus systemd which ]}"

     

       63
       63
        
         '';

     

       64
       64
        
       

     

       65
       65
        
         meta = with lib; {

+2 -2

pkgs/applications/virtualization/x11docker/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg, getopt, gnugrep, gawk, ps, mount, iproute }:

     

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg, getopt, gnugrep, gawk, ps, mount, iproute2 }:

     

       2
       2
        
       stdenv.mkDerivation rec {

     

       3
       3
        
         pname = "x11docker";

     

       4
       4
        
         version = "6.6.2";

     
···

       16
       16
        
         installPhase = ''

     

       17
       17
        
           install -D x11docker "$out/bin/x11docker";

     

       18
       18
        
           wrapProgram "$out/bin/x11docker" \

     

       19
       19
       -
             --prefix PATH : "${lib.makeBinPath [ getopt gnugrep gawk ps mount iproute nx-libs xorg.xdpyinfo xorg.xhost xorg.xinit ]}"

     

       19
       19
       +
             --prefix PATH : "${lib.makeBinPath [ getopt gnugrep gawk ps mount iproute2 nx-libs xorg.xdpyinfo xorg.xhost xorg.xinit ]}"

     

       20
       20
        
         '';

     

       21
       21
        
       

     

       22
       22
        
         meta = {

+2 -2

pkgs/applications/virtualization/xen/generic.nix

···

       13
       13
        
       

     

       14
       14
        
       # Scripts

     

       15
       15
        
       , coreutils, gawk, gnused, gnugrep, diffutils, multipath-tools

     

       16
       16
       -
       , iproute, inetutils, iptables, bridge-utils, openvswitch, nbd, drbd

     

       16
       16
       +
       , iproute2, inetutils, iptables, bridge-utils, openvswitch, nbd, drbd

     

       17
       17
        
       , lvm2, util-linux, procps, systemd

     

       18
       18
        
       

     

       19
       19
        
       # Documentation

     
···

       31
       31
        
         scriptEnvPath = concatMapStringsSep ":" (x: "${x}/bin") [

     

       32
       32
        
           which perl

     

       33
       33
        
           coreutils gawk gnused gnugrep diffutils util-linux multipath-tools

     

       34
       34
       -
           iproute inetutils iptables bridge-utils openvswitch nbd drbd

     

       34
       34
       +
           iproute2 inetutils iptables bridge-utils openvswitch nbd drbd

     

       35
       35
        
         ];

     

       36
       36
        
       

     

       37
       37
        
         withXenfiles = f: concatStringsSep "\n" (mapAttrsToList f config.xenfiles);

+2 -2

pkgs/applications/window-managers/dwm/dwm-status.nix

···

       1
       1
        
       { lib, rustPlatform, fetchFromGitHub, dbus, gdk-pixbuf, libnotify, makeWrapper, pkg-config, xorg

     

       2
       2
        
       , enableAlsaUtils ? true, alsaUtils, coreutils

     

       3
       3
       -
       , enableNetwork ? true, dnsutils, iproute, wirelesstools }:

     

       3
       3
       +
       , enableNetwork ? true, dnsutils, iproute2, wirelesstools }:

     

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
        
         bins = lib.optionals enableAlsaUtils [ alsaUtils coreutils ]

     

       7
       7
       -
           ++ lib.optionals enableNetwork [ dnsutils iproute wirelesstools ];

     

       7
       7
       +
           ++ lib.optionals enableNetwork [ dnsutils iproute2 wirelesstools ];

     

       8
       8
        
       in

     

       9
       9
        
       

     

       10
       10
        
       rustPlatform.buildRustPackage rec {

+3 -3

pkgs/applications/window-managers/i3/blocks-gaps.nix

···

       1
       1
        
       { fetchFromGitHub, lib, stdenv, perl, makeWrapper

     

       2
       2
       -
       , iproute, acpi, sysstat, alsaUtils

     

       2
       2
       +
       , iproute2, acpi, sysstat, alsaUtils

     

       3
       3
        
       , scripts ? [ "bandwidth" "battery" "cpu_usage" "disk" "iface"

     

       4
       4
        
                     "load_average" "memory" "volume" "wifi" ]

     

       5
       5
        
       }:

     
···

       30
       30
        
       

     

       31
       31
        
         postFixup = ''

     

       32
       32
        
           wrapProgram $out/libexec/i3blocks/bandwidth \

     

       33
       33
       -
             --prefix PATH : ${makeBinPath (optional (elem "bandwidth" scripts) iproute)}

     

       33
       33
       +
             --prefix PATH : ${makeBinPath (optional (elem "bandwidth" scripts) iproute2)}

     

       34
       34
        
           wrapProgram $out/libexec/i3blocks/battery \

     

       35
       35
        
             --prefix PATH : ${makeBinPath (optional (elem "battery" scripts) acpi)}

     

       36
       36
        
           wrapProgram $out/libexec/i3blocks/cpu_usage \

     

       37
       37
        
             --prefix PATH : ${makeBinPath (optional (elem "cpu_usage" scripts) sysstat)}

     

       38
       38
        
           wrapProgram $out/libexec/i3blocks/iface \

     

       39
       39
       -
             --prefix PATH : ${makeBinPath (optional (elem "iface" scripts) iproute)}

     

       39
       39
       +
             --prefix PATH : ${makeBinPath (optional (elem "iface" scripts) iproute2)}

     

       40
       40
        
           wrapProgram $out/libexec/i3blocks/volume \

     

       41
       41
        
             --prefix PATH : ${makeBinPath (optional (elem "volume" scripts) alsaUtils)}

     

       42
       42
        
         '';

+3 -3

pkgs/development/libraries/libvirt/5.9.0.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, fetchgit

     

       2
       2
        
       , pkg-config, makeWrapper, libtool, autoconf, automake, fetchpatch

     

       3
       3
        
       , coreutils, libxml2, gnutls, perl, python2, attr

     

       4
       4
       -
       , iproute, iptables, readline, lvm2, util-linux, systemd, libpciaccess, gettext

     

       4
       4
       +
       , iproute2, iptables, readline, lvm2, util-linux, systemd, libpciaccess, gettext

     

       5
       5
        
       , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor

     

       6
       6
        
       , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages

     

       7
       7
        
       , curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, glib, rpcsvc-proto, libtirpc

     
···

       54
       54
        
       

     

       55
       55
        
         preConfigure = ''

     

       56
       56
        
           ${ optionalString (!buildFromTarball) "./bootstrap --no-git --gnulib-srcdir=$(pwd)/.gnulib" }

     

       57
       57
       -
           PATH=${lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables ebtables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH

     

       57
       57
       +
           PATH=${lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute2 iptables ebtables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH

     

       58
       58
        
           # the path to qemu-kvm will be stored in VM's .xml and .save files

     

       59
       59
        
           # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations

     

       60
       60
        
           substituteInPlace src/lxc/lxc_conf.c \

     
···

       101
       101
        
       

     

       102
       102
        
       

     

       103
       103
        
         postInstall = let

     

       104
       104
       -
           binPath = [ iptables iproute pmutils numad numactl bridge-utils dmidecode dnsmasq ebtables ] ++ optionals enableIscsi [ openiscsi ];

     

       104
       104
       +
           binPath = [ iptables iproute2 pmutils numad numactl bridge-utils dmidecode dnsmasq ebtables ] ++ optionals enableIscsi [ openiscsi ];

     

       105
       105
        
         in ''

     

       106
       106
        
           substituteInPlace $out/libexec/libvirt-guests.sh \

     

       107
       107
        
             --replace 'ON_BOOT=start'       'ON_BOOT=''${ON_BOOT:-start}' \

+3 -3

pkgs/development/libraries/libvirt/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, fetchgit

     

       2
       2
        
       , makeWrapper, autoreconfHook, fetchpatch

     

       3
       3
        
       , coreutils, libxml2, gnutls, perl, python3, attr, glib, docutils

     

       4
       4
       -
       , iproute, readline, lvm2, util-linux, systemd, libpciaccess, gettext

     

       4
       4
       +
       , iproute2, readline, lvm2, util-linux, systemd, libpciaccess, gettext

     

       5
       5
        
       , libtasn1, iptables, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor

     

       6
       6
        
       , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages

     

       7
       7
        
       , curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, dbus, libtirpc, rpcsvc-proto, darwin

     
···

       85
       85
        
             sed -i meson.build -e "s|conf.set_quoted('${var}',.*|conf.set_quoted('${var}','${value}')|"

     

       86
       86
        
           '';

     

       87
       87
        
         in ''

     

       88
       88
       -
           PATH=${lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables ebtables-compat lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH

     

       88
       88
       +
           PATH=${lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute2 iptables ebtables-compat lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH

     

       89
       89
        
           # the path to qemu-kvm will be stored in VM's .xml and .save files

     

       90
       90
        
           # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations

     

       91
       91
        
           substituteInPlace src/lxc/lxc_conf.c \

     
···

       126
       126
        
       

     

       127
       127
        
         postInstall = let

     

       128
       128
        
           # Keep the legacy iptables binary for now for backwards compatibility (comment on #109332)

     

       129
       129
       -
           binPath = [ iptables ebtables-compat iproute pmutils numad numactl bridge-utils dmidecode dnsmasq ] ++ optionals enableIscsi [ openiscsi ];

     

       129
       129
       +
           binPath = [ iptables ebtables-compat iproute2 pmutils numad numactl bridge-utils dmidecode dnsmasq ] ++ optionals enableIscsi [ openiscsi ];

     

       130
       130
        
         in ''

     

       131
       131
        
           substituteInPlace $out/libexec/libvirt-guests.sh \

     

       132
       132
        
             --replace 'ON_BOOT="start"'       'ON_BOOT=''${ON_BOOT:-start}' \

+2 -2

pkgs/development/libraries/tpm2-tss/default.nix

···

       1
       1
        
       { stdenv, lib, fetchFromGitHub

     

       2
       2
        
       , autoreconfHook, autoconf-archive, pkg-config, doxygen, perl

     

       3
       3
        
       , openssl, json_c, curl, libgcrypt

     

       4
       4
       -
       , cmocka, uthash, ibm-sw-tpm2, iproute, procps, which

     

       4
       4
       +
       , cmocka, uthash, ibm-sw-tpm2, iproute2, procps, which

     

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     
···

       20
       20
        
         ];

     

       21
       21
        
         buildInputs = [ openssl json_c curl libgcrypt ];

     

       22
       22
        
         checkInputs = [

     

       23
       23
       -
           cmocka uthash ibm-sw-tpm2 iproute procps which

     

       23
       23
       +
           cmocka uthash ibm-sw-tpm2 iproute2 procps which

     

       24
       24
        
         ];

     

       25
       25
        
       

     

       26
       26
        
         preAutoreconf = "./bootstrap";

+2 -2

pkgs/os-specific/linux/gogoclient/default.nix

···

       1
       1
       -
       {lib, stdenv, fetchurl, openssl, nettools, iproute, sysctl}:

     

       1
       1
       +
       {lib, stdenv, fetchurl, openssl, nettools, iproute2, sysctl}:

     

       2
       2
        
       

     

       3
       3
        
       let baseName = "gogoclient";

     

       4
       4
        
           version  = "1.2";

     
···

       29
       29
        
           substituteInPlace "$out/template/linux.sh" \

     

       30
       30
        
             --replace "/sbin/ifconfig" "${nettools}/bin/ifconfig" \

     

       31
       31
        
             --replace "/sbin/route"    "${nettools}/bin/route" \

     

       32
       32
       -
             --replace "/sbin/ip"       "${iproute}/sbin/ip" \

     

       32
       32
       +
             --replace "/sbin/ip"       "${iproute2}/sbin/ip" \

     

       33
       33
        
             --replace "/sbin/sysctl"   "${sysctl}/bin/sysctl"

     

       34
       34
        
           sed -i -e 's/^.*Exec \$route -A.*$/& metric 128/' $out/template/linux.sh

     

       35
       35
        
         '';

+2 -2

pkgs/os-specific/linux/hyperv-daemons/default.nix

···

       1
       1
        
       { stdenv, lib, python, kernel, makeWrapper, writeText

     

       2
       2
       -
       , gawk, iproute }:

     

       2
       2
       +
       , gawk, iproute2 }:

     

       3
       3
        
       

     

       4
       4
        
       let

     

       5
       5
        
         libexec = "libexec/hypervkvpd";

     
···

       42
       42
        
       

     

       43
       43
        
           postFixup = ''

     

       44
       44
        
             wrapProgram $out/bin/hv_kvp_daemon \

     

       45
       45
       -
               --prefix PATH : $out/bin:${lib.makeBinPath [ gawk iproute ]}

     

       45
       45
       +
               --prefix PATH : $out/bin:${lib.makeBinPath [ gawk iproute2 ]}

     

       46
       46
        
           '';

     

       47
       47
        
         };

     

       48
       48

+2 -2

pkgs/os-specific/linux/iproute/mptcp.nix

···

       1
       1
       -
       { lib, iproute, fetchFromGitHub }:

     

       1
       1
       +
       { lib, iproute2, fetchFromGitHub }:

     

       2
       2
        
       

     

       3
       3
       -
       iproute.overrideAttrs (oa: rec {

     

       3
       3
       +
       iproute2.overrideAttrs (oa: rec {

     

       4
       4
        
         pname = "iproute_mptcp";

     

       5
       5
        
         version = "0.95";

     

       6
       6

+1 -1

pkgs/os-specific/linux/openvswitch/lts.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, makeWrapper, pkg-config, util-linux, which

     

       2
       2
       -
       , procps, libcap_ng, openssl, python2, iproute , perl

     

       2
       2
       +
       , procps, libcap_ng, openssl, python2, perl

     

       3
       3
        
       , automake, autoconf, libtool, kernel ? null }:

     

       4
       4
        
       

     

       5
       5
        
       with lib;

+2 -2

pkgs/os-specific/linux/pipework/default.nix

···

       1
       1
        
       { stdenv, lib, fetchFromGitHub, makeWrapper

     

       2
       2
       -
       , bridge-utils, iproute, lxc, openvswitch, docker, busybox, dhcpcd, dhcp

     

       2
       2
       +
       , bridge-utils, iproute2, lxc, openvswitch, docker, busybox, dhcpcd, dhcp

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation {

     
···

       15
       15
        
         installPhase = ''

     

       16
       16
        
           install -D pipework $out/bin/pipework

     

       17
       17
        
           wrapProgram $out/bin/pipework --prefix PATH : \

     

       18
       18
       -
             ${lib.makeBinPath [ bridge-utils iproute lxc openvswitch docker busybox dhcpcd dhcp ]};

     

       18
       18
       +
             ${lib.makeBinPath [ bridge-utils iproute2 lxc openvswitch docker busybox dhcpcd dhcp ]};

     

       19
       19
        
         '';

     

       20
       20
        
         meta = with lib; {

     

       21
       21
        
           description = "Software-Defined Networking tools for LXC";

+2 -2

pkgs/os-specific/linux/rdma-core/default.nix

···

       1
       1
        
       { lib, stdenv, fetchFromGitHub, cmake, pkg-config, docutils

     

       2
       2
       -
       , pandoc, ethtool, iproute, libnl, udev, python3, perl

     

       2
       2
       +
       , pandoc, ethtool, iproute2, libnl, udev, python3, perl

     

       3
       3
        
       , makeWrapper

     

       4
       4
        
       } :

     

       5
       5
        
       

     
···

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         nativeBuildInputs = [ cmake pkg-config pandoc docutils makeWrapper ];

     

       21
       21
       -
         buildInputs = [ libnl ethtool iproute udev python3 perl ];

     

       21
       21
       +
         buildInputs = [ libnl ethtool iproute2 udev python3 perl ];

     

       22
       22
        
       

     

       23
       23
        
         cmakeFlags = [

     

       24
       24
        
           "-DCMAKE_INSTALL_RUNDIR=/run"

+3 -3

pkgs/servers/http/nix-binary-cache/default.nix

···

       1
       1
        
       {lib, stdenv

     

       2
       2
        
       , coreutils, findutils, nix, xz, bzip2, gnused, gnugrep, openssl

     

       3
       3
       -
       , lighttpd, iproute }:

     

       3
       3
       +
       , lighttpd, iproute2 }:

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         version = "2014-06-29-1";

     

       6
       6
        
         pname = "nix-binary-cache";

     
···

       21
       21
        
             --replace @gnugrep@ "${gnugrep}/bin" \

     

       22
       22
        
             --replace @openssl@ "${openssl.bin}/bin" \

     

       23
       23
        
             --replace @lighttpd@ "${lighttpd}/sbin" \

     

       24
       24
       -
             --replace @iproute@ "${iproute}/sbin" \

     

       24
       24
       +
             --replace @iproute@ "${iproute2}/sbin" \

     

       25
       25
        
             --replace "xXxXx" "xXxXx"

     

       26
       26
        
       

     

       27
       27
        
           chmod a+x "$out/bin/nix-binary-cache.cgi"

     
···

       38
       38
        
             --replace @gnugrep@ "${gnugrep}/bin" \

     

       39
       39
        
             --replace @openssl@ "${openssl.bin}/bin" \

     

       40
       40
        
             --replace @lighttpd@ "${lighttpd}/sbin" \

     

       41
       41
       -
             --replace @iproute@ "${iproute}/sbin" \

     

       41
       41
       +
             --replace @iproute@ "${iproute2}/sbin" \

     

       42
       42
        
             --replace "xXxXx" "xXxXx"

     

       43
       43
        
       

     

       44
       44
        
           chmod a+x "$out/bin/nix-binary-cache-start"

+4 -4

pkgs/servers/monitoring/fusion-inventory/default.nix

···

       1
       1
       -
       { lib, perlPackages, nix, dmidecode, pciutils, usbutils, iproute, nettools

     

       1
       1
       +
       { lib, perlPackages, nix, dmidecode, pciutils, usbutils, iproute2, nettools

     

       2
       2
        
       , fetchFromGitHub, makeWrapper

     

       3
       3
        
       }:

     

       4
       4
        
       

     
···

       18
       18
        
           patchShebangs bin

     

       19
       19
        
       

     

       20
       20
        
           substituteInPlace "lib/FusionInventory/Agent/Tools/Linux.pm" \

     

       21
       21
       -
             --replace /sbin/ip ${iproute}/sbin/ip

     

       21
       21
       +
             --replace /sbin/ip ${iproute2}/sbin/ip

     

       22
       22
        
           substituteInPlace "lib/FusionInventory/Agent/Task/Inventory/Linux/Networks.pm" \

     

       23
       23
       -
             --replace /sbin/ip ${iproute}/sbin/ip

     

       23
       23
       +
             --replace /sbin/ip ${iproute2}/sbin/ip

     

       24
       24
        
         '';

     

       25
       25
        
       

     

       26
       26
        
         buildTools = [];

     
···

       67
       67
        
           for cur in $out/bin/*; do

     

       68
       68
        
             if [ -x "$cur" ]; then

     

       69
       69
        
               sed -e "s|./lib|$out/lib|" -i "$cur"

     

       70
       70
       -
               wrapProgram "$cur" --prefix PATH : ${lib.makeBinPath [nix dmidecode pciutils usbutils nettools iproute]}

     

       70
       70
       +
               wrapProgram "$cur" --prefix PATH : ${lib.makeBinPath [nix dmidecode pciutils usbutils nettools iproute2]}

     

       71
       71
        
             fi

     

       72
       72
        
           done

     

       73
       73
        
         '';

+2 -2

pkgs/servers/monitoring/mackerel-agent/default.nix

···

       1
       1
       -
       { stdenv, lib, buildGoModule, fetchFromGitHub, makeWrapper, iproute, nettools }:

     

       1
       1
       +
       { stdenv, lib, buildGoModule, fetchFromGitHub, makeWrapper, iproute2, nettools }:

     

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "mackerel-agent";

     
···

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ makeWrapper ];

     

       15
       15
        
         checkInputs = lib.optionals (!stdenv.isDarwin) [ nettools ];

     

       16
       16
       -
         buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute ];

     

       16
       16
       +
         buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute2 ];

     

       17
       17
        
       

     

       18
       18
        
         vendorSha256 = "sha256-yomxALecP+PycelOmwrteK/LoW7wsst7os+jcbF46Bs=";

     

       19
       19

+2 -2

pkgs/servers/tailscale/default.nix

···

       1
       1
       -
       { lib, buildGoModule, fetchFromGitHub, makeWrapper, iptables, iproute }:

     

       1
       1
       +
       { lib, buildGoModule, fetchFromGitHub, makeWrapper, iptables, iproute2 }:

     

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "tailscale";

     
···

       30
       30
        
       

     

       31
       31
        
         postInstall = ''

     

       32
       32
        
           wrapProgram $out/bin/tailscaled --prefix PATH : ${

     

       33
       33
       -
             lib.makeBinPath [ iproute iptables ]

     

       33
       33
       +
             lib.makeBinPath [ iproute2 iptables ]

     

       34
       34
        
           }

     

       35
       35
        
           sed -i -e "s#/usr/sbin#$out/bin#" -e "/^EnvironmentFile/d" ./cmd/tailscaled/tailscaled.service

     

       36
       36
        
           install -D -m0444 -t $out/lib/systemd/system ./cmd/tailscaled/tailscaled.service

+2 -2

pkgs/tools/admin/acme.sh/default.nix

···

       1
       1
       -
       { stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute, unixtools, dnsutils }:

     

       1
       1
       +
       { stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute2, unixtools, dnsutils }:

     

       2
       2
        
       stdenv.mkDerivation rec {

     

       3
       3
        
         pname = "acme.sh";

     

       4
       4
        
         version = "2.8.8";

     
···

       22
       22
        
                 openssl

     

       23
       23
        
                 curl

     

       24
       24
        
                 dnsutils

     

       25
       25
       -
                 (if stdenv.isLinux then iproute else unixtools.netstat)

     

       25
       25
       +
                 (if stdenv.isLinux then iproute2 else unixtools.netstat)

     

       26
       26
        
               ]

     

       27
       27
        
             }"

     

       28
       28
        
         '';

+2 -2

pkgs/tools/admin/lxd/default.nix

···

       1
       1
        
       { lib, hwdata, pkg-config, lxc, buildGoPackage, fetchurl

     

       2
       2
        
       , makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq

     

       3
       3
       -
       , squashfsTools, iproute, iptables, ebtables, iptables-nftables-compat, libcap

     

       3
       3
       +
       , squashfsTools, iproute2, iptables, ebtables, iptables-nftables-compat, libcap

     

       4
       4
        
       , libco-canonical, dqlite, raft-canonical, sqlite-replication, udev

     

       5
       5
        
       , writeShellScriptBin, apparmor-profiles, apparmor-parser

     

       6
       6
        
       , criu

     
···

       48
       48
        
       

     

       49
       49
        
           wrapProgram $out/bin/lxd --prefix PATH : ${lib.makeBinPath (

     

       50
       50
        
             networkPkgs

     

       51
       51
       -
             ++ [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute bash criu ]

     

       51
       51
       +
             ++ [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute2 bash criu ]

     

       52
       52
        
             ++ [ (writeShellScriptBin "apparmor_parser" ''

     

       53
       53
        
                    exec '${apparmor-parser}/bin/apparmor_parser' -I '${apparmor-profiles}/etc/apparmor.d' "$@"

     

       54
       54
        
                  '') ]

+3 -3

pkgs/tools/bluetooth/blueman/default.nix

···

       1
       1
        
       { config, stdenv, lib, fetchurl, intltool, pkg-config, python3Packages, bluez, gtk3

     

       2
       2
       -
       , obex_data_server, xdg-utils, dnsmasq, dhcp, libappindicator, iproute

     

       2
       2
       +
       , obex_data_server, xdg-utils, dnsmasq, dhcp, libappindicator, iproute2

     

       3
       3
        
       , gnome3, librsvg, wrapGAppsHook, gobject-introspection, autoreconfHook

     

       4
       4
        
       , networkmanager, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio, fetchpatch }:

     

       5
       5
        
       

     

       6
       6
        
       let

     

       7
       7
        
         pythonPackages = python3Packages;

     

       8
       8
       -
         binPath = lib.makeBinPath [ xdg-utils dnsmasq dhcp iproute ];

     

       8
       8
       +
         binPath = lib.makeBinPath [ xdg-utils dnsmasq dhcp iproute2 ];

     

       9
       9
        
       

     

       10
       10
        
       in stdenv.mkDerivation rec {

     

       11
       11
        
         pname = "blueman";

     
···

       23
       23
        
         ];

     

       24
       24
        
       

     

       25
       25
        
         buildInputs = [ bluez gtk3 pythonPackages.python librsvg

     

       26
       26
       -
                         gnome3.adwaita-icon-theme iproute libappindicator networkmanager ]

     

       26
       26
       +
                         gnome3.adwaita-icon-theme iproute2 libappindicator networkmanager ]

     

       27
       27
        
                       ++ pythonPath

     

       28
       28
        
                       ++ lib.optional withPulseAudio libpulseaudio;

     

       29
       29

+3 -3

pkgs/tools/networking/ddclient/default.nix

···

       1
       1
       -
       { lib, fetchurl, perlPackages, iproute, perl }:

     

       1
       1
       +
       { lib, fetchurl, perlPackages, iproute2, perl }:

     

       2
       2
        
       

     

       3
       3
        
       perlPackages.buildPerlPackage rec {

     

       4
       4
        
         pname = "ddclient";

     
···

       19
       19
        
           touch Makefile.PL

     

       20
       20
        
           substituteInPlace ddclient \

     

       21
       21
        
             --replace 'in the output of ifconfig' 'in the output of ip addr show' \

     

       22
       22
       -
             --replace 'ifconfig -a' '${iproute}/sbin/ip addr show' \

     

       23
       23
       -
             --replace 'ifconfig $arg' '${iproute}/sbin/ip addr show $arg' \

     

       22
       22
       +
             --replace 'ifconfig -a' '${iproute2}/sbin/ip addr show' \

     

       23
       23
       +
             --replace 'ifconfig $arg' '${iproute2}/sbin/ip addr show $arg' \

     

       24
       24
        
             --replace '/usr/bin/perl' '${perl}/bin/perl' # Until we get the patchShebangs fixed (issue #55786) we need to patch this manually

     

       25
       25
        
         '';

     

       26
       26

+2 -2

pkgs/tools/networking/dhcp/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, perl, file, nettools, iputils, iproute, makeWrapper

     

       1
       1
       +
       { stdenv, fetchurl, perl, file, nettools, iputils, iproute2, makeWrapper

     

       2
       2
        
       , coreutils, gnused, openldap ? null

     

       3
       3
        
       , buildPackages, lib

     

       4
       4
        
       }:

     
···

       59
       59
        
       

     

       60
       60
        
             cp client/scripts/linux $out/sbin/dhclient-script

     

       61
       61
        
             substituteInPlace $out/sbin/dhclient-script \

     

       62
       62
       -
               --replace /sbin/ip ${iproute}/sbin/ip

     

       62
       62
       +
               --replace /sbin/ip ${iproute2}/sbin/ip

     

       63
       63
        
             wrapProgram "$out/sbin/dhclient-script" --prefix PATH : \

     

       64
       64
        
               "${nettools}/bin:${nettools}/sbin:${iputils}/bin:${coreutils}/bin:${gnused}/bin"

     

       65
       65
        
           '';

+2 -2

pkgs/tools/networking/gvpe/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, openssl, gmp, zlib, iproute, nettools }:

     

       1
       1
       +
       { lib, stdenv, fetchurl, openssl, gmp, zlib, iproute2, nettools }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "gvpe";

     
···

       20
       20
        
           ];

     

       21
       21
        
       

     

       22
       22
        
         preBuild = ''

     

       23
       23
       -
           sed -e 's@"/sbin/ifconfig.*"@"${iproute}/sbin/ip link set $IFNAME address $MAC mtu $MTU"@' -i src/device-linux.C

     

       23
       23
       +
           sed -e 's@"/sbin/ifconfig.*"@"${iproute2}/sbin/ip link set $IFNAME address $MAC mtu $MTU"@' -i src/device-linux.C

     

       24
       24
        
           sed -e 's@/sbin/ifconfig@${nettools}/sbin/ifconfig@g' -i src/device-*.C

     

       25
       25
        
         '';

     

       26
       26

+3 -3

pkgs/tools/networking/libreswan/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, makeWrapper,

     

       2
       2
        
         pkg-config, systemd, gmp, unbound, bison, flex, pam, libevent, libcap_ng, curl, nspr,

     

       3
       3
       -
         bash, iproute, iptables, procps, coreutils, gnused, gawk, nss, which, python3,

     

       3
       3
       +
         bash, iproute2, iptables, procps, coreutils, gnused, gawk, nss, which, python3,

     

       4
       4
        
         docs ? false, xmlto, libselinux, ldns

     

       5
       5
        
         }:

     

       6
       6
        
       

     

       7
       7
        
       let

     

       8
       8
        
         binPath = lib.makeBinPath [

     

       9
       9
       -
           bash iproute iptables procps coreutils gnused gawk nss.tools which python3

     

       9
       9
       +
           bash iproute2 iptables procps coreutils gnused gawk nss.tools which python3

     

       10
       10
        
         ];

     

       11
       11
        
       in

     

       12
       12
        
       

     
···

       44
       44
        
           pkg-config

     

       45
       45
        
         ];

     

       46
       46
        
       

     

       47
       47
       -
         buildInputs = [ bash iproute iptables systemd coreutils gnused gawk gmp unbound pam libevent

     

       47
       47
       +
         buildInputs = [ bash iproute2 iptables systemd coreutils gnused gawk gmp unbound pam libevent

     

       48
       48
        
                         libcap_ng curl nspr nss python3 ldns ]

     

       49
       49
        
                       ++ lib.optional docs xmlto

     

       50
       50
        
                       ++ lib.optional stdenv.isLinux libselinux;

+2 -2

pkgs/tools/networking/miniupnpd/default.nix

···

       1
       1
        
       { stdenv, lib, fetchurl, iptables, libuuid, pkg-config

     

       2
       2
       -
       , which, iproute, gnused, coreutils, gawk, makeWrapper

     

       2
       2
       +
       , which, iproute2, gnused, coreutils, gawk, makeWrapper

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
       -
         scriptBinEnv = lib.makeBinPath [ which iproute iptables gnused coreutils gawk ];

     

       6
       6
       +
         scriptBinEnv = lib.makeBinPath [ which iproute2 iptables gnused coreutils gawk ];

     

       7
       7
        
       in

     

       8
       8
        
       stdenv.mkDerivation rec {

     

       9
       9
        
         name = "miniupnpd-2.1.20190502";

+2 -2

pkgs/tools/networking/miredo/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, nettools, iproute, judy }:

     

       1
       1
       +
       { lib, stdenv, fetchurl, nettools, iproute2, judy }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         version = "1.2.6";

     
···

       15
       15
        
           substituteInPlace misc/client-hook.bsd \

     

       16
       16
        
             --replace '/sbin/route' '${nettools}/bin/route' \

     

       17
       17
        
             --replace '/sbin/ifconfig' '${nettools}/bin/ifconfig'

     

       18
       18
       -
           substituteInPlace misc/client-hook.iproute --replace '/sbin/ip' '${iproute}/bin/ip'

     

       18
       18
       +
           substituteInPlace misc/client-hook.iproute --replace '/sbin/ip' '${iproute2}/bin/ip'

     

       19
       19
        
         '';

     

       20
       20
        
       

     

       21
       21
        
         configureFlags = [ "--with-Judy" ];

+4 -4

pkgs/tools/networking/openvpn/default.nix

···

       3
       3
        
       , pkg-config

     

       4
       4
        
       , makeWrapper

     

       5
       5
        
       , runtimeShell

     

       6
       6
       -
       , iproute

     

       6
       6
       +
       , iproute2

     

       7
       7
        
       , lzo

     

       8
       8
        
       , openssl

     

       9
       9
        
       , pam

     
···

       40
       40
        
       

     

       41
       41
        
               buildInputs = [ lzo openssl ]

     

       42
       42
        
                 ++ optional stdenv.isLinux pam

     

       43
       43
       -
                 ++ optional withIpRoute iproute

     

       43
       43
       +
                 ++ optional withIpRoute iproute2

     

       44
       44
        
                 ++ optional useSystemd systemd

     

       45
       45
        
                 ++ optional pkcs11Support pkcs11helper;

     

       46
       46
        
       

     

       47
       47
        
               configureFlags = optionals withIpRoute [

     

       48
       48
        
                 "--enable-iproute2"

     

       49
       49
       -
                 "IPROUTE=${iproute}/sbin/ip"

     

       49
       49
       +
                 "IPROUTE=${iproute2}/sbin/ip"

     

       50
       50
        
               ]

     

       51
       51
        
               ++ optional useSystemd "--enable-systemd"

     

       52
       52
        
               ++ optional pkcs11Support "--enable-pkcs11"

     
···

       60
       60
        
               '' + optionalString useSystemd ''

     

       61
       61
        
                 install -Dm555 ${update-resolved} $out/libexec/update-systemd-resolved

     

       62
       62
        
                 wrapProgram $out/libexec/update-systemd-resolved \

     

       63
       63
       -
                   --prefix PATH : ${makeBinPath [ runtimeShell iproute systemd util-linux ]}

     

       63
       63
       +
                   --prefix PATH : ${makeBinPath [ runtimeShell iproute2 systemd util-linux ]}

     

       64
       64
        
               '';

     

       65
       65
        
       

     

       66
       66
        
               enableParallelBuilding = true;

+2 -2

pkgs/tools/networking/openvpn/update-systemd-resolved.nix

···

       1
       1
        
       { lib, stdenv, fetchFromGitHub

     

       2
       2
        
       , makeWrapper

     

       3
       3
       -
       , iproute, systemd, coreutils, util-linux }:

     

       3
       3
       +
       , iproute2, systemd, coreutils, util-linux }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         pname = "update-systemd-resolved";

     
···

       21
       21
        
       

     

       22
       22
        
         installPhase = ''

     

       23
       23
        
           wrapProgram $out/libexec/openvpn/update-systemd-resolved \

     

       24
       24
       -
             --prefix PATH : ${lib.makeBinPath [ iproute systemd coreutils util-linux ]}

     

       24
       24
       +
             --prefix PATH : ${lib.makeBinPath [ iproute2 systemd coreutils util-linux ]}

     

       25
       25
        
         '';

     

       26
       26
        
       

     

       27
       27
        
         meta = with lib; {

+2 -2

pkgs/tools/networking/pptp/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, perl, ppp, iproute }:

     

       1
       1
       +
       { lib, stdenv, fetchurl, perl, ppp, iproute2 }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "pptp";

     
···

       14
       14
        
         '';

     

       15
       15
        
       

     

       16
       16
        
         preConfigure = ''

     

       17
       17
       -
           makeFlagsArray=( IP=${iproute}/bin/ip PPPD=${ppp}/sbin/pppd \

     

       17
       17
       +
           makeFlagsArray=( IP=${iproute2}/bin/ip PPPD=${ppp}/sbin/pppd \

     

       18
       18
        
                            BINDIR=$out/sbin MANDIR=$out/share/man/man8 \

     

       19
       19
        
                            PPPDIR=$out/etc/ppp )

     

       20
       20
        
         '';

+3 -3

pkgs/tools/networking/shorewall/default.nix

···

       3
       3
        
       , fetchurl

     

       4
       4
        
       , gnugrep

     

       5
       5
        
       , gnused

     

       6
       6
       -
       , iproute

     

       6
       6
       +
       , iproute2

     

       7
       7
        
       , ipset

     

       8
       8
        
       , iptables

     

       9
       9
        
       , perl

     
···

       15
       15
        
       let

     

       16
       16
        
         PATH = lib.concatStringsSep ":"

     

       17
       17
        
                  [ "${coreutils}/bin"

     

       18
       18
       -
                    "${iproute}/bin"

     

       18
       18
       +
                    "${iproute2}/bin"

     

       19
       19
        
                    "${iptables}/bin"

     

       20
       20
        
                    "${ipset}/bin"

     

       21
       21
        
                    "${ebtables}/bin"

     
···

       46
       46
        
       

     

       47
       47
        
         buildInputs = [

     

       48
       48
        
           coreutils

     

       49
       49
       -
           iproute

     

       49
       49
       +
           iproute2

     

       50
       50
        
           ipset

     

       51
       51
        
           iptables

     

       52
       52
        
           ebtables

+2 -2

pkgs/tools/networking/wicd/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, python2Packages

     

       2
       2
        
       , wpa_supplicant, dhcp, dhcpcd, wirelesstools

     

       3
       3
       -
       , nettools, openresolv, iproute, iputils }:

     

       3
       3
       +
       , nettools, openresolv, iproute2, iputils }:

     

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
        
         inherit (python2Packages) python pygobject2 dbus-python pyGtkGlade pycairo;

     
···

       36
       36
        
       

     

       37
       37
        
           substituteInPlace in/scripts=wicd.in --subst-var-by TEMPLATE-DEFAULT $out/share/other/dhclient.conf.template.default

     

       38
       38
        
       

     

       39
       39
       -
           sed -i "2iexport PATH=${lib.makeBinPath [ python wpa_supplicant dhcpcd dhcp wirelesstools nettools nettools iputils openresolv iproute ]}\$\{PATH:+:\}\$PATH" in/scripts=wicd.in

     

       39
       39
       +
           sed -i "2iexport PATH=${lib.makeBinPath [ python wpa_supplicant dhcpcd dhcp wirelesstools nettools nettools iputils openresolv iproute2 ]}\$\{PATH:+:\}\$PATH" in/scripts=wicd.in

     

       40
       40
        
           sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pygobject2}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd.in

     

       41
       41
        
           sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-client.in

     

       42
       42
        
           sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject2}):$(toPythonPath ${pygobject2})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-client.in

+2 -2

pkgs/tools/networking/wireguard-tools/default.nix

···

       3
       3
        
       , fetchzip

     

       4
       4
        
       , nixosTests

     

       5
       5
        
       , iptables

     

       6
       6
       -
       , iproute

     

       6
       6
       +
       , iproute2

     

       7
       7
        
       , makeWrapper

     

       8
       8
        
       , openresolv

     

       9
       9
        
       , procps

     
···

       38
       38
        
             --replace /usr/bin $out/bin

     

       39
       39
        
         '' + lib.optionalString stdenv.isLinux ''

     

       40
       40
        
           for f in $out/bin/*; do

     

       41
       41
       -
             wrapProgram $f --prefix PATH : ${lib.makeBinPath [ procps iproute iptables openresolv ]}

     

       41
       41
       +
             wrapProgram $f --prefix PATH : ${lib.makeBinPath [ procps iproute2 iptables openresolv ]}

     

       42
       42
        
           done

     

       43
       43
        
         '' + lib.optionalString stdenv.isDarwin ''

     

       44
       44
        
           for f in $out/bin/*; do

+2 -2

pkgs/tools/networking/zerotierone/default.nix

···

       1
       1
       -
       { lib, stdenv, buildPackages, fetchFromGitHub, openssl, lzo, zlib, iproute, ronn }:

     

       1
       1
       +
       { lib, stdenv, buildPackages, fetchFromGitHub, openssl, lzo, zlib, iproute2, ronn }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "zerotierone";

     
···

       22
       22
        
       

     

       23
       23
        
       

     

       24
       24
        
         nativeBuildInputs = [ ronn ];

     

       25
       25
       -
         buildInputs = [ openssl lzo zlib iproute ];

     

       25
       25
       +
         buildInputs = [ openssl lzo zlib iproute2 ];

     

       26
       26
        
       

     

       27
       27
        
         enableParallelBuilding = true;

     

       28
       28

+2 -2

pkgs/tools/system/inxi/default.nix

···

       2
       2
        
       , ps, dnsutils # dig is recommended for multiple categories

     

       3
       3
        
       , withRecommends ? false # Install (almost) all recommended tools (see --recommends)

     

       4
       4
        
       , withRecommendedSystemPrograms ? withRecommends, util-linuxMinimal, dmidecode

     

       5
       5
       -
       , file, hddtemp, iproute, ipmitool, usbutils, kmod, lm_sensors, smartmontools

     

       5
       5
       +
       , file, hddtemp, iproute2, ipmitool, usbutils, kmod, lm_sensors, smartmontools

     

       6
       6
        
       , binutils, tree, upower, pciutils

     

       7
       7
        
       , withRecommendedDisplayInformationPrograms ? withRecommends, glxinfo, xorg

     

       8
       8
        
       }:

     
···

       11
       11
        
         prefixPath = programs:

     

       12
       12
        
           "--prefix PATH ':' '${lib.makeBinPath programs}'";

     

       13
       13
        
         recommendedSystemPrograms = lib.optionals withRecommendedSystemPrograms [

     

       14
       14
       -
           util-linuxMinimal dmidecode file hddtemp iproute ipmitool usbutils kmod

     

       14
       14
       +
           util-linuxMinimal dmidecode file hddtemp iproute2 ipmitool usbutils kmod

     

       15
       15
        
           lm_sensors smartmontools binutils tree upower pciutils

     

       16
       16
        
         ];

     

       17
       17
        
         recommendedDisplayInformationPrograms = lib.optionals

+1

pkgs/top-level/aliases.nix

···

       310
       310
        
         infiniband-diags = rdma-core; # added 2019-08-09

     

       311
       311
        
         inotifyTools = inotify-tools;

     

       312
       312
        
         inter-ui = inter; # added 2021-03-27

     

       313
       313
       +
         iproute = iproute2; # moved from top-level 2021-03-14

     

       313
       314
        
         i-score = throw "i-score has been removed: abandoned upstream."; # added 2020-11-21

     

       314
       315
        
         jack2Full = jack2; # moved from top-level 2021-03-14

     

       315
       316
        
         jamomacore = throw "jamomacore has been removed: abandoned upstream."; # added 2020-11-21

-1

pkgs/top-level/all-packages.nix

···

       19495
       19495
        
         iotop = callPackage ../os-specific/linux/iotop { };

     

       19496
       19496
        
       

     

       19497
       19497
        
         iproute2 = callPackage ../os-specific/linux/iproute { };

     

       19498
       19498
       -
         iproute = iproute2; # Alias added 2020-11-15 (TODO: deprecate and move to pkgs/top-level/aliases.nix)

     

       19499
       19498
        
       

     

       19500
       19499
        
         iproute_mptcp = callPackage ../os-specific/linux/iproute/mptcp.nix { };

     

       19501
       19500