talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

net-tools: rename from nettools

Browse Source 
By being in sync with the pname, it makes it easier to walk back from
the pname that shows in the /nix/store back to the attribute.

This change should not cause any rebuild.
This commit is contained in:
zimbatm 2025-06-11 23:26:42 +02:00
parent 2ab3cba555
commit 39c01d22bf
73 changed files with 145 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/services/cluster/spark/default.nix
View File

@ -104,7 +104,7 @@ in
path = with pkgs; [ path = with pkgs; [
procps procps
openssh openssh
nettools net-tools
]; ];
description = "spark master service."; description = "spark master service.";
after = [ "network.target" ]; after = [ "network.target" ];
@ -131,7 +131,7 @@ in
path = with pkgs; [ path = with pkgs; [
procps procps
openssh openssh
nettools net-tools
rsync rsync
]; ];
description = "spark master service."; description = "spark master service.";

4
nixos/modules/services/continuous-integration/hydra/default.nix
View File

@ -424,7 +424,7 @@ in
]; ];
path = [ path = [
hydra-package hydra-package
pkgs.nettools pkgs.net-tools
pkgs.openssh pkgs.openssh
pkgs.bzip2 pkgs.bzip2
config.nix.package config.nix.package
@ -459,7 +459,7 @@ in
]; ];
path = with pkgs; [ path = with pkgs; [
hydra-package hydra-package
nettools net-tools
jq jq
]; ];
restartTriggers = [ hydraConf ]; restartTriggers = [ hydraConf ];

2
nixos/modules/services/databases/mysql.nix
View File

@ -525,7 +525,7 @@ in
[ [
# Needed for the mysql_install_db command in the preStart script # Needed for the mysql_install_db command in the preStart script
# which calls the hostname command. # which calls the hostname command.
pkgs.nettools pkgs.net-tools
] ]
# tools 'wsrep_sst_rsync' needs # tools 'wsrep_sst_rsync' needs
++ lib.optionals cfg.galeraCluster.enable [ ++ lib.optionals cfg.galeraCluster.enable [

4
nixos/modules/services/desktops/profile-sync-daemon.nix
View File

@ -43,7 +43,7 @@ in
rsync rsync
kmod kmod
gawk gawk
nettools net-tools
util-linux util-linux
profile-sync-daemon profile-sync-daemon
]; ];
@ -69,7 +69,7 @@ in
rsync rsync
kmod kmod
gawk gawk
nettools net-tools
util-linux util-linux
profile-sync-daemon profile-sync-daemon
]; ];

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

@ -45,7 +45,7 @@ let
defaultsFile = pkgs.writeText "60-defaults.conf" '' defaultsFile = pkgs.writeText "60-defaults.conf" ''
# 01-system-paths.conf # 01-system-paths.conf
${dirStanzas home} ${dirStanzas home}
ZM_PATH_ARP=${lib.getBin pkgs.nettools}/bin/arp ZM_PATH_ARP=${lib.getBin pkgs.net-tools}/bin/arp
ZM_PATH_LOGS=/var/log/${dirName} ZM_PATH_LOGS=/var/log/${dirName}
ZM_PATH_MAP=/dev/shm ZM_PATH_MAP=/dev/shm
ZM_PATH_SOCKS=/run/${dirName} ZM_PATH_SOCKS=/run/${dirName}

6
nixos/modules/services/monitoring/zabbix-agent.nix
View File

@ -59,9 +59,9 @@ in
extraPackages = mkOption { extraPackages = mkOption {
type = types.listOf types.package; type = types.listOf types.package;
default = with pkgs; [ nettools ]; default = with pkgs; [ net-tools ];
defaultText = literalExpression "with pkgs; [ nettools ]"; defaultText = literalExpression "with pkgs; [ net-tools ]";
example = literalExpression "with pkgs; [ nettools mysql ]"; example = literalExpression "with pkgs; [ net-tools mysql ]";
description = '' description = ''
Packages to be added to the Zabbix {env}`PATH`. Packages to be added to the Zabbix {env}`PATH`.
Typically used to add executables for scripts, but can be anything. Typically used to add executables for scripts, but can be anything.

4
nixos/modules/services/monitoring/zabbix-proxy.nix
View File

@ -91,11 +91,11 @@ in
extraPackages = mkOption { extraPackages = mkOption {
type = types.listOf types.package; type = types.listOf types.package;
default = with pkgs; [ default = with pkgs; [
nettools net-tools
nmap nmap
traceroute traceroute
]; ];
defaultText = literalExpression "[ nettools nmap traceroute ]"; defaultText = literalExpression "[ net-tools nmap traceroute ]";
description = '' description = ''
Packages to be added to the Zabbix {env}`PATH`. Packages to be added to the Zabbix {env}`PATH`.
Typically used to add executables for scripts, but can be anything. Typically used to add executables for scripts, but can be anything.

4
nixos/modules/services/monitoring/zabbix-server.nix
View File

@ -88,11 +88,11 @@ in
extraPackages = mkOption { extraPackages = mkOption {
type = types.listOf types.package; type = types.listOf types.package;
default = with pkgs; [ default = with pkgs; [
nettools net-tools
nmap nmap
traceroute traceroute
]; ];
defaultText = literalExpression "[ nettools nmap traceroute ]"; defaultText = literalExpression "[ net-tools nmap traceroute ]";
description = '' description = ''
Packages to be added to the Zabbix {env}`PATH`. Packages to be added to the Zabbix {env}`PATH`.
Typically used to add executables for scripts, but can be anything. Typically used to add executables for scripts, but can be anything.

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

@ -165,7 +165,7 @@ in
procps procps
nssTools nssTools
iptables iptables
nettools net-tools
]; ];
preStart = lib.optionalString cfg.disableRedirects '' preStart = lib.optionalString cfg.disableRedirects ''
# Disable send/receive redirects # Disable send/receive redirects

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

@ -74,7 +74,7 @@ let
path = [ path = [
pkgs.iptables pkgs.iptables
pkgs.iproute2 pkgs.iproute2
pkgs.nettools pkgs.net-tools
]; ];
serviceConfig.ExecStart = "@${openvpn}/sbin/openvpn openvpn --suppress-timestamps --config ${configFile}"; serviceConfig.ExecStart = "@${openvpn}/sbin/openvpn openvpn --suppress-timestamps --config ${configFile}";

4
nixos/modules/services/networking/tetrd.nix
View File

@ -80,8 +80,8 @@
builtins.storeDir builtins.storeDir
"/etc/ssl" "/etc/ssl"
"/etc/static/ssl" "/etc/static/ssl"
"${pkgs.nettools}/bin/route:/usr/bin/route" "${pkgs.net-tools}/bin/route:/usr/bin/route"
"${pkgs.nettools}/bin/ifconfig:/usr/bin/ifconfig" "${pkgs.net-tools}/bin/ifconfig:/usr/bin/ifconfig"
]; ];
BindPaths = [ BindPaths = [

2
nixos/modules/services/system/cloud-init.nix
View File

@ -11,7 +11,7 @@ let
[ [
cloud-init cloud-init
iproute2 iproute2
nettools net-tools
openssh openssh
shadow shadow
util-linux util-linux

2
nixos/modules/services/x11/terminal-server.nix
View File

@ -36,7 +36,7 @@ with lib;
pkgs.which pkgs.which
pkgs.openssl pkgs.openssl
pkgs.xorg.xauth pkgs.xorg.xauth
pkgs.nettools pkgs.net-tools
pkgs.shadow pkgs.shadow
pkgs.procps pkgs.procps
pkgs.util-linux pkgs.util-linux

2
nixos/modules/system/activation/activation-script.nix
View File

@ -90,7 +90,7 @@ let
getent getent
stdenv.cc.libc # nscd in update-users-groups.pl stdenv.cc.libc # nscd in update-users-groups.pl
shadow shadow
nettools # needed for hostname net-tools # needed for hostname
util-linux # needed for mount and mountpoint util-linux # needed for mount and mountpoint
]; ];

2
nixos/modules/tasks/filesystems/zfs.nix
View File

@ -832,7 +832,7 @@ in
pkgs.gawk pkgs.gawk
pkgs.gnugrep pkgs.gnugrep
pkgs.gnused pkgs.gnused
pkgs.nettools pkgs.net-tools
pkgs.util-linux pkgs.util-linux
]; ];
}; };

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

