From 25bef2d8f91edfa80b86e1b777c520021a82131e Mon Sep 17 00:00:00 2001 From: Dominik Xaver Hörl Date: Sun, 10 Jan 2021 20:08:30 +0100 Subject: treewide: simplify pkgs.stdenv.lib -> pkgs.lib The library does not depend on stdenv, that `stdenv` exposes `lib` is an artifact of the ancient origins of nixpkgs. --- nixos/tests/wireguard/basic.nix | 2 +- nixos/tests/wireguard/generated.nix | 2 +- nixos/tests/wireguard/namespaces.nix | 2 +- nixos/tests/wireguard/wg-quick.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'nixos/tests/wireguard') diff --git a/nixos/tests/wireguard/basic.nix b/nixos/tests/wireguard/basic.nix index 25d706ae2e5..a31e92e8649 100644 --- a/nixos/tests/wireguard/basic.nix +++ b/nixos/tests/wireguard/basic.nix @@ -6,7 +6,7 @@ import ../make-test-python.nix ({ pkgs, lib, ...} : in { name = "wireguard"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ ma27 ]; }; diff --git a/nixos/tests/wireguard/generated.nix b/nixos/tests/wireguard/generated.nix index cdf15483265..84a35d29b45 100644 --- a/nixos/tests/wireguard/generated.nix +++ b/nixos/tests/wireguard/generated.nix @@ -1,7 +1,7 @@ { kernelPackages ? null }: import ../make-test-python.nix ({ pkgs, lib, ... } : { name = "wireguard-generated"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ ma27 grahamc ]; }; diff --git a/nixos/tests/wireguard/namespaces.nix b/nixos/tests/wireguard/namespaces.nix index c47175ceafc..93dc84a8768 100644 --- a/nixos/tests/wireguard/namespaces.nix +++ b/nixos/tests/wireguard/namespaces.nix @@ -17,7 +17,7 @@ in import ../make-test-python.nix ({ pkgs, lib, ... } : { name = "wireguard-with-namespaces"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ asymmetric ]; }; diff --git a/nixos/tests/wireguard/wg-quick.nix b/nixos/tests/wireguard/wg-quick.nix index 5472d21cd1e..8cf8c307de3 100644 --- a/nixos/tests/wireguard/wg-quick.nix +++ b/nixos/tests/wireguard/wg-quick.nix @@ -7,7 +7,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... }: in { name = "wg-quick"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ xwvvvvwx ]; }; -- cgit 1.4.1 From 9378fdf87e0626e8c63a90a378c38444ff54808b Mon Sep 17 00:00:00 2001 From: Sandro Jäckel Date: Sun, 14 Mar 2021 17:05:16 +0100 Subject: iproute: deprecate alias --- nixos/modules/programs/mininet.nix | 2 +- nixos/modules/services/misc/mame.nix | 2 +- nixos/modules/services/monitoring/datadog-agent.nix | 4 ++-- nixos/modules/services/monitoring/scollector.nix | 2 +- nixos/modules/services/networking/consul.nix | 2 +- .../services/networking/ircd-hybrid/default.nix | 2 +- nixos/modules/services/networking/libreswan.nix | 2 +- nixos/modules/services/networking/networkmanager.nix | 2 +- nixos/modules/services/networking/openvpn.nix | 2 +- nixos/modules/services/networking/sslh.nix | 2 +- .../services/networking/strongswan-swanctl/module.nix | 2 +- nixos/modules/services/networking/strongswan.nix | 2 +- nixos/modules/services/networking/wireguard.nix | 6 +++--- nixos/modules/services/security/fail2ban.nix | 2 +- nixos/modules/services/security/sshguard.nix | 4 ++-- nixos/modules/tasks/network-interfaces-scripted.nix | 18 +++++++++--------- nixos/modules/tasks/network-interfaces-systemd.nix | 2 +- nixos/modules/tasks/network-interfaces.nix | 6 +++--- nixos/modules/virtualisation/brightbox-image.nix | 2 +- nixos/modules/virtualisation/ec2-data.nix | 2 +- nixos/modules/virtualisation/google-compute-config.nix | 2 +- nixos/modules/virtualisation/nixos-containers.nix | 2 +- nixos/modules/virtualisation/xe-guest-utilities.nix | 2 +- nixos/modules/virtualisation/xen-dom0.nix | 2 +- nixos/tests/mysql/mariadb-galera-mariabackup.nix | 2 +- nixos/tests/wireguard/basic.nix | 6 +++--- pkgs/applications/misc/bashSnippets/default.nix | 4 ++-- pkgs/applications/networking/appgate-sdp/default.nix | 4 ++-- pkgs/applications/networking/cluster/k3s/default.nix | 4 ++-- pkgs/applications/networking/firehol/default.nix | 4 ++-- pkgs/applications/networking/ike/default.nix | 4 ++-- .../networking/remote/x2goserver/default.nix | 4 ++-- pkgs/applications/virtualization/docker/default.nix | 4 ++-- pkgs/applications/virtualization/gvisor/default.nix | 4 ++-- .../virtualization/open-vm-tools/default.nix | 4 ++-- pkgs/applications/virtualization/x11docker/default.nix | 4 ++-- pkgs/applications/virtualization/xen/generic.nix | 4 ++-- pkgs/applications/window-managers/dwm/dwm-status.nix | 4 ++-- pkgs/applications/window-managers/i3/blocks-gaps.nix | 6 +++--- pkgs/development/libraries/libvirt/5.9.0.nix | 6 +++--- pkgs/development/libraries/libvirt/default.nix | 6 +++--- pkgs/development/libraries/tpm2-tss/default.nix | 4 ++-- pkgs/os-specific/linux/gogoclient/default.nix | 4 ++-- pkgs/os-specific/linux/hyperv-daemons/default.nix | 4 ++-- pkgs/os-specific/linux/iproute/mptcp.nix | 4 ++-- pkgs/os-specific/linux/openvswitch/lts.nix | 2 +- pkgs/os-specific/linux/pipework/default.nix | 4 ++-- pkgs/os-specific/linux/rdma-core/default.nix | 4 ++-- pkgs/servers/http/nix-binary-cache/default.nix | 6 +++--- pkgs/servers/monitoring/fusion-inventory/default.nix | 8 ++++---- pkgs/servers/monitoring/mackerel-agent/default.nix | 4 ++-- pkgs/servers/tailscale/default.nix | 4 ++-- pkgs/tools/admin/acme.sh/default.nix | 4 ++-- pkgs/tools/admin/lxd/default.nix | 4 ++-- pkgs/tools/bluetooth/blueman/default.nix | 6 +++--- pkgs/tools/networking/ddclient/default.nix | 6 +++--- pkgs/tools/networking/dhcp/default.nix | 4 ++-- pkgs/tools/networking/gvpe/default.nix | 4 ++-- pkgs/tools/networking/libreswan/default.nix | 6 +++--- pkgs/tools/networking/miniupnpd/default.nix | 4 ++-- pkgs/tools/networking/miredo/default.nix | 4 ++-- pkgs/tools/networking/openvpn/default.nix | 8 ++++---- .../networking/openvpn/update-systemd-resolved.nix | 4 ++-- pkgs/tools/networking/pptp/default.nix | 4 ++-- pkgs/tools/networking/shorewall/default.nix | 6 +++--- pkgs/tools/networking/wicd/default.nix | 4 ++-- pkgs/tools/networking/wireguard-tools/default.nix | 4 ++-- pkgs/tools/networking/zerotierone/default.nix | 4 ++-- pkgs/tools/system/inxi/default.nix | 4 ++-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 71 files changed, 140 insertions(+), 140 deletions(-) (limited to 'nixos/tests/wireguard') diff --git a/nixos/modules/programs/mininet.nix b/nixos/modules/programs/mininet.nix index ecc924325e6..6e90e7669ac 100644 --- a/nixos/modules/programs/mininet.nix +++ b/nixos/modules/programs/mininet.nix @@ -8,7 +8,7 @@ let cfg = config.programs.mininet; generatedPath = with pkgs; makeSearchPath "bin" [ - iperf ethtool iproute socat + iperf ethtool iproute2 socat ]; pyEnv = pkgs.python.withPackages(ps: [ ps.mininet-python ]); diff --git a/nixos/modules/services/misc/mame.nix b/nixos/modules/services/misc/mame.nix index c5d5e9e4837..34a471ea4fe 100644 --- a/nixos/modules/services/misc/mame.nix +++ b/nixos/modules/services/misc/mame.nix @@ -53,7 +53,7 @@ in description = "MAME TUN/TAP Ethernet interface"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - path = [ pkgs.iproute ]; + path = [ pkgs.iproute2 ]; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; diff --git a/nixos/modules/services/monitoring/datadog-agent.nix b/nixos/modules/services/monitoring/datadog-agent.nix index d97565f15d6..b25a53435d0 100644 --- a/nixos/modules/services/monitoring/datadog-agent.nix +++ b/nixos/modules/services/monitoring/datadog-agent.nix @@ -225,7 +225,7 @@ in { }; }; 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 = { description = "Datadog Agent User"; @@ -239,7 +239,7 @@ in { systemd.services = let 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" ]; serviceConfig = { User = "datadog"; diff --git a/nixos/modules/services/monitoring/scollector.nix b/nixos/modules/services/monitoring/scollector.nix index 6f13ce889cb..ef535585e9b 100644 --- a/nixos/modules/services/monitoring/scollector.nix +++ b/nixos/modules/services/monitoring/scollector.nix @@ -113,7 +113,7 @@ in { description = "scollector metrics collector (part of Bosun)"; wantedBy = [ "multi-user.target" ]; - path = [ pkgs.coreutils pkgs.iproute ]; + path = [ pkgs.coreutils pkgs.iproute2 ]; serviceConfig = { User = cfg.user; diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix index bfaea4e167c..ae7998913ee 100644 --- a/nixos/modules/services/networking/consul.nix +++ b/nixos/modules/services/networking/consul.nix @@ -191,7 +191,7 @@ in ExecStop = "${cfg.package}/bin/consul leave"; }); - path = with pkgs; [ iproute gnugrep gawk consul ]; + path = with pkgs; [ iproute2 gnugrep gawk consul ]; preStart = '' mkdir -m 0700 -p ${dataDir} chown -R consul ${dataDir} diff --git a/nixos/modules/services/networking/ircd-hybrid/default.nix b/nixos/modules/services/networking/ircd-hybrid/default.nix index 0781159b6ee..1f5636e4e3a 100644 --- a/nixos/modules/services/networking/ircd-hybrid/default.nix +++ b/nixos/modules/services/networking/ircd-hybrid/default.nix @@ -10,7 +10,7 @@ let name = "ircd-hybrid-service"; scripts = [ "=>/bin" ./control.in ]; 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; diff --git a/nixos/modules/services/networking/libreswan.nix b/nixos/modules/services/networking/libreswan.nix index 280158b89f6..7a25769e067 100644 --- a/nixos/modules/services/networking/libreswan.nix +++ b/nixos/modules/services/networking/libreswan.nix @@ -85,7 +85,7 @@ in config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.libreswan pkgs.iproute ]; + environment.systemPackages = [ pkgs.libreswan pkgs.iproute2 ]; systemd.services.ipsec = { description = "Internet Key Exchange (IKE) Protocol Daemon for IPsec"; diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 2e680544ec2..119bd09e2fd 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -465,7 +465,7 @@ in { restartTriggers = [ configFile overrideNameserversScript ]; # 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" ]; }; diff --git a/nixos/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix index 650f9c84ac7..b4c2c944b6e 100644 --- a/nixos/modules/services/networking/openvpn.nix +++ b/nixos/modules/services/networking/openvpn.nix @@ -63,7 +63,7 @@ let wantedBy = optional cfg.autoStart "multi-user.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.Restart = "always"; diff --git a/nixos/modules/services/networking/sslh.nix b/nixos/modules/services/networking/sslh.nix index 4c2740d2019..abe96f60f81 100644 --- a/nixos/modules/services/networking/sslh.nix +++ b/nixos/modules/services/networking/sslh.nix @@ -132,7 +132,7 @@ in { table = "mangle"; command = "OUTPUT ! -o lo -p tcp -m connmark --mark 0x02/0x0f -j CONNMARK --restore-mark --mask 0x0f"; } ]; in { - path = [ pkgs.iptables pkgs.iproute pkgs.procps ]; + path = [ pkgs.iptables pkgs.iproute2 pkgs.procps ]; preStart = '' # Cleanup old iptables entries which might be still there diff --git a/nixos/modules/services/networking/strongswan-swanctl/module.nix b/nixos/modules/services/networking/strongswan-swanctl/module.nix index f67eedac296..6e619f22546 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/module.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/module.nix @@ -63,7 +63,7 @@ in { description = "strongSwan IPsec IKEv1/IKEv2 daemon using swanctl"; wantedBy = [ "multi-user.target" ]; after = [ "network-online.target" ]; - path = with pkgs; [ kmod iproute iptables util-linux ]; + path = with pkgs; [ kmod iproute2 iptables util-linux ]; environment = { STRONGSWAN_CONF = pkgs.writeTextFile { name = "strongswan.conf"; diff --git a/nixos/modules/services/networking/strongswan.nix b/nixos/modules/services/networking/strongswan.nix index f6170b81365..401f7be4028 100644 --- a/nixos/modules/services/networking/strongswan.nix +++ b/nixos/modules/services/networking/strongswan.nix @@ -152,7 +152,7 @@ in systemd.services.strongswan = { description = "strongSwan IPSec Service"; 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" ]; environment = { STRONGSWAN_CONF = strongswanConf { inherit setup connections ca secretsFile managePlugins enabledPlugins; }; diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix index 9f76f7f7cd0..34c86934535 100644 --- a/nixos/modules/services/networking/wireguard.nix +++ b/nixos/modules/services/networking/wireguard.nix @@ -63,7 +63,7 @@ let preSetup = mkOption { example = literalExample '' - ${pkgs.iproute}/bin/ip netns add foo + ${pkgs.iproute2}/bin/ip netns add foo ''; default = ""; type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines; @@ -278,7 +278,7 @@ let wantedBy = [ "multi-user.target" "wireguard-${interfaceName}.service" ]; environment.DEVICE = interfaceName; environment.WG_ENDPOINT_RESOLUTION_RETRIES = "infinity"; - path = with pkgs; [ iproute wireguard-tools ]; + path = with pkgs; [ iproute2 wireguard-tools ]; serviceConfig = { Type = "oneshot"; @@ -333,7 +333,7 @@ let after = [ "network.target" "network-online.target" ]; wantedBy = [ "multi-user.target" ]; environment.DEVICE = name; - path = with pkgs; [ kmod iproute wireguard-tools ]; + path = with pkgs; [ kmod iproute2 wireguard-tools ]; serviceConfig = { Type = "oneshot"; diff --git a/nixos/modules/services/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix index cf0d72d5c53..b901b19cf31 100644 --- a/nixos/modules/services/security/fail2ban.nix +++ b/nixos/modules/services/security/fail2ban.nix @@ -243,7 +243,7 @@ in restartTriggers = [ fail2banConf jailConf pathsConf ]; reloadIfChanged = true; - path = [ cfg.package cfg.packageFirewall pkgs.iproute ]; + path = [ cfg.package cfg.packageFirewall pkgs.iproute2 ]; unitConfig.Documentation = "man:fail2ban(1)"; diff --git a/nixos/modules/services/security/sshguard.nix b/nixos/modules/services/security/sshguard.nix index 72de11a9254..033ff5ef4b5 100644 --- a/nixos/modules/services/security/sshguard.nix +++ b/nixos/modules/services/security/sshguard.nix @@ -108,8 +108,8 @@ in { partOf = optional config.networking.firewall.enable "firewall.service"; path = with pkgs; if config.networking.nftables.enable - then [ nftables iproute systemd ] - else [ iptables ipset iproute systemd ]; + then [ nftables iproute2 systemd ] + else [ iptables ipset iproute2 systemd ]; # The sshguard ipsets must exist before we invoke # iptables. sshguard creates the ipsets after startup if diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index 9ba6ccfbe71..11bd159319a 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -101,7 +101,7 @@ let unitConfig.ConditionCapability = "CAP_NET_ADMIN"; - path = [ pkgs.iproute ]; + path = [ pkgs.iproute2 ]; serviceConfig = { Type = "oneshot"; @@ -185,7 +185,7 @@ let # Restart rather than stop+start this unit to prevent the # network from dying during switch-to-configuration. stopIfChanged = false; - path = [ pkgs.iproute ]; + path = [ pkgs.iproute2 ]; script = '' state="/run/nixos/network/addresses/${i.name}" @@ -258,7 +258,7 @@ let wantedBy = [ "network-setup.service" (subsystemDevice i.name) ]; partOf = [ "network-setup.service" ]; before = [ "network-setup.service" ]; - path = [ pkgs.iproute ]; + path = [ pkgs.iproute2 ]; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; @@ -284,7 +284,7 @@ let before = [ "network-setup.service" ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; - path = [ pkgs.iproute ]; + path = [ pkgs.iproute2 ]; script = '' # Remove Dead Interfaces echo "Removing old bridge ${n}..." @@ -372,7 +372,7 @@ let wants = deps; # if one or more interface fails, the switch should continue to run serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; - path = [ pkgs.iproute config.virtualisation.vswitch.package ]; + path = [ pkgs.iproute2 config.virtualisation.vswitch.package ]; preStart = '' echo "Resetting Open vSwitch ${n}..." ovs-vsctl --if-exists del-br ${n} -- add-br ${n} \ @@ -413,7 +413,7 @@ let before = [ "network-setup.service" ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; - path = [ pkgs.iproute pkgs.gawk ]; + path = [ pkgs.iproute2 pkgs.gawk ]; script = '' echo "Destroying old bond ${n}..." ${destroyBond n} @@ -451,7 +451,7 @@ let before = [ "network-setup.service" ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; - path = [ pkgs.iproute ]; + path = [ pkgs.iproute2 ]; script = '' # Remove Dead Interfaces ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}" @@ -476,7 +476,7 @@ let before = [ "network-setup.service" ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; - path = [ pkgs.iproute ]; + path = [ pkgs.iproute2 ]; script = '' # Remove Dead Interfaces ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}" @@ -504,7 +504,7 @@ let before = [ "network-setup.service" ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; - path = [ pkgs.iproute ]; + path = [ pkgs.iproute2 ]; script = '' # Remove Dead Interfaces ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}" diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index 23e1e611a71..1c145e8ff47 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -259,7 +259,7 @@ in wants = deps; # if one or more interface fails, the switch should continue to run serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; - path = [ pkgs.iproute config.virtualisation.vswitch.package ]; + path = [ pkgs.iproute2 config.virtualisation.vswitch.package ]; preStart = '' echo "Resetting Open vSwitch ${n}..." ovs-vsctl --if-exists del-br ${n} -- add-br ${n} \ diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index f730ec82bdf..b5d97849658 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -1171,7 +1171,7 @@ in wantedBy = [ "network.target" ]; after = [ "network-pre.target" ]; unitConfig.ConditionCapability = "CAP_NET_ADMIN"; - path = [ pkgs.iproute ]; + path = [ pkgs.iproute2 ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; 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 == "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.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. @@ -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 == "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.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. diff --git a/nixos/modules/virtualisation/brightbox-image.nix b/nixos/modules/virtualisation/brightbox-image.nix index 4498e3a7361..9641b693f18 100644 --- a/nixos/modules/virtualisation/brightbox-image.nix +++ b/nixos/modules/virtualisation/brightbox-image.nix @@ -119,7 +119,7 @@ in wants = [ "network-online.target" ]; after = [ "network-online.target" ]; - path = [ pkgs.wget pkgs.iproute ]; + path = [ pkgs.wget pkgs.iproute2 ]; script = '' diff --git a/nixos/modules/virtualisation/ec2-data.nix b/nixos/modules/virtualisation/ec2-data.nix index 62912535018..1b764e7e4d8 100644 --- a/nixos/modules/virtualisation/ec2-data.nix +++ b/nixos/modules/virtualisation/ec2-data.nix @@ -19,7 +19,7 @@ with lib; wantedBy = [ "multi-user.target" "sshd.service" ]; before = [ "sshd.service" ]; - path = [ pkgs.iproute ]; + path = [ pkgs.iproute2 ]; script = '' diff --git a/nixos/modules/virtualisation/google-compute-config.nix b/nixos/modules/virtualisation/google-compute-config.nix index b6b1ffa3958..cff48d20b2b 100644 --- a/nixos/modules/virtualisation/google-compute-config.nix +++ b/nixos/modules/virtualisation/google-compute-config.nix @@ -110,7 +110,7 @@ in systemd.services.google-network-daemon = { description = "Google Compute Engine Network Daemon"; after = [ "network-online.target" "network.target" "google-instance-setup.service" ]; - path = with pkgs; [ iproute ]; + path = with pkgs; [ iproute2 ]; serviceConfig = { ExecStart = "${gce}/bin/google_network_daemon"; StandardOutput="journal+console"; diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix index a853917a6de..f15d5875841 100644 --- a/nixos/modules/virtualisation/nixos-containers.nix +++ b/nixos/modules/virtualisation/nixos-containers.nix @@ -739,7 +739,7 @@ in unitConfig.RequiresMountsFor = "/var/lib/containers/%i"; - path = [ pkgs.iproute ]; + path = [ pkgs.iproute2 ]; environment = { root = "/var/lib/containers/%i"; diff --git a/nixos/modules/virtualisation/xe-guest-utilities.nix b/nixos/modules/virtualisation/xe-guest-utilities.nix index 675cf929737..25ccbaebc07 100644 --- a/nixos/modules/virtualisation/xe-guest-utilities.nix +++ b/nixos/modules/virtualisation/xe-guest-utilities.nix @@ -17,7 +17,7 @@ in { wantedBy = [ "multi-user.target" ]; after = [ "xe-linux-distribution.service" ]; requires = [ "proc-xen.mount" ]; - path = [ pkgs.coreutils pkgs.iproute ]; + path = [ pkgs.coreutils pkgs.iproute2 ]; serviceConfig = { PIDFile = "/run/xe-daemon.pid"; ExecStart = "${pkgs.xe-guest-utilities}/bin/xe-daemon -p /run/xe-daemon.pid"; diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix index 5b57ca860da..24df1b6ad7c 100644 --- a/nixos/modules/virtualisation/xen-dom0.nix +++ b/nixos/modules/virtualisation/xen-dom0.nix @@ -248,7 +248,7 @@ in # Xen provides udev rules. 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 = { description = "Xen Store Daemon"; diff --git a/nixos/tests/mysql/mariadb-galera-mariabackup.nix b/nixos/tests/mysql/mariadb-galera-mariabackup.nix index a4b893a9f33..0a40c010a47 100644 --- a/nixos/tests/mysql/mariadb-galera-mariabackup.nix +++ b/nixos/tests/mysql/mariadb-galera-mariabackup.nix @@ -2,7 +2,7 @@ import ./../make-test-python.nix ({ pkgs, ...} : let 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 { name = "mariadb-galera-mariabackup"; diff --git a/nixos/tests/wireguard/basic.nix b/nixos/tests/wireguard/basic.nix index a31e92e8649..36ab226cde0 100644 --- a/nixos/tests/wireguard/basic.nix +++ b/nixos/tests/wireguard/basic.nix @@ -52,9 +52,9 @@ import ../make-test-python.nix ({ pkgs, lib, ...} : inherit (wg-snakeoil-keys.peer0) publicKey; }; - postSetup = let inherit (pkgs) iproute; in '' - ${iproute}/bin/ip route replace 10.23.42.1/32 dev wg0 - ${iproute}/bin/ip route replace fc00::1/128 dev wg0 + postSetup = let inherit (pkgs) iproute2; in '' + ${iproute2}/bin/ip route replace 10.23.42.1/32 dev wg0 + ${iproute2}/bin/ip route replace fc00::1/128 dev wg0 ''; }; }; diff --git a/pkgs/applications/misc/bashSnippets/default.nix b/pkgs/applications/misc/bashSnippets/default.nix index 52d56d5c8f5..cec4e8dd8c9 100644 --- a/pkgs/applications/misc/bashSnippets/default.nix +++ b/pkgs/applications/misc/bashSnippets/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchFromGitHub, makeWrapper -, curl, python3, bind, iproute, bc, gitMinimal }: +, curl, python3, bind, iproute2, bc, gitMinimal }: let version = "1.23.0"; deps = lib.makeBinPath [ curl python3 bind.dnsutils - iproute + iproute2 bc gitMinimal ]; diff --git a/pkgs/applications/networking/appgate-sdp/default.nix b/pkgs/applications/networking/appgate-sdp/default.nix index 8b5f4103086..3b5e00a7ffb 100644 --- a/pkgs/applications/networking/appgate-sdp/default.nix +++ b/pkgs/applications/networking/appgate-sdp/default.nix @@ -17,7 +17,7 @@ , glib , gtk3 , icu -, iproute +, iproute2 , krb5 , lib , 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 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 ''; meta = with lib; { diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 7c79c4896bc..285e1db536d 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -3,7 +3,7 @@ , makeWrapper , socat , iptables -, iproute +, iproute2 , bridge-utils , conntrack-tools , buildGoPackage @@ -240,7 +240,7 @@ stdenv.mkDerivation rec { kmod socat iptables - iproute + iproute2 bridge-utils ethtool util-linux diff --git a/pkgs/applications/networking/firehol/default.nix b/pkgs/applications/networking/firehol/default.nix index ee0b561e675..424c6772104 100644 --- a/pkgs/applications/networking/firehol/default.nix +++ b/pkgs/applications/networking/firehol/default.nix @@ -1,5 +1,5 @@ { 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 # If true, just install FireQOS without FireHOL @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake ]; buildInputs = [ - curl iprange iproute ipset iptables iputils kmod + curl iprange iproute2 ipset iptables iputils kmod nettools procps tcpdump traceroute util-linux whois ]; diff --git a/pkgs/applications/networking/ike/default.nix b/pkgs/applications/networking/ike/default.nix index 5ed87334c47..7b4ddb6134d 100644 --- a/pkgs/applications/networking/ike/default.nix +++ b/pkgs/applications/networking/ike/default.nix @@ -1,5 +1,5 @@ { 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"; # launch with "iked -f /etc/iked.conf" @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake flex bison makeWrapper ]; - buildInputs = [ openssl libedit qt4 nettools iproute ]; + buildInputs = [ openssl libedit qt4 nettools iproute2 ]; postPatch = '' # fix build with bison3 diff --git a/pkgs/applications/networking/remote/x2goserver/default.nix b/pkgs/applications/networking/remote/x2goserver/default.nix index 314805a685c..0b8e858d255 100644 --- a/pkgs/applications/networking/remote/x2goserver/default.nix +++ b/pkgs/applications/networking/remote/x2goserver/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, perlPackages, makeWrapper, perl, which, nx-libs , 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 @@ -31,7 +31,7 @@ let binaryDeps = [ 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.xkbcomp xorg.setxkbmap ]; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 73f4812ee59..a6f64444f87 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -13,7 +13,7 @@ rec { , stdenv, fetchFromGitHub, fetchpatch, buildGoPackage , makeWrapper, installShellFiles, pkg-config , 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 , procps, libseccomp , nixosTests @@ -72,7 +72,7 @@ rec { nativeBuildInputs = [ makeWrapper pkg-config go-md2man go libtool installShellFiles ]; 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 = '' export GOCACHE="$TMPDIR/go-cache" diff --git a/pkgs/applications/virtualization/gvisor/default.nix b/pkgs/applications/virtualization/gvisor/default.nix index 56760c293eb..e6b83286c00 100644 --- a/pkgs/applications/virtualization/gvisor/default.nix +++ b/pkgs/applications/virtualization/gvisor/default.nix @@ -5,7 +5,7 @@ , git , glibcLocales , go -, iproute +, iproute2 , iptables , makeWrapper , procps @@ -87,7 +87,7 @@ in buildBazelPackage rec { # Needed for the 'runsc do' subcomand wrapProgram $out/bin/runsc \ - --prefix PATH : ${lib.makeBinPath [ iproute iptables procps ]} + --prefix PATH : ${lib.makeBinPath [ iproute2 iptables procps ]} ''; }; diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index 1afe994977c..e56293dcc64 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook, fuse, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libtirpc, rpcsvc-proto, 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 }: stdenv.mkDerivation rec { @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { postInstall = '' 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; { diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/applications/virtualization/x11docker/default.nix index b90033e438d..ea3b87b47e4 100644 --- a/pkgs/applications/virtualization/x11docker/default.nix +++ b/pkgs/applications/virtualization/x11docker/default.nix @@ -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 { pname = "x11docker"; version = "6.6.2"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installPhase = '' install -D x11docker "$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 = { diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index 5019ce23282..3d0ff3a6f33 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -13,7 +13,7 @@ config: # Scripts , 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 # Documentation @@ -31,7 +31,7 @@ let scriptEnvPath = concatMapStringsSep ":" (x: "${x}/bin") [ which perl 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); diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index d419b0ebe3a..e32cd38ec2d 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -1,10 +1,10 @@ { lib, rustPlatform, fetchFromGitHub, dbus, gdk-pixbuf, libnotify, makeWrapper, pkg-config, xorg , enableAlsaUtils ? true, alsaUtils, coreutils -, enableNetwork ? true, dnsutils, iproute, wirelesstools }: +, enableNetwork ? true, dnsutils, iproute2, wirelesstools }: let bins = lib.optionals enableAlsaUtils [ alsaUtils coreutils ] - ++ lib.optionals enableNetwork [ dnsutils iproute wirelesstools ]; + ++ lib.optionals enableNetwork [ dnsutils iproute2 wirelesstools ]; in rustPlatform.buildRustPackage rec { diff --git a/pkgs/applications/window-managers/i3/blocks-gaps.nix b/pkgs/applications/window-managers/i3/blocks-gaps.nix index 9c97c72ad5d..df774aa417f 100644 --- a/pkgs/applications/window-managers/i3/blocks-gaps.nix +++ b/pkgs/applications/window-managers/i3/blocks-gaps.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, lib, stdenv, perl, makeWrapper -, iproute, acpi, sysstat, alsaUtils +, iproute2, acpi, sysstat, alsaUtils , scripts ? [ "bandwidth" "battery" "cpu_usage" "disk" "iface" "load_average" "memory" "volume" "wifi" ] }: @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { postFixup = '' 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 \ --prefix PATH : ${makeBinPath (optional (elem "battery" scripts) acpi)} wrapProgram $out/libexec/i3blocks/cpu_usage \ --prefix PATH : ${makeBinPath (optional (elem "cpu_usage" scripts) sysstat)} 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 \ --prefix PATH : ${makeBinPath (optional (elem "volume" scripts) alsaUtils)} ''; diff --git a/pkgs/development/libraries/libvirt/5.9.0.nix b/pkgs/development/libraries/libvirt/5.9.0.nix index c11d698079b..c8ad0e7e603 100644 --- a/pkgs/development/libraries/libvirt/5.9.0.nix +++ b/pkgs/development/libraries/libvirt/5.9.0.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, fetchgit , pkg-config, makeWrapper, libtool, autoconf, automake, fetchpatch , 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 , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages , curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, glib, rpcsvc-proto, libtirpc @@ -54,7 +54,7 @@ in stdenv.mkDerivation rec { preConfigure = '' ${ 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 # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations substituteInPlace src/lxc/lxc_conf.c \ @@ -101,7 +101,7 @@ in stdenv.mkDerivation rec { 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 '' substituteInPlace $out/libexec/libvirt-guests.sh \ --replace 'ON_BOOT=start' 'ON_BOOT=''${ON_BOOT:-start}' \ diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 0ec0b0693a3..ea4b40c3c89 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, fetchgit , makeWrapper, autoreconfHook, fetchpatch , 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 , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages , 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}')|" ''; 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 # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations substituteInPlace src/lxc/lxc_conf.c \ @@ -126,7 +126,7 @@ in stdenv.mkDerivation rec { postInstall = let # 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 '' substituteInPlace $out/libexec/libvirt-guests.sh \ --replace 'ON_BOOT="start"' 'ON_BOOT=''${ON_BOOT:-start}' \ diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix index 42e6e920be4..a272cf8b934 100644 --- a/pkgs/development/libraries/tpm2-tss/default.nix +++ b/pkgs/development/libraries/tpm2-tss/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub , autoreconfHook, autoconf-archive, pkg-config, doxygen, perl , openssl, json_c, curl, libgcrypt -, cmocka, uthash, ibm-sw-tpm2, iproute, procps, which +, cmocka, uthash, ibm-sw-tpm2, iproute2, procps, which }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ openssl json_c curl libgcrypt ]; checkInputs = [ - cmocka uthash ibm-sw-tpm2 iproute procps which + cmocka uthash ibm-sw-tpm2 iproute2 procps which ]; preAutoreconf = "./bootstrap"; diff --git a/pkgs/os-specific/linux/gogoclient/default.nix b/pkgs/os-specific/linux/gogoclient/default.nix index b5eb1ce1a50..83ac93fbf71 100644 --- a/pkgs/os-specific/linux/gogoclient/default.nix +++ b/pkgs/os-specific/linux/gogoclient/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, openssl, nettools, iproute, sysctl}: +{lib, stdenv, fetchurl, openssl, nettools, iproute2, sysctl}: let baseName = "gogoclient"; version = "1.2"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { substituteInPlace "$out/template/linux.sh" \ --replace "/sbin/ifconfig" "${nettools}/bin/ifconfig" \ --replace "/sbin/route" "${nettools}/bin/route" \ - --replace "/sbin/ip" "${iproute}/sbin/ip" \ + --replace "/sbin/ip" "${iproute2}/sbin/ip" \ --replace "/sbin/sysctl" "${sysctl}/bin/sysctl" sed -i -e 's/^.*Exec \$route -A.*$/& metric 128/' $out/template/linux.sh ''; diff --git a/pkgs/os-specific/linux/hyperv-daemons/default.nix b/pkgs/os-specific/linux/hyperv-daemons/default.nix index 2d7644e6bda..2b6bf6fc63a 100644 --- a/pkgs/os-specific/linux/hyperv-daemons/default.nix +++ b/pkgs/os-specific/linux/hyperv-daemons/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, python, kernel, makeWrapper, writeText -, gawk, iproute }: +, gawk, iproute2 }: let libexec = "libexec/hypervkvpd"; @@ -42,7 +42,7 @@ let postFixup = '' wrapProgram $out/bin/hv_kvp_daemon \ - --prefix PATH : $out/bin:${lib.makeBinPath [ gawk iproute ]} + --prefix PATH : $out/bin:${lib.makeBinPath [ gawk iproute2 ]} ''; }; diff --git a/pkgs/os-specific/linux/iproute/mptcp.nix b/pkgs/os-specific/linux/iproute/mptcp.nix index 7285e27ff36..12723213901 100644 --- a/pkgs/os-specific/linux/iproute/mptcp.nix +++ b/pkgs/os-specific/linux/iproute/mptcp.nix @@ -1,6 +1,6 @@ -{ lib, iproute, fetchFromGitHub }: +{ lib, iproute2, fetchFromGitHub }: -iproute.overrideAttrs (oa: rec { +iproute2.overrideAttrs (oa: rec { pname = "iproute_mptcp"; version = "0.95"; diff --git a/pkgs/os-specific/linux/openvswitch/lts.nix b/pkgs/os-specific/linux/openvswitch/lts.nix index f379633e198..4a6cf887c3b 100644 --- a/pkgs/os-specific/linux/openvswitch/lts.nix +++ b/pkgs/os-specific/linux/openvswitch/lts.nix @@ -1,5 +1,5 @@ { 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 }: with lib; diff --git a/pkgs/os-specific/linux/pipework/default.nix b/pkgs/os-specific/linux/pipework/default.nix index e58b97654af..33192392888 100644 --- a/pkgs/os-specific/linux/pipework/default.nix +++ b/pkgs/os-specific/linux/pipework/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, makeWrapper -, bridge-utils, iproute, lxc, openvswitch, docker, busybox, dhcpcd, dhcp +, bridge-utils, iproute2, lxc, openvswitch, docker, busybox, dhcpcd, dhcp }: stdenv.mkDerivation { @@ -15,7 +15,7 @@ stdenv.mkDerivation { installPhase = '' install -D pipework $out/bin/pipework 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; { description = "Software-Defined Networking tools for LXC"; diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index aef87e7c82d..c37514eaf48 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, docutils -, pandoc, ethtool, iproute, libnl, udev, python3, perl +, pandoc, ethtool, iproute2, libnl, udev, python3, perl , makeWrapper } : @@ -18,7 +18,7 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ cmake pkg-config pandoc docutils makeWrapper ]; - buildInputs = [ libnl ethtool iproute udev python3 perl ]; + buildInputs = [ libnl ethtool iproute2 udev python3 perl ]; cmakeFlags = [ "-DCMAKE_INSTALL_RUNDIR=/run" diff --git a/pkgs/servers/http/nix-binary-cache/default.nix b/pkgs/servers/http/nix-binary-cache/default.nix index a174d4dcb1a..65323323962 100644 --- a/pkgs/servers/http/nix-binary-cache/default.nix +++ b/pkgs/servers/http/nix-binary-cache/default.nix @@ -1,6 +1,6 @@ {lib, stdenv , coreutils, findutils, nix, xz, bzip2, gnused, gnugrep, openssl -, lighttpd, iproute }: +, lighttpd, iproute2 }: stdenv.mkDerivation rec { version = "2014-06-29-1"; pname = "nix-binary-cache"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { --replace @gnugrep@ "${gnugrep}/bin" \ --replace @openssl@ "${openssl.bin}/bin" \ --replace @lighttpd@ "${lighttpd}/sbin" \ - --replace @iproute@ "${iproute}/sbin" \ + --replace @iproute@ "${iproute2}/sbin" \ --replace "xXxXx" "xXxXx" chmod a+x "$out/bin/nix-binary-cache.cgi" @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { --replace @gnugrep@ "${gnugrep}/bin" \ --replace @openssl@ "${openssl.bin}/bin" \ --replace @lighttpd@ "${lighttpd}/sbin" \ - --replace @iproute@ "${iproute}/sbin" \ + --replace @iproute@ "${iproute2}/sbin" \ --replace "xXxXx" "xXxXx" chmod a+x "$out/bin/nix-binary-cache-start" diff --git a/pkgs/servers/monitoring/fusion-inventory/default.nix b/pkgs/servers/monitoring/fusion-inventory/default.nix index 02841c6acb9..c55c67f5f62 100644 --- a/pkgs/servers/monitoring/fusion-inventory/default.nix +++ b/pkgs/servers/monitoring/fusion-inventory/default.nix @@ -1,4 +1,4 @@ -{ lib, perlPackages, nix, dmidecode, pciutils, usbutils, iproute, nettools +{ lib, perlPackages, nix, dmidecode, pciutils, usbutils, iproute2, nettools , fetchFromGitHub, makeWrapper }: @@ -18,9 +18,9 @@ perlPackages.buildPerlPackage rec { patchShebangs bin 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" \ - --replace /sbin/ip ${iproute}/sbin/ip + --replace /sbin/ip ${iproute2}/sbin/ip ''; buildTools = []; @@ -67,7 +67,7 @@ perlPackages.buildPerlPackage rec { for cur in $out/bin/*; do if [ -x "$cur" ]; then 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 done ''; diff --git a/pkgs/servers/monitoring/mackerel-agent/default.nix b/pkgs/servers/monitoring/mackerel-agent/default.nix index a8cf124fc7e..8051602489c 100644 --- a/pkgs/servers/monitoring/mackerel-agent/default.nix +++ b/pkgs/servers/monitoring/mackerel-agent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub, makeWrapper, iproute, nettools }: +{ stdenv, lib, buildGoModule, fetchFromGitHub, makeWrapper, iproute2, nettools }: buildGoModule rec { pname = "mackerel-agent"; @@ -13,7 +13,7 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper ]; checkInputs = lib.optionals (!stdenv.isDarwin) [ nettools ]; - buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute ]; + buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute2 ]; vendorSha256 = "sha256-yomxALecP+PycelOmwrteK/LoW7wsst7os+jcbF46Bs="; diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 714cf517457..d051395027b 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper, iptables, iproute }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper, iptables, iproute2 }: buildGoModule rec { pname = "tailscale"; @@ -30,7 +30,7 @@ buildGoModule rec { postInstall = '' 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 install -D -m0444 -t $out/lib/systemd/system ./cmd/tailscaled/tailscaled.service diff --git a/pkgs/tools/admin/acme.sh/default.nix b/pkgs/tools/admin/acme.sh/default.nix index 9b4b09c2484..63ca45452e6 100644 --- a/pkgs/tools/admin/acme.sh/default.nix +++ b/pkgs/tools/admin/acme.sh/default.nix @@ -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 { pname = "acme.sh"; version = "2.8.8"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { openssl curl dnsutils - (if stdenv.isLinux then iproute else unixtools.netstat) + (if stdenv.isLinux then iproute2 else unixtools.netstat) ] }" ''; diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index eb748cc42ca..91f71ece421 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -1,6 +1,6 @@ { lib, hwdata, pkg-config, lxc, buildGoPackage, fetchurl , 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 , writeShellScriptBin, apparmor-profiles, apparmor-parser , criu @@ -48,7 +48,7 @@ buildGoPackage rec { wrapProgram $out/bin/lxd --prefix PATH : ${lib.makeBinPath ( 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" '' exec '${apparmor-parser}/bin/apparmor_parser' -I '${apparmor-profiles}/etc/apparmor.d' "$@" '') ] diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index 69eeb3db711..b30a8763706 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -1,11 +1,11 @@ { 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 , networkmanager, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio, fetchpatch }: let pythonPackages = python3Packages; - binPath = lib.makeBinPath [ xdg-utils dnsmasq dhcp iproute ]; + binPath = lib.makeBinPath [ xdg-utils dnsmasq dhcp iproute2 ]; in stdenv.mkDerivation rec { pname = "blueman"; @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ bluez gtk3 pythonPackages.python librsvg - gnome3.adwaita-icon-theme iproute libappindicator networkmanager ] + gnome3.adwaita-icon-theme iproute2 libappindicator networkmanager ] ++ pythonPath ++ lib.optional withPulseAudio libpulseaudio; diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/tools/networking/ddclient/default.nix index 51454ac1197..f62eba66f99 100644 --- a/pkgs/tools/networking/ddclient/default.nix +++ b/pkgs/tools/networking/ddclient/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, perlPackages, iproute, perl }: +{ lib, fetchurl, perlPackages, iproute2, perl }: perlPackages.buildPerlPackage rec { pname = "ddclient"; @@ -19,8 +19,8 @@ perlPackages.buildPerlPackage rec { touch Makefile.PL substituteInPlace ddclient \ --replace 'in the output of ifconfig' 'in the output of ip addr show' \ - --replace 'ifconfig -a' '${iproute}/sbin/ip addr show' \ - --replace 'ifconfig $arg' '${iproute}/sbin/ip addr show $arg' \ + --replace 'ifconfig -a' '${iproute2}/sbin/ip addr show' \ + --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 ''; diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix index 751dd2c8c1f..08b3543c5c0 100644 --- a/pkgs/tools/networking/dhcp/default.nix +++ b/pkgs/tools/networking/dhcp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, file, nettools, iputils, iproute, makeWrapper +{ stdenv, fetchurl, perl, file, nettools, iputils, iproute2, makeWrapper , coreutils, gnused, openldap ? null , buildPackages, lib }: @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { cp client/scripts/linux $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 : \ "${nettools}/bin:${nettools}/sbin:${iputils}/bin:${coreutils}/bin:${gnused}/bin" ''; diff --git a/pkgs/tools/networking/gvpe/default.nix b/pkgs/tools/networking/gvpe/default.nix index 788d61e9ca9..59748f6f967 100644 --- a/pkgs/tools/networking/gvpe/default.nix +++ b/pkgs/tools/networking/gvpe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, gmp, zlib, iproute, nettools }: +{ lib, stdenv, fetchurl, openssl, gmp, zlib, iproute2, nettools }: stdenv.mkDerivation rec { pname = "gvpe"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; 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 ''; diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix index 93d423a7283..1059baf13ee 100644 --- a/pkgs/tools/networking/libreswan/default.nix +++ b/pkgs/tools/networking/libreswan/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, 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 }: let 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 @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { 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 ] ++ lib.optional docs xmlto ++ lib.optional stdenv.isLinux libselinux; diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index 9642f254838..05b04cf9484 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -1,9 +1,9 @@ { stdenv, lib, fetchurl, iptables, libuuid, pkg-config -, which, iproute, gnused, coreutils, gawk, makeWrapper +, which, iproute2, gnused, coreutils, gawk, makeWrapper }: let - scriptBinEnv = lib.makeBinPath [ which iproute iptables gnused coreutils gawk ]; + scriptBinEnv = lib.makeBinPath [ which iproute2 iptables gnused coreutils gawk ]; in stdenv.mkDerivation rec { name = "miniupnpd-2.1.20190502"; diff --git a/pkgs/tools/networking/miredo/default.nix b/pkgs/tools/networking/miredo/default.nix index 48b6f5dc4cf..94565db2076 100644 --- a/pkgs/tools/networking/miredo/default.nix +++ b/pkgs/tools/networking/miredo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, nettools, iproute, judy }: +{ lib, stdenv, fetchurl, nettools, iproute2, judy }: stdenv.mkDerivation rec { version = "1.2.6"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { substituteInPlace misc/client-hook.bsd \ --replace '/sbin/route' '${nettools}/bin/route' \ --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" ]; diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index dd5fa9cbed8..6b98df21502 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -3,7 +3,7 @@ , pkg-config , makeWrapper , runtimeShell -, iproute +, iproute2 , lzo , openssl , pam @@ -40,13 +40,13 @@ let buildInputs = [ lzo openssl ] ++ optional stdenv.isLinux pam - ++ optional withIpRoute iproute + ++ optional withIpRoute iproute2 ++ optional useSystemd systemd ++ optional pkcs11Support pkcs11helper; configureFlags = optionals withIpRoute [ "--enable-iproute2" - "IPROUTE=${iproute}/sbin/ip" + "IPROUTE=${iproute2}/sbin/ip" ] ++ optional useSystemd "--enable-systemd" ++ optional pkcs11Support "--enable-pkcs11" @@ -60,7 +60,7 @@ let '' + optionalString useSystemd '' install -Dm555 ${update-resolved} $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; diff --git a/pkgs/tools/networking/openvpn/update-systemd-resolved.nix b/pkgs/tools/networking/openvpn/update-systemd-resolved.nix index 9d8e669fe45..5a34d5a7ffe 100644 --- a/pkgs/tools/networking/openvpn/update-systemd-resolved.nix +++ b/pkgs/tools/networking/openvpn/update-systemd-resolved.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , makeWrapper -, iproute, systemd, coreutils, util-linux }: +, iproute2, systemd, coreutils, util-linux }: stdenv.mkDerivation rec { pname = "update-systemd-resolved"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { installPhase = '' 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; { diff --git a/pkgs/tools/networking/pptp/default.nix b/pkgs/tools/networking/pptp/default.nix index 1534d1083f4..7af9e324f2e 100644 --- a/pkgs/tools/networking/pptp/default.nix +++ b/pkgs/tools/networking/pptp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perl, ppp, iproute }: +{ lib, stdenv, fetchurl, perl, ppp, iproute2 }: stdenv.mkDerivation rec { pname = "pptp"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ''; 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 \ PPPDIR=$out/etc/ppp ) ''; diff --git a/pkgs/tools/networking/shorewall/default.nix b/pkgs/tools/networking/shorewall/default.nix index 2456a760721..f95fc9d92b1 100644 --- a/pkgs/tools/networking/shorewall/default.nix +++ b/pkgs/tools/networking/shorewall/default.nix @@ -3,7 +3,7 @@ , fetchurl , gnugrep , gnused -, iproute +, iproute2 , ipset , iptables , perl @@ -15,7 +15,7 @@ let PATH = lib.concatStringsSep ":" [ "${coreutils}/bin" - "${iproute}/bin" + "${iproute2}/bin" "${iptables}/bin" "${ipset}/bin" "${ebtables}/bin" @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { buildInputs = [ coreutils - iproute + iproute2 ipset iptables ebtables diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index 7e702c0559b..e4eb0a2cdc8 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, python2Packages , wpa_supplicant, dhcp, dhcpcd, wirelesstools -, nettools, openresolv, iproute, iputils }: +, nettools, openresolv, iproute2, iputils }: let 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 - 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 "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 diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index efb5b5c5b42..8bdcd8708d9 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -3,7 +3,7 @@ , fetchzip , nixosTests , iptables -, iproute +, iproute2 , makeWrapper , openresolv , procps @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { --replace /usr/bin $out/bin '' + lib.optionalString stdenv.isLinux '' 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 '' + lib.optionalString stdenv.isDarwin '' for f in $out/bin/*; do diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index 04711b3d861..60da9b3abcb 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -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 { pname = "zerotierone"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ ronn ]; - buildInputs = [ openssl lzo zlib iproute ]; + buildInputs = [ openssl lzo zlib iproute2 ]; enableParallelBuilding = true; diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix index 12f2a2ef07c..d529e9cf025 100644 --- a/pkgs/tools/system/inxi/default.nix +++ b/pkgs/tools/system/inxi/default.nix @@ -2,7 +2,7 @@ , ps, dnsutils # dig is recommended for multiple categories , withRecommends ? false # Install (almost) all recommended tools (see --recommends) , 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 , withRecommendedDisplayInformationPrograms ? withRecommends, glxinfo, xorg }: @@ -11,7 +11,7 @@ let prefixPath = programs: "--prefix PATH ':' '${lib.makeBinPath programs}'"; 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 ]; recommendedDisplayInformationPrograms = lib.optionals diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 27543f4037a..59d7e3d3369 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -310,6 +310,7 @@ mapAliases ({ infiniband-diags = rdma-core; # added 2019-08-09 inotifyTools = inotify-tools; 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 jack2Full = jack2; # moved from top-level 2021-03-14 jamomacore = throw "jamomacore has been removed: abandoned upstream."; # added 2020-11-21 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index acc8019ac16..4f4b393399e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19495,7 +19495,6 @@ in iotop = callPackage ../os-specific/linux/iotop { }; 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 { }; -- cgit 1.4.1