philipp
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

iproute: deprecate alias

master
Sandro Jäckel 2021-03-14 17:05:16 +01:00
parent dd9862ba98
commit 9378fdf87e
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
71 changed files with 140 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/programs/mininet.nix
View File

@ -8,7 +8,7 @@ let
cfg = config.programs.mininet; cfg = config.programs.mininet;
generatedPath = with pkgs; makeSearchPath "bin" [ generatedPath = with pkgs; makeSearchPath "bin" [
iperf ethtool iproute socat iperf ethtool iproute2 socat
]; ];
pyEnv = pkgs.python.withPackages(ps: [ ps.mininet-python ]); pyEnv = pkgs.python.withPackages(ps: [ ps.mininet-python ]);

2
nixos/modules/services/misc/mame.nix
View File

@ -53,7 +53,7 @@ in
description = "MAME TUN/TAP Ethernet interface"; description = "MAME TUN/TAP Ethernet interface";
after = [ "network.target" ]; after = [ "network.target" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
path = [ pkgs.iproute ]; path = [ pkgs.iproute2 ];
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
RemainAfterExit = true; RemainAfterExit = true;

4
nixos/modules/services/monitoring/datadog-agent.nix
View File

@ -225,7 +225,7 @@ in {
}; };
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
environment.systemPackages = [ datadogPkg pkgs.sysstat pkgs.procps pkgs.iproute ]; environment.systemPackages = [ datadogPkg pkgs.sysstat pkgs.procps pkgs.iproute2 ];
users.users.datadog = { users.users.datadog = {
description = "Datadog Agent User"; description = "Datadog Agent User";
@ -239,7 +239,7 @@ in {
systemd.services = let systemd.services = let
makeService = attrs: recursiveUpdate { makeService = attrs: recursiveUpdate {
path = [ datadogPkg pkgs.python pkgs.sysstat pkgs.procps pkgs.iproute ]; path = [ datadogPkg pkgs.python pkgs.sysstat pkgs.procps pkgs.iproute2 ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
serviceConfig = { serviceConfig = {
User = "datadog"; User = "datadog";

2
nixos/modules/services/monitoring/scollector.nix
View File

@ -113,7 +113,7 @@ in {
description = "scollector metrics collector (part of Bosun)"; description = "scollector metrics collector (part of Bosun)";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
path = [ pkgs.coreutils pkgs.iproute ]; path = [ pkgs.coreutils pkgs.iproute2 ];
serviceConfig = { serviceConfig = {
User = cfg.user; User = cfg.user;

2
nixos/modules/services/networking/consul.nix
View File

@ -191,7 +191,7 @@ in
ExecStop = "${cfg.package}/bin/consul leave"; ExecStop = "${cfg.package}/bin/consul leave";
}); });
path = with pkgs; [ iproute gnugrep gawk consul ]; path = with pkgs; [ iproute2 gnugrep gawk consul ];
preStart = '' preStart = ''
mkdir -m 0700 -p ${dataDir} mkdir -m 0700 -p ${dataDir}
chown -R consul ${dataDir} chown -R consul ${dataDir}

2
nixos/modules/services/networking/ircd-hybrid/default.nix
View File

@ -10,7 +10,7 @@ let
name = "ircd-hybrid-service"; name = "ircd-hybrid-service";
scripts = [ "=>/bin" ./control.in ]; scripts = [ "=>/bin" ./control.in ];
substFiles = [ "=>/conf" ./ircd.conf ]; substFiles = [ "=>/conf" ./ircd.conf ];
inherit (pkgs) ircdHybrid coreutils su iproute gnugrep procps; inherit (pkgs) ircdHybrid coreutils su iproute2 gnugrep procps;
ipv6Enabled = boolToString config.networking.enableIPv6; ipv6Enabled = boolToString config.networking.enableIPv6;

2
nixos/modules/services/networking/libreswan.nix
View File

@ -85,7 +85,7 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
environment.systemPackages = [ pkgs.libreswan pkgs.iproute ]; environment.systemPackages = [ pkgs.libreswan pkgs.iproute2 ];
systemd.services.ipsec = { systemd.services.ipsec = {
description = "Internet Key Exchange (IKE) Protocol Daemon for IPsec"; description = "Internet Key Exchange (IKE) Protocol Daemon for IPsec";

2
nixos/modules/services/networking/networkmanager.nix
View File

@ -465,7 +465,7 @@ in {
restartTriggers = [ configFile overrideNameserversScript ]; restartTriggers = [ configFile overrideNameserversScript ];
# useful binaries for user-specified hooks # useful binaries for user-specified hooks
path = [ pkgs.iproute pkgs.util-linux pkgs.coreutils ]; path = [ pkgs.iproute2 pkgs.util-linux pkgs.coreutils ];
aliases = [ "dbus-org.freedesktop.nm-dispatcher.service" ]; aliases = [ "dbus-org.freedesktop.nm-dispatcher.service" ];
}; };

2
nixos/modules/services/networking/openvpn.nix
View File

@ -63,7 +63,7 @@ let
wantedBy = optional cfg.autoStart "multi-user.target"; wantedBy = optional cfg.autoStart "multi-user.target";
after = [ "network.target" ]; after = [ "network.target" ];
path = [ pkgs.iptables pkgs.iproute pkgs.nettools ]; path = [ pkgs.iptables pkgs.iproute2 pkgs.nettools ];
serviceConfig.ExecStart = "@${openvpn}/sbin/openvpn openvpn --suppress-timestamps --config ${configFile}"; serviceConfig.ExecStart = "@${openvpn}/sbin/openvpn openvpn --suppress-timestamps --config ${configFile}";
serviceConfig.Restart = "always"; serviceConfig.Restart = "always";

2
nixos/modules/services/networking/sslh.nix
View File

@ -132,7 +132,7 @@ in
{ table = "mangle"; command = "OUTPUT ! -o lo -p tcp -m connmark --mark 0x02/0x0f -j CONNMARK --restore-mark --mask 0x0f"; } { table = "mangle"; command = "OUTPUT ! -o lo -p tcp -m connmark --mark 0x02/0x0f -j CONNMARK --restore-mark --mask 0x0f"; }
]; ];
in { in {
path = [ pkgs.iptables pkgs.iproute pkgs.procps ]; path = [ pkgs.iptables pkgs.iproute2 pkgs.procps ];
preStart = '' preStart = ''
# Cleanup old iptables entries which might be still there # Cleanup old iptables entries which might be still there

2
nixos/modules/services/networking/strongswan-swanctl/module.nix
View File

@ -63,7 +63,7 @@ in {
description = "strongSwan IPsec IKEv1/IKEv2 daemon using swanctl"; description = "strongSwan IPsec IKEv1/IKEv2 daemon using swanctl";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
after = [ "network-online.target" ]; after = [ "network-online.target" ];
path = with pkgs; [ kmod iproute iptables util-linux ]; path = with pkgs; [ kmod iproute2 iptables util-linux ];
environment = { environment = {
STRONGSWAN_CONF = pkgs.writeTextFile { STRONGSWAN_CONF = pkgs.writeTextFile {
name = "strongswan.conf"; name = "strongswan.conf";

2
nixos/modules/services/networking/strongswan.nix
View File

@ -152,7 +152,7 @@ in
systemd.services.strongswan = { systemd.services.strongswan = {
description = "strongSwan IPSec Service"; description = "strongSwan IPSec Service";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
path = with pkgs; [ kmod iproute iptables util-linux ]; # XXX Linux path = with pkgs; [ kmod iproute2 iptables util-linux ]; # XXX Linux
after = [ "network-online.target" ]; after = [ "network-online.target" ];
environment = { environment = {
STRONGSWAN_CONF = strongswanConf { inherit setup connections ca secretsFile managePlugins enabledPlugins; }; STRONGSWAN_CONF = strongswanConf { inherit setup connections ca secretsFile managePlugins enabledPlugins; };

6
nixos/modules/services/networking/wireguard.nix
View File

@ -63,7 +63,7 @@ let
preSetup = mkOption { preSetup = mkOption {
example = literalExample '' example = literalExample ''
${pkgs.iproute}/bin/ip netns add foo ${pkgs.iproute2}/bin/ip netns add foo
''; '';
default = ""; default = "";
type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines; type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines;
@ -278,7 +278,7 @@ let
wantedBy = [ "multi-user.target" "wireguard-${interfaceName}.service" ]; wantedBy = [ "multi-user.target" "wireguard-${interfaceName}.service" ];
environment.DEVICE = interfaceName; environment.DEVICE = interfaceName;
environment.WG_ENDPOINT_RESOLUTION_RETRIES = "infinity"; environment.WG_ENDPOINT_RESOLUTION_RETRIES = "infinity";
path = with pkgs; [ iproute wireguard-tools ]; path = with pkgs; [ iproute2 wireguard-tools ];
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
@ -333,7 +333,7 @@ let
after = [ "network.target" "network-online.target" ]; after = [ "network.target" "network-online.target" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
environment.DEVICE = name; environment.DEVICE = name;
path = with pkgs; [ kmod iproute wireguard-tools ]; path = with pkgs; [ kmod iproute2 wireguard-tools ];
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";

2
nixos/modules/services/security/fail2ban.nix
View File

@ -243,7 +243,7 @@ in
restartTriggers = [ fail2banConf jailConf pathsConf ]; restartTriggers = [ fail2banConf jailConf pathsConf ];
reloadIfChanged = true; reloadIfChanged = true;
path = [ cfg.package cfg.packageFirewall pkgs.iproute ]; path = [ cfg.package cfg.packageFirewall pkgs.iproute2 ];
unitConfig.Documentation = "man:fail2ban(1)"; unitConfig.Documentation = "man:fail2ban(1)";

4
nixos/modules/services/security/sshguard.nix
View File

@ -108,8 +108,8 @@ in {
partOf = optional config.networking.firewall.enable "firewall.service"; partOf = optional config.networking.firewall.enable "firewall.service";
path = with pkgs; if config.networking.nftables.enable path = with pkgs; if config.networking.nftables.enable
then [ nftables iproute systemd ] then [ nftables iproute2 systemd ]
else [ iptables ipset iproute systemd ]; else [ iptables ipset iproute2 systemd ];
# The sshguard ipsets must exist before we invoke # The sshguard ipsets must exist before we invoke
# iptables. sshguard creates the ipsets after startup if # iptables. sshguard creates the ipsets after startup if

18
nixos/modules/tasks/network-interfaces-scripted.nix
View File

@ -101,7 +101,7 @@ let
unitConfig.ConditionCapability = "CAP_NET_ADMIN"; unitConfig.ConditionCapability = "CAP_NET_ADMIN";
path = [ pkgs.iproute ]; path = [ pkgs.iproute2 ];
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
@ -185,7 +185,7 @@ let
# Restart rather than stop+start this unit to prevent the # Restart rather than stop+start this unit to prevent the
# network from dying during switch-to-configuration. # network from dying during switch-to-configuration.
stopIfChanged = false; stopIfChanged = false;
path = [ pkgs.iproute ]; path = [ pkgs.iproute2 ];
script = script =
'' ''
state="/run/nixos/network/addresses/${i.name}" state="/run/nixos/network/addresses/${i.name}"
@ -258,7 +258,7 @@ let
wantedBy = [ "network-setup.service" (subsystemDevice i.name) ]; wantedBy = [ "network-setup.service" (subsystemDevice i.name) ];
partOf = [ "network-setup.service" ]; partOf = [ "network-setup.service" ];
before = [ "network-setup.service" ]; before = [ "network-setup.service" ];
path = [ pkgs.iproute ]; path = [ pkgs.iproute2 ];
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
RemainAfterExit = true; RemainAfterExit = true;
@ -284,7 +284,7 @@ let
before = [ "network-setup.service" ]; before = [ "network-setup.service" ];
serviceConfig.Type = "oneshot"; serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true; serviceConfig.RemainAfterExit = true;
path = [ pkgs.iproute ]; path = [ pkgs.iproute2 ];
script = '' script = ''
# Remove Dead Interfaces # Remove Dead Interfaces
echo "Removing old bridge ${n}..." echo "Removing old bridge ${n}..."
@ -372,7 +372,7 @@ let
wants = deps; # if one or more interface fails, the switch should continue to run wants = deps; # if one or more interface fails, the switch should continue to run
serviceConfig.Type = "oneshot"; serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true; serviceConfig.RemainAfterExit = true;
path = [ pkgs.iproute config.virtualisation.vswitch.package ]; path = [ pkgs.iproute2 config.virtualisation.vswitch.package ];
preStart = '' preStart = ''
echo "Resetting Open vSwitch ${n}..." echo "Resetting Open vSwitch ${n}..."
ovs-vsctl --if-exists del-br ${n} -- add-br ${n} \ ovs-vsctl --if-exists del-br ${n} -- add-br ${n} \
@ -413,7 +413,7 @@ let
before = [ "network-setup.service" ]; before = [ "network-setup.service" ];
serviceConfig.Type = "oneshot"; serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true; serviceConfig.RemainAfterExit = true;
path = [ pkgs.iproute pkgs.gawk ]; path = [ pkgs.iproute2 pkgs.gawk ];
script = '' script = ''
echo "Destroying old bond ${n}..." echo "Destroying old bond ${n}..."
${destroyBond n} ${destroyBond n}
@ -451,7 +451,7 @@ let
before = [ "network-setup.service" ]; before = [ "network-setup.service" ];
serviceConfig.Type = "oneshot"; serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true; serviceConfig.RemainAfterExit = true;
path = [ pkgs.iproute ]; path = [ pkgs.iproute2 ];
script = '' script = ''
# Remove Dead Interfaces # Remove Dead Interfaces
ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}" ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}"
@ -476,7 +476,7 @@ let
before = [ "network-setup.service" ]; before = [ "network-setup.service" ];
serviceConfig.Type = "oneshot"; serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true; serviceConfig.RemainAfterExit = true;
path = [ pkgs.iproute ]; path = [ pkgs.iproute2 ];
script = '' script = ''
# Remove Dead Interfaces # Remove Dead Interfaces
ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}" ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}"
@ -504,7 +504,7 @@ let
before = [ "network-setup.service" ]; before = [ "network-setup.service" ];
serviceConfig.Type = "oneshot"; serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true; serviceConfig.RemainAfterExit = true;
path = [ pkgs.iproute ]; path = [ pkgs.iproute2 ];
script = '' script = ''
# Remove Dead Interfaces # Remove Dead Interfaces
ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}" ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}"

2
nixos/modules/tasks/network-interfaces-systemd.nix
View File

@ -259,7 +259,7 @@ in
wants = deps; # if one or more interface fails, the switch should continue to run wants = deps; # if one or more interface fails, the switch should continue to run
serviceConfig.Type = "oneshot"; serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true; serviceConfig.RemainAfterExit = true;
path = [ pkgs.iproute config.virtualisation.vswitch.package ]; path = [ pkgs.iproute2 config.virtualisation.vswitch.package ];
preStart = '' preStart = ''
echo "Resetting Open vSwitch ${n}..." echo "Resetting Open vSwitch ${n}..."
ovs-vsctl --if-exists del-br ${n} -- add-br ${n} \ ovs-vsctl --if-exists del-br ${n} -- add-br ${n} \

6
nixos/modules/tasks/network-interfaces.nix
View File

@ -1171,7 +1171,7 @@ in
wantedBy = [ "network.target" ]; wantedBy = [ "network.target" ];
after = [ "network-pre.target" ]; after = [ "network-pre.target" ];
unitConfig.ConditionCapability = "CAP_NET_ADMIN"; unitConfig.ConditionCapability = "CAP_NET_ADMIN";
path = [ pkgs.iproute ]; path = [ pkgs.iproute2 ];
serviceConfig.Type = "oneshot"; serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true; serviceConfig.RemainAfterExit = true;
script = '' script = ''
@ -1249,7 +1249,7 @@ in
${optionalString (current.type == "mesh" && current.meshID!=null) "${pkgs.iw}/bin/iw dev ${device} set meshid ${current.meshID}"} ${optionalString (current.type == "mesh" && current.meshID!=null) "${pkgs.iw}/bin/iw dev ${device} set meshid ${current.meshID}"}
${optionalString (current.type == "monitor" && current.flags!=null) "${pkgs.iw}/bin/iw dev ${device} set monitor ${current.flags}"} ${optionalString (current.type == "monitor" && current.flags!=null) "${pkgs.iw}/bin/iw dev ${device} set monitor ${current.flags}"}
${optionalString (current.type == "managed" && current.fourAddr!=null) "${pkgs.iw}/bin/iw dev ${device} set 4addr ${if current.fourAddr then "on" else "off"}"} ${optionalString (current.type == "managed" && current.fourAddr!=null) "${pkgs.iw}/bin/iw dev ${device} set 4addr ${if current.fourAddr then "on" else "off"}"}
${optionalString (current.mac != null) "${pkgs.iproute}/bin/ip link set dev ${device} address ${current.mac}"} ${optionalString (current.mac != null) "${pkgs.iproute2}/bin/ip link set dev ${device} address ${current.mac}"}
''; '';
# Udev script to execute for a new WLAN interface. The script configures the new WLAN interface. # Udev script to execute for a new WLAN interface. The script configures the new WLAN interface.
@ -1260,7 +1260,7 @@ in
${optionalString (new.type == "mesh" && new.meshID!=null) "${pkgs.iw}/bin/iw dev ${device} set meshid ${new.meshID}"} ${optionalString (new.type == "mesh" && new.meshID!=null) "${pkgs.iw}/bin/iw dev ${device} set meshid ${new.meshID}"}
${optionalString (new.type == "monitor" && new.flags!=null) "${pkgs.iw}/bin/iw dev ${device} set monitor ${new.flags}"} ${optionalString (new.type == "monitor" && new.flags!=null) "${pkgs.iw}/bin/iw dev ${device} set monitor ${new.flags}"}
${optionalString (new.type == "managed" && new.fourAddr!=null) "${pkgs.iw}/bin/iw dev ${device} set 4addr ${if new.fourAddr then "on" else "off"}"} ${optionalString (new.type == "managed" && new.fourAddr!=null) "${pkgs.iw}/bin/iw dev ${device} set 4addr ${if new.fourAddr then "on" else "off"}"}
${optionalString (new.mac != null) "${pkgs.iproute}/bin/ip link set dev ${device} address ${new.mac}"} ${optionalString (new.mac != null) "${pkgs.iproute2}/bin/ip link set dev ${device} address ${new.mac}"}
''; '';
# Udev attributes for systemd to name the device and to create a .device target. # Udev attributes for systemd to name the device and to create a .device target.

2
nixos/modules/virtualisation/brightbox-image.nix
View File

@ -119,7 +119,7 @@ in
wants = [ "network-online.target" ]; wants = [ "network-online.target" ];
after = [ "network-online.target" ]; after = [ "network-online.target" ];
path = [ pkgs.wget pkgs.iproute ]; path = [ pkgs.wget pkgs.iproute2 ];
script = script =
'' ''

2
nixos/modules/virtualisation/ec2-data.nix
View File

@ -19,7 +19,7 @@ with lib;
wantedBy = [ "multi-user.target" "sshd.service" ]; wantedBy = [ "multi-user.target" "sshd.service" ];
before = [ "sshd.service" ]; before = [ "sshd.service" ];
path = [ pkgs.iproute ]; path = [ pkgs.iproute2 ];
script = script =
'' ''

2
nixos/modules/virtualisation/google-compute-config.nix
View File

@ -110,7 +110,7 @@ in
systemd.services.google-network-daemon = { systemd.services.google-network-daemon = {
description = "Google Compute Engine Network Daemon"; description = "Google Compute Engine Network Daemon";
after = [ "network-online.target" "network.target" "google-instance-setup.service" ]; after = [ "network-online.target" "network.target" "google-instance-setup.service" ];
path = with pkgs; [ iproute ]; path = with pkgs; [ iproute2 ];
serviceConfig = { serviceConfig = {
ExecStart = "${gce}/bin/google_network_daemon"; ExecStart = "${gce}/bin/google_network_daemon";
StandardOutput="journal+console"; StandardOutput="journal+console";

2
nixos/modules/virtualisation/nixos-containers.nix
View File

@ -739,7 +739,7 @@ in
unitConfig.RequiresMountsFor = "/var/lib/containers/%i"; unitConfig.RequiresMountsFor = "/var/lib/containers/%i";
path = [ pkgs.iproute ]; path = [ pkgs.iproute2 ];
environment = { environment = {
root = "/var/lib/containers/%i"; root = "/var/lib/containers/%i";

2
nixos/modules/virtualisation/xe-guest-utilities.nix
View File

@ -17,7 +17,7 @@ in {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
after = [ "xe-linux-distribution.service" ]; after = [ "xe-linux-distribution.service" ];
requires = [ "proc-xen.mount" ]; requires = [ "proc-xen.mount" ];
path = [ pkgs.coreutils pkgs.iproute ]; path = [ pkgs.coreutils pkgs.iproute2 ];
serviceConfig = { serviceConfig = {
PIDFile = "/run/xe-daemon.pid"; PIDFile = "/run/xe-daemon.pid";
ExecStart = "${pkgs.xe-guest-utilities}/bin/xe-daemon -p /run/xe-daemon.pid"; ExecStart = "${pkgs.xe-guest-utilities}/bin/xe-daemon -p /run/xe-daemon.pid";

2
nixos/modules/virtualisation/xen-dom0.nix
View File

@ -248,7 +248,7 @@ in
# Xen provides udev rules. # Xen provides udev rules.
services.udev.packages = [ cfg.package ]; services.udev.packages = [ cfg.package ];
services.udev.path = [ pkgs.bridge-utils pkgs.iproute ]; services.udev.path = [ pkgs.bridge-utils pkgs.iproute2 ];
systemd.services.xen-store = { systemd.services.xen-store = {
description = "Xen Store Daemon"; description = "Xen Store Daemon";

2
nixos/tests/mysql/mariadb-galera-mariabackup.nix
View File

@ -2,7 +2,7 @@ import ./../make-test-python.nix ({ pkgs, ...} :
let let
mysqlenv-common = pkgs.buildEnv { name = "mysql-path-env-common"; pathsToLink = [ "/bin" ]; paths = with pkgs; [ bash gawk gnutar inetutils which ]; }; mysqlenv-common = pkgs.buildEnv { name = "mysql-path-env-common"; pathsToLink = [ "/bin" ]; paths = with pkgs; [ bash gawk gnutar inetutils which ]; };
mysqlenv-mariabackup = pkgs.buildEnv { name = "mysql-path-env-mariabackup"; pathsToLink = [ "/bin" ]; paths = with pkgs; [ gzip iproute netcat procps pv socat ]; }; mysqlenv-mariabackup = pkgs.buildEnv { name = "mysql-path-env-mariabackup"; pathsToLink = [ "/bin" ]; paths = with pkgs; [ gzip iproute2 netcat procps pv socat ]; };
in { in {
name = "mariadb-galera-mariabackup"; name = "mariadb-galera-mariabackup";

6
nixos/tests/wireguard/basic.nix
View File

@ -52,9 +52,9 @@ import ../make-test-python.nix ({ pkgs, lib, ...} :
inherit (wg-snakeoil-keys.peer0) publicKey; inherit (wg-snakeoil-keys.peer0) publicKey;
}; };
postSetup = let inherit (pkgs) iproute; in '' postSetup = let inherit (pkgs) iproute2; in ''
${iproute}/bin/ip route replace 10.23.42.1/32 dev wg0 ${iproute2}/bin/ip route replace 10.23.42.1/32 dev wg0
${iproute}/bin/ip route replace fc00::1/128 dev wg0 ${iproute2}/bin/ip route replace fc00::1/128 dev wg0
''; '';
}; };
}; };

4
pkgs/applications/misc/bashSnippets/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper { stdenv, lib, fetchFromGitHub, makeWrapper
, curl, python3, bind, iproute, bc, gitMinimal }: , curl, python3, bind, iproute2, bc, gitMinimal }:
let let
version = "1.23.0"; version = "1.23.0";
deps = lib.makeBinPath [ deps = lib.makeBinPath [
curl curl
python3 python3
bind.dnsutils bind.dnsutils
iproute iproute2
bc bc
gitMinimal gitMinimal
]; ];

4
pkgs/applications/networking/appgate-sdp/default.nix
View File

@ -17,7 +17,7 @@
, glib , glib
, gtk3 , gtk3
, icu , icu
, iproute , iproute2
, krb5 , krb5
, lib , lib
, mesa , mesa
@ -169,7 +169,7 @@ stdenv.mkDerivation rec {
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "$ORIGIN:$out/opt/appgate/service/:$out/opt/appgate/:${rpath}" $binary patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "$ORIGIN:$out/opt/appgate/service/:$out/opt/appgate/:${rpath}" $binary
done done
wrapProgram $out/opt/appgate/appgate-driver --prefix PATH : ${lib.makeBinPath [ iproute networkmanager dnsmasq ]} wrapProgram $out/opt/appgate/appgate-driver --prefix PATH : ${lib.makeBinPath [ iproute2 networkmanager dnsmasq ]}
wrapProgram $out/opt/appgate/linux/set_dns --set PYTHONPATH $PYTHONPATH wrapProgram $out/opt/appgate/linux/set_dns --set PYTHONPATH $PYTHONPATH
''; '';
meta = with lib; { meta = with lib; {

4
pkgs/applications/networking/cluster/k3s/default.nix
View File

@ -3,7 +3,7 @@
, makeWrapper , makeWrapper
, socat , socat
, iptables , iptables
, iproute , iproute2
, bridge-utils , bridge-utils
, conntrack-tools , conntrack-tools
, buildGoPackage , buildGoPackage
@ -240,7 +240,7 @@ stdenv.mkDerivation rec {
kmod kmod
socat socat
iptables iptables
iproute iproute2
bridge-utils bridge-utils
ethtool ethtool
util-linux util-linux

4
pkgs/applications/networking/firehol/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, pkgs { stdenv, lib, fetchFromGitHub, pkgs
, autoconf, automake, curl, iprange, iproute, ipset, iptables, iputils , autoconf, automake, curl, iprange, iproute2, ipset, iptables, iputils
, kmod, nettools, procps, tcpdump, traceroute, util-linux, whois , kmod, nettools, procps, tcpdump, traceroute, util-linux, whois
# If true, just install FireQOS without FireHOL # If true, just install FireQOS without FireHOL
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoconf automake ]; nativeBuildInputs = [ autoconf automake ];
buildInputs = [ buildInputs = [
curl iprange iproute ipset iptables iputils kmod curl iprange iproute2 ipset iptables iputils kmod
nettools procps tcpdump traceroute util-linux whois nettools procps tcpdump traceroute util-linux whois
]; ];

4
pkgs/applications/networking/ike/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, fetchpatch, cmake, openssl, libedit, flex, bison, qt4, makeWrapper { lib, stdenv, fetchurl, fetchpatch, cmake, openssl, libedit, flex, bison, qt4, makeWrapper
, gcc, nettools, iproute, linuxHeaders }: , gcc, nettools, iproute2, linuxHeaders }:
# NOTE: use $out/etc/iked.conf as sample configuration and also set: dhcp_file "/etc/iked.dhcp"; # NOTE: use $out/etc/iked.conf as sample configuration and also set: dhcp_file "/etc/iked.dhcp";
# launch with "iked -f /etc/iked.conf" # launch with "iked -f /etc/iked.conf"
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
]; ];
nativeBuildInputs = [ cmake flex bison makeWrapper ]; nativeBuildInputs = [ cmake flex bison makeWrapper ];
buildInputs = [ openssl libedit qt4 nettools iproute ]; buildInputs = [ openssl libedit qt4 nettools iproute2 ];
postPatch = '' postPatch = ''
# fix build with bison3 # fix build with bison3

4
pkgs/applications/networking/remote/x2goserver/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, perlPackages, makeWrapper, perl, which, nx-libs { stdenv, lib, fetchurl, perlPackages, makeWrapper, perl, which, nx-libs
, util-linux, coreutils, glibc, gawk, gnused, gnugrep, findutils, xorg , util-linux, coreutils, glibc, gawk, gnused, gnugrep, findutils, xorg
, nettools, iproute, bc, procps, psmisc, lsof, pwgen, openssh, sshfs, bash , nettools, iproute2, bc, procps, psmisc, lsof, pwgen, openssh, sshfs, bash
}: }:
let let
@ -31,7 +31,7 @@ let
binaryDeps = [ binaryDeps = [
perlEnv which nx-libs util-linux coreutils glibc.bin gawk gnused gnugrep perlEnv which nx-libs util-linux coreutils glibc.bin gawk gnused gnugrep
findutils nettools iproute bc procps psmisc lsof pwgen openssh sshfs findutils nettools iproute2 bc procps psmisc lsof pwgen openssh sshfs
xorg.xauth xorg.xinit xorg.xrandr xorg.xmodmap xorg.xwininfo xorg.fontutil xorg.xauth xorg.xinit xorg.xrandr xorg.xmodmap xorg.xwininfo xorg.fontutil
xorg.xkbcomp xorg.setxkbmap xorg.xkbcomp xorg.setxkbmap
]; ];

4
pkgs/applications/virtualization/docker/default.nix
View File

@ -13,7 +13,7 @@ rec {
, stdenv, fetchFromGitHub, fetchpatch, buildGoPackage , stdenv, fetchFromGitHub, fetchpatch, buildGoPackage
, makeWrapper, installShellFiles, pkg-config , makeWrapper, installShellFiles, pkg-config
, go-md2man, go, containerd, runc, docker-proxy, tini, libtool , go-md2man, go, containerd, runc, docker-proxy, tini, libtool
, sqlite, iproute, lvm2, systemd, docker-buildx , sqlite, iproute2, lvm2, systemd, docker-buildx
, btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git , btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git
, procps, libseccomp , procps, libseccomp
, nixosTests , nixosTests
@ -72,7 +72,7 @@ rec {
nativeBuildInputs = [ makeWrapper pkg-config go-md2man go libtool installShellFiles ]; nativeBuildInputs = [ makeWrapper pkg-config go-md2man go libtool installShellFiles ];
buildInputs = [ sqlite lvm2 btrfs-progs systemd libseccomp ]; buildInputs = [ sqlite lvm2 btrfs-progs systemd libseccomp ];
extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps util-linux git ]); extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute2 iptables e2fsprogs xz xfsprogs procps util-linux git ]);
buildPhase = '' buildPhase = ''
export GOCACHE="$TMPDIR/go-cache" export GOCACHE="$TMPDIR/go-cache"

4
pkgs/applications/virtualization/gvisor/default.nix
View File

@ -5,7 +5,7 @@
, git , git
, glibcLocales , glibcLocales
, go , go
, iproute , iproute2
, iptables , iptables
, makeWrapper , makeWrapper
, procps , procps
@ -87,7 +87,7 @@ in buildBazelPackage rec {
# Needed for the 'runsc do' subcomand # Needed for the 'runsc do' subcomand
wrapProgram $out/bin/runsc \ wrapProgram $out/bin/runsc \
--prefix PATH : ${lib.makeBinPath [ iproute iptables procps ]} --prefix PATH : ${lib.makeBinPath [ iproute2 iptables procps ]}
''; '';
}; };

4
pkgs/applications/virtualization/open-vm-tools/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook, { stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook,
fuse, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libtirpc, rpcsvc-proto, fuse, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libtirpc, rpcsvc-proto,
libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst, libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst,
pkg-config, glib, gdk-pixbuf-xlib, gtk3, gtkmm3, iproute, dbus, systemd, which, pkg-config, glib, gdk-pixbuf-xlib, gtk3, gtkmm3, iproute2, dbus, systemd, which,
withX ? true }: withX ? true }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
wrapProgram "$out/etc/vmware-tools/scripts/vmware/network" \ wrapProgram "$out/etc/vmware-tools/scripts/vmware/network" \
--prefix PATH ':' "${lib.makeBinPath [ iproute dbus systemd which ]}" --prefix PATH ':' "${lib.makeBinPath [ iproute2 dbus systemd which ]}"
''; '';
meta = with lib; { meta = with lib; {

4
pkgs/applications/virtualization/x11docker/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg, getopt, gnugrep, gawk, ps, mount, iproute }: { lib, stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg, getopt, gnugrep, gawk, ps, mount, iproute2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "x11docker"; pname = "x11docker";
version = "6.6.2"; version = "6.6.2";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
install -D x11docker "$out/bin/x11docker"; install -D x11docker "$out/bin/x11docker";
wrapProgram "$out/bin/x11docker" \ wrapProgram "$out/bin/x11docker" \
--prefix PATH : "${lib.makeBinPath [ getopt gnugrep gawk ps mount iproute nx-libs xorg.xdpyinfo xorg.xhost xorg.xinit ]}" --prefix PATH : "${lib.makeBinPath [ getopt gnugrep gawk ps mount iproute2 nx-libs xorg.xdpyinfo xorg.xhost xorg.xinit ]}"
''; '';
meta = { meta = {

4
pkgs/applications/virtualization/xen/generic.nix
View File

@ -13,7 +13,7 @@ config:
# Scripts # Scripts
, coreutils, gawk, gnused, gnugrep, diffutils, multipath-tools , coreutils, gawk, gnused, gnugrep, diffutils, multipath-tools
, iproute, inetutils, iptables, bridge-utils, openvswitch, nbd, drbd , iproute2, inetutils, iptables, bridge-utils, openvswitch, nbd, drbd
, lvm2, util-linux, procps, systemd , lvm2, util-linux, procps, systemd
# Documentation # Documentation
@ -31,7 +31,7 @@ let
scriptEnvPath = concatMapStringsSep ":" (x: "${x}/bin") [ scriptEnvPath = concatMapStringsSep ":" (x: "${x}/bin") [
which perl which perl
coreutils gawk gnused gnugrep diffutils util-linux multipath-tools coreutils gawk gnused gnugrep diffutils util-linux multipath-tools
iproute inetutils iptables bridge-utils openvswitch nbd drbd iproute2 inetutils iptables bridge-utils openvswitch nbd drbd
]; ];
withXenfiles = f: concatStringsSep "\n" (mapAttrsToList f config.xenfiles); withXenfiles = f: concatStringsSep "\n" (mapAttrsToList f config.xenfiles);

4
pkgs/applications/window-managers/dwm/dwm-status.nix
View File

@ -1,10 +1,10 @@
{ lib, rustPlatform, fetchFromGitHub, dbus, gdk-pixbuf, libnotify, makeWrapper, pkg-config, xorg { lib, rustPlatform, fetchFromGitHub, dbus, gdk-pixbuf, libnotify, makeWrapper, pkg-config, xorg
, enableAlsaUtils ? true, alsaUtils, coreutils , enableAlsaUtils ? true, alsaUtils, coreutils
, enableNetwork ? true, dnsutils, iproute, wirelesstools }: , enableNetwork ? true, dnsutils, iproute2, wirelesstools }:
let let
bins = lib.optionals enableAlsaUtils [ alsaUtils coreutils ] bins = lib.optionals enableAlsaUtils [ alsaUtils coreutils ]
++ lib.optionals enableNetwork [ dnsutils iproute wirelesstools ]; ++ lib.optionals enableNetwork [ dnsutils iproute2 wirelesstools ];
in in
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {

6
pkgs/applications/window-managers/i3/blocks-gaps.nix
View File

@ -1,5 +1,5 @@
{ fetchFromGitHub, lib, stdenv, perl, makeWrapper { fetchFromGitHub, lib, stdenv, perl, makeWrapper
, iproute, acpi, sysstat, alsaUtils , iproute2, acpi, sysstat, alsaUtils
, scripts ? [ "bandwidth" "battery" "cpu_usage" "disk" "iface" , scripts ? [ "bandwidth" "battery" "cpu_usage" "disk" "iface"
"load_average" "memory" "volume" "wifi" ] "load_average" "memory" "volume" "wifi" ]
}: }:
@ -30,13 +30,13 @@ stdenv.mkDerivation rec {
postFixup = '' postFixup = ''
wrapProgram $out/libexec/i3blocks/bandwidth \ wrapProgram $out/libexec/i3blocks/bandwidth \
--prefix PATH : ${makeBinPath (optional (elem "bandwidth" scripts) iproute)} --prefix PATH : ${makeBinPath (optional (elem "bandwidth" scripts) iproute2)}
wrapProgram $out/libexec/i3blocks/battery \ wrapProgram $out/libexec/i3blocks/battery \
--prefix PATH : ${makeBinPath (optional (elem "battery" scripts) acpi)} --prefix PATH : ${makeBinPath (optional (elem "battery" scripts) acpi)}
wrapProgram $out/libexec/i3blocks/cpu_usage \ wrapProgram $out/libexec/i3blocks/cpu_usage \
--prefix PATH : ${makeBinPath (optional (elem "cpu_usage" scripts) sysstat)} --prefix PATH : ${makeBinPath (optional (elem "cpu_usage" scripts) sysstat)}
wrapProgram $out/libexec/i3blocks/iface \ wrapProgram $out/libexec/i3blocks/iface \
--prefix PATH : ${makeBinPath (optional (elem "iface" scripts) iproute)} --prefix PATH : ${makeBinPath (optional (elem "iface" scripts) iproute2)}
wrapProgram $out/libexec/i3blocks/volume \ wrapProgram $out/libexec/i3blocks/volume \
--prefix PATH : ${makeBinPath (optional (elem "volume" scripts) alsaUtils)} --prefix PATH : ${makeBinPath (optional (elem "volume" scripts) alsaUtils)}
''; '';

6
pkgs/development/libraries/libvirt/5.9.0.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, fetchgit { lib, stdenv, fetchurl, fetchgit
, pkg-config, makeWrapper, libtool, autoconf, automake, fetchpatch , pkg-config, makeWrapper, libtool, autoconf, automake, fetchpatch
, coreutils, libxml2, gnutls, perl, python2, attr , coreutils, libxml2, gnutls, perl, python2, attr
, iproute, iptables, readline, lvm2, util-linux, systemd, libpciaccess, gettext , iproute2, iptables, readline, lvm2, util-linux, systemd, libpciaccess, gettext
, libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor
, dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages
, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, glib, rpcsvc-proto, libtirpc , curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, glib, rpcsvc-proto, libtirpc
@ -54,7 +54,7 @@ in stdenv.mkDerivation rec {
preConfigure = '' preConfigure = ''
${ optionalString (!buildFromTarball) "./bootstrap --no-git --gnulib-srcdir=$(pwd)/.gnulib" } ${ optionalString (!buildFromTarball) "./bootstrap --no-git --gnulib-srcdir=$(pwd)/.gnulib" }
PATH=${lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables ebtables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH PATH=${lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute2 iptables ebtables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH
# the path to qemu-kvm will be stored in VM's .xml and .save files # the path to qemu-kvm will be stored in VM's .xml and .save files
# do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations
substituteInPlace src/lxc/lxc_conf.c \ substituteInPlace src/lxc/lxc_conf.c \
@ -101,7 +101,7 @@ in stdenv.mkDerivation rec {
postInstall = let postInstall = let
binPath = [ iptables iproute pmutils numad numactl bridge-utils dmidecode dnsmasq ebtables ] ++ optionals enableIscsi [ openiscsi ]; binPath = [ iptables iproute2 pmutils numad numactl bridge-utils dmidecode dnsmasq ebtables ] ++ optionals enableIscsi [ openiscsi ];
in '' in ''
substituteInPlace $out/libexec/libvirt-guests.sh \ substituteInPlace $out/libexec/libvirt-guests.sh \
--replace 'ON_BOOT=start' 'ON_BOOT=''${ON_BOOT:-start}' \ --replace 'ON_BOOT=start' 'ON_BOOT=''${ON_BOOT:-start}' \

6
pkgs/development/libraries/libvirt/default.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, fetchgit { lib, stdenv, fetchurl, fetchgit
, makeWrapper, autoreconfHook, fetchpatch , makeWrapper, autoreconfHook, fetchpatch
, coreutils, libxml2, gnutls, perl, python3, attr, glib, docutils , coreutils, libxml2, gnutls, perl, python3, attr, glib, docutils
, iproute, readline, lvm2, util-linux, systemd, libpciaccess, gettext , iproute2, readline, lvm2, util-linux, systemd, libpciaccess, gettext
, libtasn1, iptables, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , libtasn1, iptables, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor
, dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages
, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, dbus, libtirpc, rpcsvc-proto, darwin , curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, dbus, libtirpc, rpcsvc-proto, darwin
@ -85,7 +85,7 @@ in stdenv.mkDerivation rec {
sed -i meson.build -e "s|conf.set_quoted('${var}',.*|conf.set_quoted('${var}','${value}')|" sed -i meson.build -e "s|conf.set_quoted('${var}',.*|conf.set_quoted('${var}','${value}')|"
''; '';
in '' in ''
PATH=${lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables ebtables-compat lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH PATH=${lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute2 iptables ebtables-compat lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH
# the path to qemu-kvm will be stored in VM's .xml and .save files # the path to qemu-kvm will be stored in VM's .xml and .save files
# do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations
substituteInPlace src/lxc/lxc_conf.c \ substituteInPlace src/lxc/lxc_conf.c \
@ -126,7 +126,7 @@ in stdenv.mkDerivation rec {
postInstall = let postInstall = let
# Keep the legacy iptables binary for now for backwards compatibility (comment on #109332) # Keep the legacy iptables binary for now for backwards compatibility (comment on #109332)
binPath = [ iptables ebtables-compat iproute pmutils numad numactl bridge-utils dmidecode dnsmasq ] ++ optionals enableIscsi [ openiscsi ]; binPath = [ iptables ebtables-compat iproute2 pmutils numad numactl bridge-utils dmidecode dnsmasq ] ++ optionals enableIscsi [ openiscsi ];
in '' in ''
substituteInPlace $out/libexec/libvirt-guests.sh \ substituteInPlace $out/libexec/libvirt-guests.sh \
--replace 'ON_BOOT="start"' 'ON_BOOT=''${ON_BOOT:-start}' \ --replace 'ON_BOOT="start"' 'ON_BOOT=''${ON_BOOT:-start}' \

4
pkgs/development/libraries/tpm2-tss/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub { stdenv, lib, fetchFromGitHub
, autoreconfHook, autoconf-archive, pkg-config, doxygen, perl , autoreconfHook, autoconf-archive, pkg-config, doxygen, perl
, openssl, json_c, curl, libgcrypt , openssl, json_c, curl, libgcrypt
, cmocka, uthash, ibm-sw-tpm2, iproute, procps, which , cmocka, uthash, ibm-sw-tpm2, iproute2, procps, which
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ openssl json_c curl libgcrypt ]; buildInputs = [ openssl json_c curl libgcrypt ];
checkInputs = [ checkInputs = [
cmocka uthash ibm-sw-tpm2 iproute procps which cmocka uthash ibm-sw-tpm2 iproute2 procps which
]; ];
preAutoreconf = "./bootstrap"; preAutoreconf = "./bootstrap";

4
pkgs/os-specific/linux/gogoclient/default.nix
View File

@ -1,4 +1,4 @@
{lib, stdenv, fetchurl, openssl, nettools, iproute, sysctl}: {lib, stdenv, fetchurl, openssl, nettools, iproute2, sysctl}:
let baseName = "gogoclient"; let baseName = "gogoclient";
version = "1.2"; version = "1.2";
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
substituteInPlace "$out/template/linux.sh" \ substituteInPlace "$out/template/linux.sh" \
--replace "/sbin/ifconfig" "${nettools}/bin/ifconfig" \ --replace "/sbin/ifconfig" "${nettools}/bin/ifconfig" \
--replace "/sbin/route" "${nettools}/bin/route" \ --replace "/sbin/route" "${nettools}/bin/route" \
--replace "/sbin/ip" "${iproute}/sbin/ip" \ --replace "/sbin/ip" "${iproute2}/sbin/ip" \
--replace "/sbin/sysctl" "${sysctl}/bin/sysctl" --replace "/sbin/sysctl" "${sysctl}/bin/sysctl"
sed -i -e 's/^.*Exec \$route -A.*$/& metric 128/' $out/template/linux.sh sed -i -e 's/^.*Exec \$route -A.*$/& metric 128/' $out/template/linux.sh
''; '';

4
pkgs/os-specific/linux/hyperv-daemons/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, python, kernel, makeWrapper, writeText { stdenv, lib, python, kernel, makeWrapper, writeText
, gawk, iproute }: , gawk, iproute2 }:
let let
libexec = "libexec/hypervkvpd"; libexec = "libexec/hypervkvpd";
@ -42,7 +42,7 @@ let
postFixup = '' postFixup = ''
wrapProgram $out/bin/hv_kvp_daemon \ wrapProgram $out/bin/hv_kvp_daemon \
--prefix PATH : $out/bin:${lib.makeBinPath [ gawk iproute ]} --prefix PATH : $out/bin:${lib.makeBinPath [ gawk iproute2 ]}
''; '';
}; };

4
pkgs/os-specific/linux/iproute/mptcp.nix
View File

@ -1,6 +1,6 @@
{ lib, iproute, fetchFromGitHub }: { lib, iproute2, fetchFromGitHub }:
iproute.overrideAttrs (oa: rec { iproute2.overrideAttrs (oa: rec {
pname = "iproute_mptcp"; pname = "iproute_mptcp";
version = "0.95"; version = "0.95";

2
pkgs/os-specific/linux/openvswitch/lts.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, makeWrapper, pkg-config, util-linux, which { lib, stdenv, fetchurl, makeWrapper, pkg-config, util-linux, which
, procps, libcap_ng, openssl, python2, iproute , perl , procps, libcap_ng, openssl, python2, perl
, automake, autoconf, libtool, kernel ? null }: , automake, autoconf, libtool, kernel ? null }:
with lib; with lib;

4
pkgs/os-specific/linux/pipework/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper { stdenv, lib, fetchFromGitHub, makeWrapper
, bridge-utils, iproute, lxc, openvswitch, docker, busybox, dhcpcd, dhcp , bridge-utils, iproute2, lxc, openvswitch, docker, busybox, dhcpcd, dhcp
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -15,7 +15,7 @@ stdenv.mkDerivation {
installPhase = '' installPhase = ''
install -D pipework $out/bin/pipework install -D pipework $out/bin/pipework
wrapProgram $out/bin/pipework --prefix PATH : \ wrapProgram $out/bin/pipework --prefix PATH : \
${lib.makeBinPath [ bridge-utils iproute lxc openvswitch docker busybox dhcpcd dhcp ]}; ${lib.makeBinPath [ bridge-utils iproute2 lxc openvswitch docker busybox dhcpcd dhcp ]};
''; '';
meta = with lib; { meta = with lib; {
description = "Software-Defined Networking tools for LXC"; description = "Software-Defined Networking tools for LXC";

4
pkgs/os-specific/linux/rdma-core/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, docutils { lib, stdenv, fetchFromGitHub, cmake, pkg-config, docutils
, pandoc, ethtool, iproute, libnl, udev, python3, perl , pandoc, ethtool, iproute2, libnl, udev, python3, perl
, makeWrapper , makeWrapper
} : } :
@ -18,7 +18,7 @@ in stdenv.mkDerivation {
}; };
nativeBuildInputs = [ cmake pkg-config pandoc docutils makeWrapper ]; nativeBuildInputs = [ cmake pkg-config pandoc docutils makeWrapper ];
buildInputs = [ libnl ethtool iproute udev python3 perl ]; buildInputs = [ libnl ethtool iproute2 udev python3 perl ];
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_INSTALL_RUNDIR=/run" "-DCMAKE_INSTALL_RUNDIR=/run"

6
pkgs/servers/http/nix-binary-cache/default.nix
View File

@ -1,6 +1,6 @@
{lib, stdenv {lib, stdenv
, coreutils, findutils, nix, xz, bzip2, gnused, gnugrep, openssl , coreutils, findutils, nix, xz, bzip2, gnused, gnugrep, openssl
, lighttpd, iproute }: , lighttpd, iproute2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2014-06-29-1"; version = "2014-06-29-1";
pname = "nix-binary-cache"; pname = "nix-binary-cache";
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
--replace @gnugrep@ "${gnugrep}/bin" \ --replace @gnugrep@ "${gnugrep}/bin" \
--replace @openssl@ "${openssl.bin}/bin" \ --replace @openssl@ "${openssl.bin}/bin" \
--replace @lighttpd@ "${lighttpd}/sbin" \ --replace @lighttpd@ "${lighttpd}/sbin" \
--replace @iproute@ "${iproute}/sbin" \ --replace @iproute@ "${iproute2}/sbin" \
--replace "xXxXx" "xXxXx" --replace "xXxXx" "xXxXx"
chmod a+x "$out/bin/nix-binary-cache.cgi" chmod a+x "$out/bin/nix-binary-cache.cgi"
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
--replace @gnugrep@ "${gnugrep}/bin" \ --replace @gnugrep@ "${gnugrep}/bin" \
--replace @openssl@ "${openssl.bin}/bin" \ --replace @openssl@ "${openssl.bin}/bin" \
--replace @lighttpd@ "${lighttpd}/sbin" \ --replace @lighttpd@ "${lighttpd}/sbin" \
--replace @iproute@ "${iproute}/sbin" \ --replace @iproute@ "${iproute2}/sbin" \
--replace "xXxXx" "xXxXx" --replace "xXxXx" "xXxXx"
chmod a+x "$out/bin/nix-binary-cache-start" chmod a+x "$out/bin/nix-binary-cache-start"

8
pkgs/servers/monitoring/fusion-inventory/default.nix
View File

@ -1,4 +1,4 @@
{ lib, perlPackages, nix, dmidecode, pciutils, usbutils, iproute, nettools { lib, perlPackages, nix, dmidecode, pciutils, usbutils, iproute2, nettools
, fetchFromGitHub, makeWrapper , fetchFromGitHub, makeWrapper
}: }:
@ -18,9 +18,9 @@ perlPackages.buildPerlPackage rec {
patchShebangs bin patchShebangs bin
substituteInPlace "lib/FusionInventory/Agent/Tools/Linux.pm" \ substituteInPlace "lib/FusionInventory/Agent/Tools/Linux.pm" \
--replace /sbin/ip ${iproute}/sbin/ip --replace /sbin/ip ${iproute2}/sbin/ip
substituteInPlace "lib/FusionInventory/Agent/Task/Inventory/Linux/Networks.pm" \ substituteInPlace "lib/FusionInventory/Agent/Task/Inventory/Linux/Networks.pm" \
--replace /sbin/ip ${iproute}/sbin/ip --replace /sbin/ip ${iproute2}/sbin/ip
''; '';
buildTools = []; buildTools = [];
@ -67,7 +67,7 @@ perlPackages.buildPerlPackage rec {
for cur in $out/bin/*; do for cur in $out/bin/*; do
if [ -x "$cur" ]; then if [ -x "$cur" ]; then
sed -e "s|./lib|$out/lib|" -i "$cur" sed -e "s|./lib|$out/lib|" -i "$cur"
wrapProgram "$cur" --prefix PATH : ${lib.makeBinPath [nix dmidecode pciutils usbutils nettools iproute]} wrapProgram "$cur" --prefix PATH : ${lib.makeBinPath [nix dmidecode pciutils usbutils nettools iproute2]}
fi fi
done done
''; '';

4
pkgs/servers/monitoring/mackerel-agent/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, buildGoModule, fetchFromGitHub, makeWrapper, iproute, nettools }: { stdenv, lib, buildGoModule, fetchFromGitHub, makeWrapper, iproute2, nettools }:
buildGoModule rec { buildGoModule rec {
pname = "mackerel-agent"; pname = "mackerel-agent";
@ -13,7 +13,7 @@ buildGoModule rec {
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
checkInputs = lib.optionals (!stdenv.isDarwin) [ nettools ]; checkInputs = lib.optionals (!stdenv.isDarwin) [ nettools ];
buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute ]; buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute2 ];
vendorSha256 = "sha256-yomxALecP+PycelOmwrteK/LoW7wsst7os+jcbF46Bs="; vendorSha256 = "sha256-yomxALecP+PycelOmwrteK/LoW7wsst7os+jcbF46Bs=";

4
pkgs/servers/tailscale/default.nix
View File

@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub, makeWrapper, iptables, iproute }: { lib, buildGoModule, fetchFromGitHub, makeWrapper, iptables, iproute2 }:
buildGoModule rec { buildGoModule rec {
pname = "tailscale"; pname = "tailscale";
@ -30,7 +30,7 @@ buildGoModule rec {
postInstall = '' postInstall = ''
wrapProgram $out/bin/tailscaled --prefix PATH : ${ wrapProgram $out/bin/tailscaled --prefix PATH : ${
lib.makeBinPath [ iproute iptables ] lib.makeBinPath [ iproute2 iptables ]
} }
sed -i -e "s#/usr/sbin#$out/bin#" -e "/^EnvironmentFile/d" ./cmd/tailscaled/tailscaled.service sed -i -e "s#/usr/sbin#$out/bin#" -e "/^EnvironmentFile/d" ./cmd/tailscaled/tailscaled.service
install -D -m0444 -t $out/lib/systemd/system ./cmd/tailscaled/tailscaled.service install -D -m0444 -t $out/lib/systemd/system ./cmd/tailscaled/tailscaled.service

4
pkgs/tools/admin/acme.sh/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute, unixtools, dnsutils }: { stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute2, unixtools, dnsutils }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "acme.sh"; pname = "acme.sh";
version = "2.8.8"; version = "2.8.8";
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
openssl openssl
curl curl
dnsutils dnsutils
(if stdenv.isLinux then iproute else unixtools.netstat) (if stdenv.isLinux then iproute2 else unixtools.netstat)
] ]
}" }"
''; '';

4
pkgs/tools/admin/lxd/default.nix
View File

@ -1,6 +1,6 @@
{ lib, hwdata, pkg-config, lxc, buildGoPackage, fetchurl { lib, hwdata, pkg-config, lxc, buildGoPackage, fetchurl
, makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq , makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq
, squashfsTools, iproute, iptables, ebtables, iptables-nftables-compat, libcap , squashfsTools, iproute2, iptables, ebtables, iptables-nftables-compat, libcap
, libco-canonical, dqlite, raft-canonical, sqlite-replication, udev , libco-canonical, dqlite, raft-canonical, sqlite-replication, udev
, writeShellScriptBin, apparmor-profiles, apparmor-parser , writeShellScriptBin, apparmor-profiles, apparmor-parser
, criu , criu
@ -48,7 +48,7 @@ buildGoPackage rec {
wrapProgram $out/bin/lxd --prefix PATH : ${lib.makeBinPath ( wrapProgram $out/bin/lxd --prefix PATH : ${lib.makeBinPath (
networkPkgs networkPkgs
++ [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute bash criu ] ++ [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute2 bash criu ]
++ [ (writeShellScriptBin "apparmor_parser" '' ++ [ (writeShellScriptBin "apparmor_parser" ''
exec '${apparmor-parser}/bin/apparmor_parser' -I '${apparmor-profiles}/etc/apparmor.d' "$@" exec '${apparmor-parser}/bin/apparmor_parser' -I '${apparmor-profiles}/etc/apparmor.d' "$@"
'') ] '') ]

6
pkgs/tools/bluetooth/blueman/default.nix
View File

@ -1,11 +1,11 @@
{ config, stdenv, lib, fetchurl, intltool, pkg-config, python3Packages, bluez, gtk3 { config, stdenv, lib, fetchurl, intltool, pkg-config, python3Packages, bluez, gtk3
, obex_data_server, xdg-utils, dnsmasq, dhcp, libappindicator, iproute , obex_data_server, xdg-utils, dnsmasq, dhcp, libappindicator, iproute2
, gnome3, librsvg, wrapGAppsHook, gobject-introspection, autoreconfHook , gnome3, librsvg, wrapGAppsHook, gobject-introspection, autoreconfHook
, networkmanager, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio, fetchpatch }: , networkmanager, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio, fetchpatch }:
let let
pythonPackages = python3Packages; pythonPackages = python3Packages;
binPath = lib.makeBinPath [ xdg-utils dnsmasq dhcp iproute ]; binPath = lib.makeBinPath [ xdg-utils dnsmasq dhcp iproute2 ];
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "blueman"; pname = "blueman";
@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
]; ];
buildInputs = [ bluez gtk3 pythonPackages.python librsvg buildInputs = [ bluez gtk3 pythonPackages.python librsvg
gnome3.adwaita-icon-theme iproute libappindicator networkmanager ] gnome3.adwaita-icon-theme iproute2 libappindicator networkmanager ]
++ pythonPath ++ pythonPath
++ lib.optional withPulseAudio libpulseaudio; ++ lib.optional withPulseAudio libpulseaudio;

6
pkgs/tools/networking/ddclient/default.nix
View File

@ -1,4 +1,4 @@
{ lib, fetchurl, perlPackages, iproute, perl }: { lib, fetchurl, perlPackages, iproute2, perl }:
perlPackages.buildPerlPackage rec { perlPackages.buildPerlPackage rec {
pname = "ddclient"; pname = "ddclient";
@ -19,8 +19,8 @@ perlPackages.buildPerlPackage rec {
touch Makefile.PL touch Makefile.PL
substituteInPlace ddclient \ substituteInPlace ddclient \
--replace 'in the output of ifconfig' 'in the output of ip addr show' \ --replace 'in the output of ifconfig' 'in the output of ip addr show' \
--replace 'ifconfig -a' '${iproute}/sbin/ip addr show' \ --replace 'ifconfig -a' '${iproute2}/sbin/ip addr show' \
--replace 'ifconfig $arg' '${iproute}/sbin/ip addr show $arg' \ --replace 'ifconfig $arg' '${iproute2}/sbin/ip addr show $arg' \
--replace '/usr/bin/perl' '${perl}/bin/perl' # Until we get the patchShebangs fixed (issue #55786) we need to patch this manually --replace '/usr/bin/perl' '${perl}/bin/perl' # Until we get the patchShebangs fixed (issue #55786) we need to patch this manually
''; '';

4
pkgs/tools/networking/dhcp/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, perl, file, nettools, iputils, iproute, makeWrapper { stdenv, fetchurl, perl, file, nettools, iputils, iproute2, makeWrapper
, coreutils, gnused, openldap ? null , coreutils, gnused, openldap ? null
, buildPackages, lib , buildPackages, lib
}: }:
@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
cp client/scripts/linux $out/sbin/dhclient-script cp client/scripts/linux $out/sbin/dhclient-script
substituteInPlace $out/sbin/dhclient-script \ substituteInPlace $out/sbin/dhclient-script \
--replace /sbin/ip ${iproute}/sbin/ip --replace /sbin/ip ${iproute2}/sbin/ip
wrapProgram "$out/sbin/dhclient-script" --prefix PATH : \ wrapProgram "$out/sbin/dhclient-script" --prefix PATH : \
"${nettools}/bin:${nettools}/sbin:${iputils}/bin:${coreutils}/bin:${gnused}/bin" "${nettools}/bin:${nettools}/sbin:${iputils}/bin:${coreutils}/bin:${gnused}/bin"
''; '';

4
pkgs/tools/networking/gvpe/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, openssl, gmp, zlib, iproute, nettools }: { lib, stdenv, fetchurl, openssl, gmp, zlib, iproute2, nettools }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gvpe"; pname = "gvpe";
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
]; ];
preBuild = '' preBuild = ''
sed -e 's@"/sbin/ifconfig.*"@"${iproute}/sbin/ip link set $IFNAME address $MAC mtu $MTU"@' -i src/device-linux.C sed -e 's@"/sbin/ifconfig.*"@"${iproute2}/sbin/ip link set $IFNAME address $MAC mtu $MTU"@' -i src/device-linux.C
sed -e 's@/sbin/ifconfig@${nettools}/sbin/ifconfig@g' -i src/device-*.C sed -e 's@/sbin/ifconfig@${nettools}/sbin/ifconfig@g' -i src/device-*.C
''; '';

6
pkgs/tools/networking/libreswan/default.nix
View File

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, makeWrapper, { lib, stdenv, fetchurl, makeWrapper,
pkg-config, systemd, gmp, unbound, bison, flex, pam, libevent, libcap_ng, curl, nspr, pkg-config, systemd, gmp, unbound, bison, flex, pam, libevent, libcap_ng, curl, nspr,
bash, iproute, iptables, procps, coreutils, gnused, gawk, nss, which, python3, bash, iproute2, iptables, procps, coreutils, gnused, gawk, nss, which, python3,
docs ? false, xmlto, libselinux, ldns docs ? false, xmlto, libselinux, ldns
}: }:
let let
binPath = lib.makeBinPath [ binPath = lib.makeBinPath [
bash iproute iptables procps coreutils gnused gawk nss.tools which python3 bash iproute2 iptables procps coreutils gnused gawk nss.tools which python3
]; ];
in in
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
pkg-config pkg-config
]; ];
buildInputs = [ bash iproute iptables systemd coreutils gnused gawk gmp unbound pam libevent buildInputs = [ bash iproute2 iptables systemd coreutils gnused gawk gmp unbound pam libevent
libcap_ng curl nspr nss python3 ldns ] libcap_ng curl nspr nss python3 ldns ]
++ lib.optional docs xmlto ++ lib.optional docs xmlto
++ lib.optional stdenv.isLinux libselinux; ++ lib.optional stdenv.isLinux libselinux;

4
pkgs/tools/networking/miniupnpd/default.nix
View File

@ -1,9 +1,9 @@
{ stdenv, lib, fetchurl, iptables, libuuid, pkg-config { stdenv, lib, fetchurl, iptables, libuuid, pkg-config
, which, iproute, gnused, coreutils, gawk, makeWrapper , which, iproute2, gnused, coreutils, gawk, makeWrapper
}: }:
let let
scriptBinEnv = lib.makeBinPath [ which iproute iptables gnused coreutils gawk ]; scriptBinEnv = lib.makeBinPath [ which iproute2 iptables gnused coreutils gawk ];
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "miniupnpd-2.1.20190502"; name = "miniupnpd-2.1.20190502";

4
pkgs/tools/networking/miredo/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, nettools, iproute, judy }: { lib, stdenv, fetchurl, nettools, iproute2, judy }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.2.6"; version = "1.2.6";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
substituteInPlace misc/client-hook.bsd \ substituteInPlace misc/client-hook.bsd \
--replace '/sbin/route' '${nettools}/bin/route' \ --replace '/sbin/route' '${nettools}/bin/route' \
--replace '/sbin/ifconfig' '${nettools}/bin/ifconfig' --replace '/sbin/ifconfig' '${nettools}/bin/ifconfig'
substituteInPlace misc/client-hook.iproute --replace '/sbin/ip' '${iproute}/bin/ip' substituteInPlace misc/client-hook.iproute --replace '/sbin/ip' '${iproute2}/bin/ip'
''; '';
configureFlags = [ "--with-Judy" ]; configureFlags = [ "--with-Judy" ];

8
pkgs/tools/networking/openvpn/default.nix
View File

@ -3,7 +3,7 @@
, pkg-config , pkg-config
, makeWrapper , makeWrapper
, runtimeShell , runtimeShell
, iproute , iproute2
, lzo , lzo
, openssl , openssl
, pam , pam
@ -40,13 +40,13 @@ let
buildInputs = [ lzo openssl ] buildInputs = [ lzo openssl ]
++ optional stdenv.isLinux pam ++ optional stdenv.isLinux pam
++ optional withIpRoute iproute ++ optional withIpRoute iproute2
++ optional useSystemd systemd ++ optional useSystemd systemd
++ optional pkcs11Support pkcs11helper; ++ optional pkcs11Support pkcs11helper;
configureFlags = optionals withIpRoute [ configureFlags = optionals withIpRoute [
"--enable-iproute2" "--enable-iproute2"
"IPROUTE=${iproute}/sbin/ip" "IPROUTE=${iproute2}/sbin/ip"
] ]
++ optional useSystemd "--enable-systemd" ++ optional useSystemd "--enable-systemd"
++ optional pkcs11Support "--enable-pkcs11" ++ optional pkcs11Support "--enable-pkcs11"
@ -60,7 +60,7 @@ let
'' + optionalString useSystemd '' '' + optionalString useSystemd ''
install -Dm555 ${update-resolved} $out/libexec/update-systemd-resolved install -Dm555 ${update-resolved} $out/libexec/update-systemd-resolved
wrapProgram $out/libexec/update-systemd-resolved \ wrapProgram $out/libexec/update-systemd-resolved \
--prefix PATH : ${makeBinPath [ runtimeShell iproute systemd util-linux ]} --prefix PATH : ${makeBinPath [ runtimeShell iproute2 systemd util-linux ]}
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;

4
pkgs/tools/networking/openvpn/update-systemd-resolved.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub { lib, stdenv, fetchFromGitHub
, makeWrapper , makeWrapper
, iproute, systemd, coreutils, util-linux }: , iproute2, systemd, coreutils, util-linux }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "update-systemd-resolved"; pname = "update-systemd-resolved";
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
wrapProgram $out/libexec/openvpn/update-systemd-resolved \ wrapProgram $out/libexec/openvpn/update-systemd-resolved \
--prefix PATH : ${lib.makeBinPath [ iproute systemd coreutils util-linux ]} --prefix PATH : ${lib.makeBinPath [ iproute2 systemd coreutils util-linux ]}
''; '';
meta = with lib; { meta = with lib; {

4
pkgs/tools/networking/pptp/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, perl, ppp, iproute }: { lib, stdenv, fetchurl, perl, ppp, iproute2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pptp"; pname = "pptp";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
''; '';
preConfigure = '' preConfigure = ''
makeFlagsArray=( IP=${iproute}/bin/ip PPPD=${ppp}/sbin/pppd \ makeFlagsArray=( IP=${iproute2}/bin/ip PPPD=${ppp}/sbin/pppd \
BINDIR=$out/sbin MANDIR=$out/share/man/man8 \ BINDIR=$out/sbin MANDIR=$out/share/man/man8 \
PPPDIR=$out/etc/ppp ) PPPDIR=$out/etc/ppp )
''; '';

6
pkgs/tools/networking/shorewall/default.nix
View File

@ -3,7 +3,7 @@
, fetchurl , fetchurl
, gnugrep , gnugrep
, gnused , gnused
, iproute , iproute2
, ipset , ipset
, iptables , iptables
, perl , perl
@ -15,7 +15,7 @@
let let
PATH = lib.concatStringsSep ":" PATH = lib.concatStringsSep ":"
[ "${coreutils}/bin" [ "${coreutils}/bin"
"${iproute}/bin" "${iproute2}/bin"
"${iptables}/bin" "${iptables}/bin"
"${ipset}/bin" "${ipset}/bin"
"${ebtables}/bin" "${ebtables}/bin"
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
coreutils coreutils
iproute iproute2
ipset ipset
iptables iptables
ebtables ebtables

4
pkgs/tools/networking/wicd/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, python2Packages { lib, stdenv, fetchurl, python2Packages
, wpa_supplicant, dhcp, dhcpcd, wirelesstools , wpa_supplicant, dhcp, dhcpcd, wirelesstools
, nettools, openresolv, iproute, iputils }: , nettools, openresolv, iproute2, iputils }:
let let
inherit (python2Packages) python pygobject2 dbus-python pyGtkGlade pycairo; inherit (python2Packages) python pygobject2 dbus-python pyGtkGlade pycairo;
@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
substituteInPlace in/scripts=wicd.in --subst-var-by TEMPLATE-DEFAULT $out/share/other/dhclient.conf.template.default substituteInPlace in/scripts=wicd.in --subst-var-by TEMPLATE-DEFAULT $out/share/other/dhclient.conf.template.default
sed -i "2iexport PATH=${lib.makeBinPath [ python wpa_supplicant dhcpcd dhcp wirelesstools nettools nettools iputils openresolv iproute ]}\$\{PATH:+:\}\$PATH" in/scripts=wicd.in sed -i "2iexport PATH=${lib.makeBinPath [ python wpa_supplicant dhcpcd dhcp wirelesstools nettools nettools iputils openresolv iproute2 ]}\$\{PATH:+:\}\$PATH" in/scripts=wicd.in
sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pygobject2}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd.in sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pygobject2}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd.in
sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-client.in sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-client.in
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 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

4
pkgs/tools/networking/wireguard-tools/default.nix
View File

@ -3,7 +3,7 @@
, fetchzip , fetchzip
, nixosTests , nixosTests
, iptables , iptables
, iproute , iproute2
, makeWrapper , makeWrapper
, openresolv , openresolv
, procps , procps
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
--replace /usr/bin $out/bin --replace /usr/bin $out/bin
'' + lib.optionalString stdenv.isLinux '' '' + lib.optionalString stdenv.isLinux ''
for f in $out/bin/*; do for f in $out/bin/*; do
wrapProgram $f --prefix PATH : ${lib.makeBinPath [ procps iproute iptables openresolv ]} wrapProgram $f --prefix PATH : ${lib.makeBinPath [ procps iproute2 iptables openresolv ]}
done done
'' + lib.optionalString stdenv.isDarwin '' '' + lib.optionalString stdenv.isDarwin ''
for f in $out/bin/*; do for f in $out/bin/*; do

4
pkgs/tools/networking/zerotierone/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, buildPackages, fetchFromGitHub, openssl, lzo, zlib, iproute, ronn }: { lib, stdenv, buildPackages, fetchFromGitHub, openssl, lzo, zlib, iproute2, ronn }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "zerotierone"; pname = "zerotierone";
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ ronn ]; nativeBuildInputs = [ ronn ];
buildInputs = [ openssl lzo zlib iproute ]; buildInputs = [ openssl lzo zlib iproute2 ];
enableParallelBuilding = true; enableParallelBuilding = true;

4
pkgs/tools/system/inxi/default.nix
View File

@ -2,7 +2,7 @@
, ps, dnsutils # dig is recommended for multiple categories , ps, dnsutils # dig is recommended for multiple categories
, withRecommends ? false # Install (almost) all recommended tools (see --recommends) , withRecommends ? false # Install (almost) all recommended tools (see --recommends)
, withRecommendedSystemPrograms ? withRecommends, util-linuxMinimal, dmidecode , withRecommendedSystemPrograms ? withRecommends, util-linuxMinimal, dmidecode
, file, hddtemp, iproute, ipmitool, usbutils, kmod, lm_sensors, smartmontools , file, hddtemp, iproute2, ipmitool, usbutils, kmod, lm_sensors, smartmontools
, binutils, tree, upower, pciutils , binutils, tree, upower, pciutils
, withRecommendedDisplayInformationPrograms ? withRecommends, glxinfo, xorg , withRecommendedDisplayInformationPrograms ? withRecommends, glxinfo, xorg
}: }:
@ -11,7 +11,7 @@ let
prefixPath = programs: prefixPath = programs:
"--prefix PATH ':' '${lib.makeBinPath programs}'"; "--prefix PATH ':' '${lib.makeBinPath programs}'";
recommendedSystemPrograms = lib.optionals withRecommendedSystemPrograms [ recommendedSystemPrograms = lib.optionals withRecommendedSystemPrograms [
util-linuxMinimal dmidecode file hddtemp iproute ipmitool usbutils kmod util-linuxMinimal dmidecode file hddtemp iproute2 ipmitool usbutils kmod
lm_sensors smartmontools binutils tree upower pciutils lm_sensors smartmontools binutils tree upower pciutils
]; ];
recommendedDisplayInformationPrograms = lib.optionals recommendedDisplayInformationPrograms = lib.optionals

1
pkgs/top-level/aliases.nix
View File

@ -310,6 +310,7 @@ mapAliases ({
infiniband-diags = rdma-core; # added 2019-08-09 infiniband-diags = rdma-core; # added 2019-08-09
inotifyTools = inotify-tools; inotifyTools = inotify-tools;
inter-ui = inter; # added 2021-03-27 inter-ui = inter; # added 2021-03-27
iproute = iproute2; # moved from top-level 2021-03-14
i-score = throw "i-score has been removed: abandoned upstream."; # added 2020-11-21 i-score = throw "i-score has been removed: abandoned upstream."; # added 2020-11-21
jack2Full = jack2; # moved from top-level 2021-03-14 jack2Full = jack2; # moved from top-level 2021-03-14
jamomacore = throw "jamomacore has been removed: abandoned upstream."; # added 2020-11-21 jamomacore = throw "jamomacore has been removed: abandoned upstream."; # added 2020-11-21

1
pkgs/top-level/all-packages.nix
View File

@ -19495,7 +19495,6 @@ in
iotop = callPackage ../os-specific/linux/iotop { }; iotop = callPackage ../os-specific/linux/iotop { };
iproute2 = callPackage ../os-specific/linux/iproute { }; iproute2 = callPackage ../os-specific/linux/iproute { };
iproute = iproute2; # Alias added 2020-11-15 (TODO: deprecate and move to pkgs/top-level/aliases.nix)
iproute_mptcp = callPackage ../os-specific/linux/iproute/mptcp.nix { }; iproute_mptcp = callPackage ../os-specific/linux/iproute/mptcp.nix { };