@ -1625,7 +1625,7 @@ in
]; ];
conflicts = [ "shutdown.target" ]; conflicts = [ "shutdown.target" ];
unitConfig.DefaultDependencies = false; unitConfig.DefaultDependencies = false;
serviceConfig.ExecStart = ''${pkgs.nettools}/bin/domainname "${cfg.domain}"''; serviceConfig.ExecStart = ''${pkgs.net-tools}/bin/domainname "${cfg.domain}"'';
serviceConfig.Type = "oneshot"; serviceConfig.Type = "oneshot";
}; };
@ -1643,7 +1643,7 @@ in
pkgs.host pkgs.host
pkgs.iproute2 pkgs.iproute2
pkgs.iputils pkgs.iputils
pkgs.nettools pkgs.net-tools
] ]
++ optionals config.networking.wireless.enable [ ++ optionals config.networking.wireless.enable [
pkgs.wirelesstools # FIXME: obsolete? pkgs.wirelesstools # FIXME: obsolete?

2
nixos/modules/virtualisation/digital-ocean-config.nix
View File

@ -144,7 +144,7 @@ with lib;
systemd.services.digitalocean-set-hostname = mkIf (hostName == "") { systemd.services.digitalocean-set-hostname = mkIf (hostName == "") {
path = [ path = [
pkgs.curl pkgs.curl
pkgs.nettools pkgs.net-tools
]; ];
description = "Set hostname provided by Digitalocean"; description = "Set hostname provided by Digitalocean";
wantedBy = [ "network.target" ]; wantedBy = [ "network.target" ];

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

@ -34,7 +34,7 @@ with lib;
${optionalString (config.networking.hostName == "") '' ${optionalString (config.networking.hostName == "") ''
echo "setting host name..." echo "setting host name..."
if [ -s /etc/ec2-metadata/hostname ]; then if [ -s /etc/ec2-metadata/hostname ]; then
${pkgs.nettools}/bin/hostname $(cat /etc/ec2-metadata/hostname) ${pkgs.net-tools}/bin/hostname $(cat /etc/ec2-metadata/hostname)
fi fi
''} ''}

2
nixos/modules/virtualisation/vagrant-guest.nix
View File

@ -23,7 +23,7 @@ in
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
findutils findutils
iputils iputils
nettools net-tools
netcat netcat
nfs-utils nfs-utils
rsync rsync

2
nixos/modules/virtualisation/waagent.nix
View File

@ -351,7 +351,7 @@ in
parted parted
# for hostname # for hostname
nettools net-tools
# for pidof # for pidof
procps procps
# for useradd, usermod # for useradd, usermod

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

@ -10,7 +10,7 @@
iptables, iptables,
iputils, iputils,
kmod, kmod,
nettools, net-tools,
procps, procps,
tcpdump, tcpdump,
traceroute, traceroute,
@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
iptables iptables
iputils iputils
kmod kmod
nettools net-tools
procps procps
tcpdump tcpdump
traceroute traceroute

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

@ -35,7 +35,7 @@
alsa-lib, alsa-lib,
curl, curl,
libvpx, libvpx,
nettools, net-tools,
dbus, dbus,
replaceVars, replaceVars,
gsoap, gsoap,
@ -263,7 +263,7 @@ stdenv.mkDerivation (finalAttrs: {
]; ];
postPatch = '' postPatch = ''
sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \ sed -i -e 's|/sbin/ifconfig|${net-tools}/bin/ifconfig|' \
src/VBox/HostDrivers/adpctl/VBoxNetAdpCtl.cpp src/VBox/HostDrivers/adpctl/VBoxNetAdpCtl.cpp
''; '';

4
pkgs/applications/window-managers/awesome/default.nix
View File

@ -20,7 +20,7 @@
gobject-introspection, gobject-introspection,
which, which,
dbus, dbus,
nettools, net-tools,
git, git,
doxygen, doxygen,
xmlto, xmlto,
@ -105,7 +105,7 @@ stdenv.mkDerivation rec {
libstartup_notification libstartup_notification
libxdg_basedir libxdg_basedir
lua lua
nettools net-tools
pango pango
xcb-util-cursor xcb-util-cursor
xorg.libXau xorg.libXau

4
pkgs/by-name/am/amazon-ssm-agent/package.nix
View File

@ -6,7 +6,7 @@
darwin, darwin,
fetchFromGitHub, fetchFromGitHub,
coreutils, coreutils,
nettools, net-tools,
util-linux, util-linux,
stdenv, stdenv,
dmidecode, dmidecode,
@ -92,7 +92,7 @@ buildGoModule rec {
substituteInPlace agent/platform/platform_unix.go \ substituteInPlace agent/platform/platform_unix.go \
--replace-fail "/usr/bin/uname" "${coreutils}/bin/uname" \ --replace-fail "/usr/bin/uname" "${coreutils}/bin/uname" \
--replace-fail '"/bin", "hostname"' '"${nettools}/bin/hostname"' \ --replace-fail '"/bin", "hostname"' '"${net-tools}/bin/hostname"' \
--replace-fail '"lsb_release"' '"${fake-lsb-release}/bin/lsb_release"' --replace-fail '"lsb_release"' '"${fake-lsb-release}/bin/lsb_release"'
substituteInPlace agent/session/shell/shell_unix.go \ substituteInPlace agent/session/shell/shell_unix.go \

14
pkgs/by-name/cv/cvsq/package.nix
View File

@ -5,7 +5,7 @@
makeWrapper, makeWrapper,
cvs, cvs,
perl, perl,
nettools, net-tools,
findutils, findutils,
rsync, rsync,
coreutils, coreutils,
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
cvs cvs
perl perl
nettools net-tools
findutils findutils
rsync rsync
coreutils coreutils
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/cvsq --prefix PATH : ${ wrapProgram $out/bin/cvsq --prefix PATH : ${
lib.makeBinPath [ lib.makeBinPath [
cvs cvs
nettools net-tools
findutils findutils
rsync rsync
coreutils coreutils
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/cvsq-branch --prefix PATH : ${ wrapProgram $out/bin/cvsq-branch --prefix PATH : ${
lib.makeBinPath [ lib.makeBinPath [
cvs cvs
nettools net-tools
findutils findutils
rsync rsync
coreutils coreutils
@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/cvsq-merge --prefix PATH : ${ wrapProgram $out/bin/cvsq-merge --prefix PATH : ${
lib.makeBinPath [ lib.makeBinPath [
cvs cvs
nettools net-tools
findutils findutils
rsync rsync
coreutils coreutils
@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/cvsq-switch --prefix PATH : ${ wrapProgram $out/bin/cvsq-switch --prefix PATH : ${
lib.makeBinPath [ lib.makeBinPath [
cvs cvs
nettools net-tools
findutils findutils
rsync rsync
coreutils coreutils
@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/lcvs --prefix PATH : ${ wrapProgram $out/bin/lcvs --prefix PATH : ${
lib.makeBinPath [ lib.makeBinPath [
cvs cvs
nettools net-tools
findutils findutils
rsync rsync
coreutils coreutils

4
pkgs/by-name/fa/facter/package.nix
View File

@ -7,7 +7,7 @@
iproute2, iproute2,
lib, lib,
makeWrapper, makeWrapper,
nettools, net-tools,
pciutils, pciutils,
procps, procps,
stdenv, stdenv,
@ -30,7 +30,7 @@ bundlerApp {
[ [
coreutils coreutils
gnugrep gnugrep
nettools net-tools
pciutils pciutils
procps procps
util-linux util-linux

4
pkgs/by-name/fr/frr/package.nix
View File

@ -34,7 +34,7 @@
zeromq, zeromq,
# tests # tests
nettools, net-tools,
nixosTests, nixosTests,
# general options # general options
@ -218,7 +218,7 @@ stdenv.mkDerivation (finalAttrs: {
doCheck = true; doCheck = true;
nativeCheckInputs = [ nativeCheckInputs = [
nettools net-tools
python3.pkgs.pytest python3.pkgs.pytest
]; ];

4
pkgs/by-name/fu/fusionInventory/package.nix
View File

@ -6,7 +6,7 @@
pciutils, pciutils,
usbutils, usbutils,
iproute2, iproute2,
nettools, net-tools,
fetchFromGitHub, fetchFromGitHub,
makeWrapper, makeWrapper,
}: }:
@ -86,7 +86,7 @@ perlPackages.buildPerlPackage rec {
dmidecode dmidecode
pciutils pciutils
usbutils usbutils
nettools net-tools
iproute2 iproute2
] ]
} }

4
pkgs/by-name/gi/gitlab/package.nix
View File

@ -9,7 +9,7 @@
gitlabEnterprise ? false, gitlabEnterprise ? false,
lib, lib,
makeWrapper, makeWrapper,
nettools, net-tools,
nixosTests, nixosTests,
nodejs_20, nodejs_20,
replace, replace,
@ -220,7 +220,7 @@ stdenv.mkDerivation {
rubyEnv.bundler rubyEnv.bundler
tzdata tzdata
git git
nettools net-tools
]; ];
patches = [ patches = [

6
pkgs/by-name/gi/gitolite/package.nix
View File

@ -5,7 +5,7 @@
git, git,
lib, lib,
makeWrapper, makeWrapper,
nettools, net-tools,
perl, perl,
nixosTests, nixosTests,
}: }:
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
nettools net-tools
perl perl
]; ];
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
substituteInPlace src/lib/Gitolite/Hooks/Update.pm \ substituteInPlace src/lib/Gitolite/Hooks/Update.pm \
--replace /usr/bin/perl "${perl}/bin/perl" --replace /usr/bin/perl "${perl}/bin/perl"
substituteInPlace src/lib/Gitolite/Setup.pm \ substituteInPlace src/lib/Gitolite/Setup.pm \
--replace hostname "${nettools}/bin/hostname" --replace hostname "${net-tools}/bin/hostname"
substituteInPlace src/commands/sskm \ substituteInPlace src/commands/sskm \
--replace /bin/rm "${coreutils}/bin/rm" --replace /bin/rm "${coreutils}/bin/rm"
''; '';

4
pkgs/by-name/gl/glpi-agent/package.nix
View File

@ -6,7 +6,7 @@
pciutils, pciutils,
usbutils, usbutils,
iproute2, iproute2,
nettools, net-tools,
fetchFromGitHub, fetchFromGitHub,
makeWrapper, makeWrapper,
versionCheckHook, versionCheckHook,
@ -105,7 +105,7 @@ perlPackages.buildPerlPackage rec {
dmidecode dmidecode
pciutils pciutils
usbutils usbutils
nettools net-tools
iproute2 iproute2
] ]
} }

4
pkgs/by-name/gv/gvpe/package.nix
View File

@ -6,7 +6,7 @@
gmp, gmp,
zlib, zlib,
iproute2, iproute2,
nettools, net-tools,
pkg-config, pkg-config,
}: }:
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
postPatch = '' postPatch = ''
sed -e 's@"/sbin/ifconfig.*"@"${iproute2}/sbin/ip link set dev $IFNAME address $MAC mtu $MTU"@' -i src/device-linux.C sed -e 's@"/sbin/ifconfig.*"@"${iproute2}/sbin/ip link set dev $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@${net-tools}/sbin/ifconfig@g' -i src/device-*.C
''; '';
meta = with lib; { meta = with lib; {

6
pkgs/by-name/ha/hans/package.nix
View File

@ -2,7 +2,7 @@
lib, lib,
stdenv, stdenv,
fetchFromGitHub, fetchFromGitHub,
nettools, net-tools,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -16,10 +16,10 @@ stdenv.mkDerivation rec {
owner = "friedrich"; owner = "friedrich";
}; };
buildInputs = [ nettools ]; buildInputs = [ net-tools ];
postPatch = '' postPatch = ''
substituteInPlace src/tun.cpp --replace "/sbin/" "${nettools}/bin/" substituteInPlace src/tun.cpp --replace "/sbin/" "${net-tools}/bin/"
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;

2
pkgs/by-name/he/heroic/package.nix
View File

@ -28,7 +28,7 @@ buildFHSEnv {
zenity zenity
kdePackages.kdialog kdePackages.kdialog
mangohud mangohud
nettools net-tools
opencl-headers opencl-headers
p7zip p7zip
pciutils pciutils

2
pkgs/by-name/ho/houdini/package.nix
View File

@ -38,7 +38,7 @@ buildFHSEnv {
tbb tbb
xwayland xwayland
qt5.qtwayland qt5.qtwayland
nettools # needed by licensing tools net-tools # needed by licensing tools
bintools # needed for ld and other tools, so ctypes can find/load sos from python bintools # needed for ld and other tools, so ctypes can find/load sos from python
ocl-icd # needed for opencl ocl-icd # needed for opencl
numactl # needed by hfs ocl backend numactl # needed by hfs ocl backend

4
pkgs/by-name/hp/hplip/package.nix
View File

@ -20,7 +20,7 @@
net-snmp, net-snmp,
openssl, openssl,
perl, perl,
nettools, net-tools,
avahi, avahi,
bash, bash,
util-linux, util-linux,
@ -141,7 +141,7 @@ python3Packages.buildPythonApplication {
"--prefix" "--prefix"
"PATH" "PATH"
":" ":"
"${nettools}/bin" "${net-tools}/bin"
]; ];
patches = [ patches = [

4
pkgs/by-name/io/iodine/package.nix
View File

@ -3,7 +3,7 @@
stdenv, stdenv,
fetchFromGitHub, fetchFromGitHub,
zlib, zlib,
nettools, net-tools,
nixosTests, nixosTests,
}: }:
@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [ zlib ]; buildInputs = [ zlib ];
env.NIX_CFLAGS_COMPILE = ''-DIFCONFIGPATH="${nettools}/bin/" -DROUTEPATH="${nettools}/bin/"''; env.NIX_CFLAGS_COMPILE = ''-DIFCONFIGPATH="${net-tools}/bin/" -DROUTEPATH="${net-tools}/bin/"'';
installFlags = [ "prefix=\${out}" ]; installFlags = [ "prefix=\${out}" ];

4
pkgs/by-name/is/isabelle/package.nix
View File

@ -4,7 +4,7 @@
fetchurl, fetchurl,
fetchFromGitHub, fetchFromGitHub,
coreutils, coreutils,
nettools, net-tools,
java, java,
scala_3, scala_3,
polyml, polyml,
@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: {
veriT veriT
vampire' vampire'
eprover-ho eprover-ho
nettools net-tools
]; ];
propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ procps ]; propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ procps ];

4
pkgs/by-name/ju/jumpapp/package.nix
View File

@ -7,7 +7,7 @@
xdotool, xdotool,
wmctrl, wmctrl,
xprop, xprop,
nettools, net-tools,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
xdotool xdotool
wmctrl wmctrl
xprop xprop
nettools net-tools
perl perl
]; ];
postFixup = postFixup =

2
pkgs/by-name/li/libbladeRF/package.nix
View File

@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
# Fixup shebang # Fixup shebang
prePatch = "patchShebangs host/utilities/bladeRF-cli/src/cmd/doc/generate.bash"; prePatch = "patchShebangs host/utilities/bladeRF-cli/src/cmd/doc/generate.bash";
# Let us avoid nettools as a dependency. # Let us avoid net-tools as a dependency.
postPatch = '' postPatch = ''
sed -i 's/$(hostname)/hostname/' host/utilities/bladeRF-cli/src/cmd/doc/generate.bash sed -i 's/$(hostname)/hostname/' host/utilities/bladeRF-cli/src/cmd/doc/generate.bash
''; '';

4
pkgs/by-name/ma/mackerel-agent/package.nix
View File

@ -5,7 +5,7 @@
fetchFromGitHub, fetchFromGitHub,
makeWrapper, makeWrapper,
iproute2, iproute2,
nettools, net-tools,
}: }:
buildGoModule rec { buildGoModule rec {
@ -20,7 +20,7 @@ buildGoModule rec {
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
nativeCheckInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ nettools ]; nativeCheckInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ net-tools ];
buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ iproute2 ]; buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ iproute2 ];
vendorHash = "sha256-Q3HsfLA6xqzwXVfRc0bOb15kW2tdwj14DvJEZoRy0/4="; vendorHash = "sha256-Q3HsfLA6xqzwXVfRc0bOb15kW2tdwj14DvJEZoRy0/4=";

4
pkgs/by-name/ma/mattermost/tests.nix
View File

@ -8,7 +8,7 @@
mariadb, mariadb,
redis, redis,
curl, curl,
nettools, net-tools,
runtimeShell, runtimeShell,
}: }:
@ -30,7 +30,7 @@ mattermost.overrideAttrs (
mariadb mariadb
redis redis
curl curl
nettools net-tools
gotestsum gotestsum
]; ];

4
pkgs/by-name/mi/mininet/package.nix
View File

@ -11,7 +11,7 @@
inetutils, inetutils,
iperf, iperf,
iproute2, iproute2,
nettools, net-tools,
socat, socat,
}: }:
@ -34,7 +34,7 @@ let
socat socat
# mn errors out without a telnet binary # mn errors out without a telnet binary
# pkgs.inetutils brings an undesired ifconfig into PATH see #43105 # pkgs.inetutils brings an undesired ifconfig into PATH see #43105
nettools net-tools
telnet telnet
]; ];

6
pkgs/by-name/mi/miredo/package.nix
View File

@ -2,7 +2,7 @@
lib, lib,
stdenv, stdenv,
fetchurl, fetchurl,
nettools, net-tools,
iproute2, iproute2,
judy, judy,
}: }:
@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
postPatch = '' postPatch = ''
substituteInPlace misc/client-hook.bsd \ substituteInPlace misc/client-hook.bsd \
--replace '/sbin/route' '${nettools}/bin/route' \ --replace '/sbin/route' '${net-tools}/bin/route' \
--replace '/sbin/ifconfig' '${nettools}/bin/ifconfig' --replace '/sbin/ifconfig' '${net-tools}/bin/ifconfig'
substituteInPlace misc/client-hook.iproute --replace '/sbin/ip' '${iproute2}/bin/ip' substituteInPlace misc/client-hook.iproute --replace '/sbin/ip' '${iproute2}/bin/ip'
''; '';

4
pkgs/by-name/mu/munin/package.nix
View File

@ -10,7 +10,7 @@
python3, python3,
ruby, ruby,
jre8, jre8,
nettools, net-tools,
bc, bc,
nixosTests, nixosTests,
}: }:
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
which which
coreutils coreutils
rrdtool rrdtool
nettools net-tools
perlPackages.perl perlPackages.perl
perlPackages.ModuleBuild perlPackages.ModuleBuild
perlPackages.HTMLTemplate perlPackages.HTMLTemplate

6
pkgs/by-name/ne/net-snmp/package.nix
View File

@ -6,7 +6,7 @@
file, file,
openssl, openssl,
perl, perl,
nettools, net-tools,
autoreconfHook, autoreconfHook,
withPerlTools ? false, withPerlTools ? false,
}: }:
@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
] ++ lib.optional stdenv.hostPlatform.isLinux "--with-mnttab=/proc/mounts"; ] ++ lib.optional stdenv.hostPlatform.isLinux "--with-mnttab=/proc/mounts";
postPatch = '' postPatch = ''
substituteInPlace testing/fulltests/support/simple_TESTCONF.sh --replace "/bin/netstat" "${nettools}/bin/netstat" substituteInPlace testing/fulltests/support/simple_TESTCONF.sh --replace "/bin/netstat" "${net-tools}/bin/netstat"
''; '';
postConfigure = '' postConfigure = ''
@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
''; '';
nativeBuildInputs = [ nativeBuildInputs = [
nettools net-tools
file file
autoreconfHook autoreconfHook
]; ];

4
pkgs/by-name/op/opentsdb/package.nix
View File

@ -10,7 +10,7 @@
git, git,
jdk8, jdk8,
makeWrapper, makeWrapper,
nettools, net-tools,
python3, python3,
}: }:
@ -324,7 +324,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
curl curl
jdk jdk
nettools net-tools
python3 python3
git git
]; ];

2
pkgs/by-name/ot/otpw/package.nix
View File

@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
--replace "ls -lu /etc/. /tmp/. / /usr/. /bin/. /usr/bin/." "${coreutils}/bin/ls -lu /etc/. /tmp/. / /usr/. /bin/. /usr/bin/." \ --replace "ls -lu /etc/. /tmp/. / /usr/. /bin/. /usr/bin/." "${coreutils}/bin/ls -lu /etc/. /tmp/. / /usr/. /bin/. /usr/bin/." \
--replace "PATH=/usr/ucb:/bin:/usr/bin;ps lax" "PATH=/usr/ucb:/bin:/usr/bin;${unixtools.procps}/bin/ps lax" \ --replace "PATH=/usr/ucb:/bin:/usr/bin;ps lax" "PATH=/usr/ucb:/bin:/usr/bin;${unixtools.procps}/bin/ps lax" \
--replace "last | head -50" "${util-linux}/bin/last | ${coreutils}/bin/head -50" \ --replace "last | head -50" "${util-linux}/bin/last | ${coreutils}/bin/head -50" \
--replace "uptime;netstat -n;hostname;date;w" "${coreutils}/bin/uptime; ${unixtools.nettools}/bin/netstat -n; ${unixtools.nettools}/bin/hostname; ${coreutils}/bin/date; ${procps}/bin/w" --replace "uptime;netstat -n;hostname;date;w" "${coreutils}/bin/uptime; ${unixtools.net-tools}/bin/netstat -n; ${unixtools.net-tools}/bin/hostname; ${coreutils}/bin/date; ${procps}/bin/w"
''; '';
buildInputs = [ buildInputs = [

4
pkgs/by-name/pi/pihole/package.nix
View File

@ -19,7 +19,7 @@
locale, locale,
ncurses, ncurses,
netcat, netcat,
nettools, net-tools,
pihole-ftl, pihole-ftl,
procps, procps,
resholve, resholve,
@ -119,7 +119,7 @@
locale locale
ncurses ncurses
netcat netcat
nettools net-tools
pihole-ftl pihole-ftl
procps procps
sqlite sqlite

4
pkgs/by-name/rc/rcu/package.nix
View File

@ -11,7 +11,7 @@
gnutar, gnutar,
libsForQt5, libsForQt5,
makeDesktopItem, makeDesktopItem,
nettools, net-tools,
protobuf, protobuf,
python312Packages, python312Packages,
system-config-printer, system-config-printer,
@ -156,7 +156,7 @@ python3Packages.buildPythonApplication rec {
+ lib.optionalString stdenv.hostPlatform.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux ''
--prefix PATH : ${ --prefix PATH : ${
lib.makeBinPath [ lib.makeBinPath [
nettools net-tools
system-config-printer system-config-printer
] ]
} }

4
pkgs/by-name/si/signing-party/package.nix
View File

@ -13,7 +13,7 @@
which, which,
getopt, getopt,
libpaper, libpaper,
nettools, net-tools,
qprint, qprint,
sendmailPath ? "/run/wrappers/bin/sendmail", sendmailPath ? "/run/wrappers/bin/sendmail",
}: }:
@ -178,7 +178,7 @@ stdenv.mkDerivation rec {
--prefix PATH ":" \ --prefix PATH ":" \
"${ "${
lib.makeBinPath [ lib.makeBinPath [
nettools net-tools
gnupg gnupg
] ]
}" }"

4
pkgs/by-name/so/socat/package.nix
View File

@ -1,7 +1,7 @@
{ {
lib, lib,
fetchurl, fetchurl,
nettools, net-tools,
openssl, openssl,
readline, readline,
stdenv, stdenv,
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
nativeCheckInputs = [ nativeCheckInputs = [
which which
nettools net-tools
]; ];
doCheck = false; # fails a bunch, hangs doCheck = false; # fails a bunch, hangs

4
pkgs/by-name/ss/sshuttle/package.nix
View File

@ -8,7 +8,7 @@
sphinx, sphinx,
coreutils, coreutils,
iptables, iptables,
nettools, net-tools,
openssh, openssh,
procps, procps,
}: }:
@ -55,7 +55,7 @@ python3Packages.buildPythonApplication rec {
] ]
++ lib.optionals stdenv.hostPlatform.isLinux [ ++ lib.optionals stdenv.hostPlatform.isLinux [
iptables iptables
nettools net-tools
] ]
) )
}" \ }" \

4
pkgs/by-name/te/testssl/package.nix
View File

@ -6,7 +6,7 @@
dnsutils, dnsutils,
coreutils, coreutils,
openssl, openssl,
nettools, net-tools,
util-linux, util-linux,
procps, procps,
}: }:
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
coreutils # for printf coreutils # for printf
dnsutils # for dig dnsutils # for dig
nettools # for hostname net-tools # for hostname
openssl # for openssl openssl # for openssl
procps # for ps procps # for ps
util-linux # for hexdump util-linux # for hexdump

4
pkgs/by-name/un/unhide/package.nix
View File

@ -6,7 +6,7 @@
cmake, cmake,
iproute2, iproute2,
lsof, lsof,
nettools, net-tools,
pkg-config, pkg-config,
procps, procps,
psmisc, psmisc,
@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [ buildInputs = [
iproute2 iproute2
lsof lsof
nettools net-tools
procps procps
psmisc psmisc
]; ];

4
pkgs/by-name/un/unix-privesc-check/package.nix
View File

@ -11,7 +11,7 @@
glibc, glibc,
gnugrep, gnugrep,
gnused, gnused,
nettools, net-tools,
openssh, openssh,
postgresql, postgresql,
ps, ps,
@ -48,7 +48,7 @@ resholve.mkDerivation rec {
glibc # for ldd command glibc # for ldd command
gnugrep gnugrep
gnused gnused
nettools net-tools
openssh openssh
postgresql # for psql command postgresql # for psql command
ps ps

2
pkgs/by-name/un/unixbench/package.nix
View File

@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
runtimeDependencies = runtimeDependencies =
[ [
coreutils coreutils
unixtools.nettools unixtools.net-tools
unixtools.locale unixtools.locale
targetPackages.stdenv.cc targetPackages.stdenv.cc
gnugrep gnugrep

4
pkgs/by-name/vp/vpnc-scripts/package.nix
View File

@ -7,7 +7,7 @@
gnugrep, gnugrep,
iproute2, iproute2,
makeWrapper, makeWrapper,
nettools, net-tools,
openresolv, openresolv,
systemd, systemd,
withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
@ -48,7 +48,7 @@ stdenv.mkDerivation {
--prefix PATH : "${ --prefix PATH : "${
lib.makeBinPath ( lib.makeBinPath (
[ [
nettools net-tools
gawk gawk
coreutils coreutils
gnugrep gnugrep

4
pkgs/by-name/x2/x2goserver/package.nix
View File

@ -15,7 +15,7 @@
gnugrep, gnugrep,
findutils, findutils,
xorg, xorg,
nettools, net-tools,
iproute2, iproute2,
bc, bc,
procps, procps,
@ -77,7 +77,7 @@ let
gnused gnused
gnugrep gnugrep
findutils findutils
nettools net-tools
iproute2 iproute2
bc bc
procps procps

6
pkgs/by-name/xd/xdg-utils/package.nix
View File

@ -22,7 +22,7 @@
gnugrep, gnugrep,
gnused, gnused,
jq, jq,
nettools, net-tools,
procps, procps,
which, which,
xdg-user-dirs, xdg-user-dirs,
@ -166,7 +166,7 @@ let
scripts = [ "bin/xdg-open" ]; scripts = [ "bin/xdg-open" ];
interpreter = "${bash}/bin/bash"; interpreter = "${bash}/bin/bash";
inputs = commonDeps ++ [ inputs = commonDeps ++ [
nettools net-tools
glib.bin glib.bin
"${placeholder "out"}/bin" "${placeholder "out"}/bin"
]; ];
@ -206,7 +206,7 @@ let
scripts = [ "bin/xdg-screensaver" ]; scripts = [ "bin/xdg-screensaver" ];
interpreter = "${bash}/bin/bash"; interpreter = "${bash}/bin/bash";
inputs = commonDeps ++ [ inputs = commonDeps ++ [
nettools net-tools
perl perl
procps procps
]; ];

6
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

@ -420964,7 +420964,7 @@ self: {
lens-family, lens-family,
megaparsec, megaparsec,
mtl, mtl,
nettools, net-tools,
optparse-applicative, optparse-applicative,
parallel, parallel,
parser-combinators, parser-combinators,
@ -421056,7 +421056,7 @@ self: {
]; ];
testSystemDepends = [ testSystemDepends = [
git git
nettools net-tools
z3 z3
]; ];
doCheck = false; doCheck = false;
@ -421069,7 +421069,7 @@ self: {
) )
{ {
inherit (pkgs) git; inherit (pkgs) git;
inherit (pkgs) nettools; inherit (pkgs) net-tools;
inherit (pkgs) z3; inherit (pkgs) z3;
}; };

4
pkgs/development/libraries/gnutls/default.nix
View File

@ -21,7 +21,7 @@
tpmSupport ? false, tpmSupport ? false,
trousers, trousers,
which, which,
nettools, net-tools,
libunistring, libunistring,
withP11-kit ? !stdenv.hostPlatform.isStatic, withP11-kit ? !stdenv.hostPlatform.isStatic,
p11-kit, p11-kit,
@ -163,7 +163,7 @@ stdenv.mkDerivation rec {
] ]
++ lib.optionals doCheck [ ++ lib.optionals doCheck [
which which
nettools net-tools
util-linux util-linux
]; ];

4
pkgs/development/python-modules/django-cacheops/default.nix
View File

@ -14,7 +14,7 @@
jinja2, jinja2,
before-after, before-after,
pythonOlder, pythonOlder,
nettools, net-tools,
pkgs, pkgs,
setuptools, setuptools,
}: }:
@ -52,7 +52,7 @@ buildPythonPackage rec {
dill dill
jinja2 jinja2
before-after before-after
nettools net-tools
pkgs.valkey pkgs.valkey
redisTestHook redisTestHook
]; ];

6
pkgs/development/python-modules/ethtool/default.nix
View File

@ -6,7 +6,7 @@
setuptools, setuptools,
pkg-config, pkg-config,
libnl, libnl,
nettools, net-tools,
pytestCheckHook, pytestCheckHook,
}: }:
@ -32,7 +32,7 @@ buildPythonPackage rec {
postPatch = '' postPatch = ''
substituteInPlace tests/parse_ifconfig.py \ substituteInPlace tests/parse_ifconfig.py \
--replace-fail "Popen('ifconfig'," "Popen('${lib.getExe' nettools "ifconfig"}'," --replace-fail "Popen('ifconfig'," "Popen('${lib.getExe' net-tools "ifconfig"}',"
''; '';
build-system = [ setuptools ]; build-system = [ setuptools ];
@ -44,7 +44,7 @@ buildPythonPackage rec {
pythonImportsCheck = [ "ethtool" ]; pythonImportsCheck = [ "ethtool" ];
nativeCheckInputs = [ nativeCheckInputs = [
nettools net-tools
pytestCheckHook pytestCheckHook
]; ];

4
pkgs/development/python-modules/jaraco-net/default.nix
View File

@ -28,7 +28,7 @@
importlib-resources, importlib-resources,
pyparsing, pyparsing,
pytest-responses, pytest-responses,
nettools, net-tools,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -76,7 +76,7 @@ buildPythonPackage rec {
importlib-resources importlib-resources
pyparsing pyparsing
pytest-responses pytest-responses
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ nettools ]; ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ net-tools ];
disabledTestPaths = [ disabledTestPaths = [
# require networking # require networking

4
pkgs/development/python-modules/magic-wormhole/default.nix
View File

@ -29,7 +29,7 @@
noiseprotocol, noiseprotocol,
# tests # tests
nettools, net-tools,
unixtools, unixtools,
magic-wormhole-transit-relay, magic-wormhole-transit-relay,
magic-wormhole-mailbox-server, magic-wormhole-mailbox-server,
@ -60,7 +60,7 @@ buildPythonPackage rec {
'' ''
# fix the location of the ifconfig binary # fix the location of the ifconfig binary
+ lib.optionalString stdenv.hostPlatform.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux ''
sed -i -e "s|'ifconfig'|'${nettools}/bin/ifconfig'|" src/wormhole/ipaddrs.py sed -i -e "s|'ifconfig'|'${net-tools}/bin/ifconfig'|" src/wormhole/ipaddrs.py
''; '';
build-system = [ build-system = [

4
pkgs/development/python-modules/pytap2/default.nix
View File

@ -1,7 +1,7 @@
{ {
lib, lib,
buildPythonPackage, buildPythonPackage,
nettools, net-tools,
fetchFromGitHub, fetchFromGitHub,
pytestCheckHook, pytestCheckHook,
pythonOlder, pythonOlder,
@ -21,7 +21,7 @@ buildPythonPackage rec {
hash = "sha256-GN8yFnS7HVgIP73/nVtYnwwhCBI9doGHLGSOaFiWIdw="; hash = "sha256-GN8yFnS7HVgIP73/nVtYnwwhCBI9doGHLGSOaFiWIdw=";
}; };
propagatedBuildInputs = [ nettools ]; propagatedBuildInputs = [ net-tools ];
nativeCheckInputs = [ pytestCheckHook ]; nativeCheckInputs = [ pytestCheckHook ];

4
pkgs/os-specific/linux/kernel/manual-config.nix
View File

@ -3,7 +3,7 @@
stdenv, stdenv,
buildPackages, buildPackages,
runCommand, runCommand,
nettools, net-tools,
bc, bc,
bison, bison,
flex, flex,
@ -214,7 +214,7 @@ lib.makeOverridable (
flex flex
perl perl
bc bc
nettools net-tools
openssl openssl
rsync rsync
gmp gmp

4
pkgs/servers/web-apps/discourse/default.nix
View File

@ -17,7 +17,7 @@
cacert, cacert,
util-linux, util-linux,
gawk, gawk,
nettools, net-tools,
imagemagick, imagemagick,
optipng, optipng,
pngquant, pngquant,
@ -72,7 +72,7 @@ let
procps # For ps and kill procps # For ps and kill
util-linux # For renice util-linux # For renice
gawk gawk
nettools # For hostname net-tools # For hostname
# Image optimization # Image optimization
imagemagick imagemagick

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

@ -16,7 +16,7 @@
guile_2_2, guile_2_2,
libmysqlclient, libmysqlclient,
mailcap, mailcap,
nettools, net-tools,
pam, pam,
readline, readline,
ncurses, ncurses,
@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
sasl sasl
libxcrypt libxcrypt
] ]
++ lib.optionals stdenv.hostPlatform.isLinux [ nettools ] ++ lib.optionals stdenv.hostPlatform.isLinux [ net-tools ]
++ lib.optionals pythonSupport [ python3 ] ++ lib.optionals pythonSupport [ python3 ]
++ lib.optionals guileSupport [ guile_2_2 ]; ++ lib.optionals guileSupport [ guile_2_2 ];

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

@ -1323,6 +1323,7 @@ mapAliases {
netbox_3_3 = throw "netbox 3.3 series has been removed as it was EOL"; # Added 2023-09-02 netbox_3_3 = throw "netbox 3.3 series has been removed as it was EOL"; # Added 2023-09-02
netbox_3_5 = throw "netbox 3.5 series has been removed as it was EOL"; # Added 2024-01-22 netbox_3_5 = throw "netbox 3.5 series has been removed as it was EOL"; # Added 2024-01-22
netbox_3_7 = throw "netbox 3.7 series has been removed as it was EOL"; # Added 2025-04-23 netbox_3_7 = throw "netbox 3.7 series has been removed as it was EOL"; # Added 2025-04-23
nettools = net-tools; # Added 2025-06-11
nextcloud29 = throw '' nextcloud29 = throw ''
Nextcloud v29 has been removed from `nixpkgs` as the support for is dropped Nextcloud v29 has been removed from `nixpkgs` as the support for is dropped
by upstream in 2025-04. Please upgrade to at least Nextcloud v30 by declaring by upstream in 2025-04. Please upgrade to at least Nextcloud v30 by declaring

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

@ -11263,11 +11263,11 @@ with pkgs;
} }
); );
nettools = net-tools =
if stdenv.hostPlatform.isLinux then if stdenv.hostPlatform.isLinux then
callPackage ../os-specific/linux/net-tools { } callPackage ../os-specific/linux/net-tools { }
else else
unixtools.nettools; unixtools.net-tools;
nftables = callPackage ../os-specific/linux/nftables { }; nftables = callPackage ../os-specific/linux/nftables { };

12
pkgs/top-level/unixtools.nix
View File

@ -79,7 +79,7 @@ let
bins = mapAttrs singleBinary { bins = mapAttrs singleBinary {
# singular binaries # singular binaries
arp = { arp = {
linux = pkgs.nettools; linux = pkgs.net-tools;
darwin = pkgs.darwin.network_cmds; darwin = pkgs.darwin.network_cmds;
freebsd = pkgs.freebsd.arp; freebsd = pkgs.freebsd.arp;
}; };
@ -126,13 +126,13 @@ let
darwin = pkgs.darwin.shell_cmds; darwin = pkgs.darwin.shell_cmds;
}; };
hostname = { hostname = {
linux = pkgs.nettools; linux = pkgs.net-tools;
darwin = pkgs.darwin.shell_cmds; darwin = pkgs.darwin.shell_cmds;
freebsd = pkgs.freebsd.bin; freebsd = pkgs.freebsd.bin;
openbsd = pkgs.openbsd.hostname; openbsd = pkgs.openbsd.hostname;
}; };
ifconfig = { ifconfig = {
linux = pkgs.nettools; linux = pkgs.net-tools;
darwin = pkgs.darwin.network_cmds; darwin = pkgs.darwin.network_cmds;
freebsd = pkgs.freebsd.ifconfig; freebsd = pkgs.freebsd.ifconfig;
openbsd = pkgs.openbsd.ifconfig; openbsd = pkgs.openbsd.ifconfig;
@ -172,7 +172,7 @@ let
''; '';
}; };
netstat = { netstat = {
linux = pkgs.nettools; linux = pkgs.net-tools;
darwin = pkgs.darwin.network_cmds; darwin = pkgs.darwin.network_cmds;
freebsd = pkgs.freebsd.netstat; freebsd = pkgs.freebsd.netstat;
}; };
@ -198,7 +198,7 @@ let
darwin = pkgs.darwin.diskdev_cmds; darwin = pkgs.darwin.diskdev_cmds;
}; };
route = { route = {
linux = pkgs.nettools; linux = pkgs.net-tools;
darwin = pkgs.darwin.network_cmds; darwin = pkgs.darwin.network_cmds;
freebsd = pkgs.freebsd.route; freebsd = pkgs.freebsd.route;
openbsd = pkgs.openbsd.route; openbsd = pkgs.openbsd.route;
@ -288,7 +288,7 @@ let
col col
column column
]; ];
nettools = [ net-tools = [
arp arp
hostname hostname
ifconfig ifconfig