net-tools: rename from nettools

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.

nixos/modules/services/cluster/spark/default.nix

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

nixos/modules/services/continuous-integration/hydra/default.nix

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

nixos/modules/services/databases/mysql.nix

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

nixos/modules/services/desktops/profile-sync-daemon.nix

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

nixos/modules/services/misc/zoneminder.nix

@@ -45,7 +45,7 @@ let
   defaultsFile = pkgs.writeText "60-defaults.conf" ''
     # 01-system-paths.conf
     ${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_MAP=/dev/shm
     ZM_PATH_SOCKS=/run/${dirName}

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

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

nixos/modules/services/monitoring/zabbix-proxy.nix

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

nixos/modules/services/monitoring/zabbix-server.nix

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

nixos/modules/services/networking/libreswan.nix

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

nixos/modules/services/networking/openvpn.nix

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

nixos/modules/services/networking/tetrd.nix

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

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

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

nixos/modules/services/x11/terminal-server.nix

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

nixos/modules/system/activation/activation-script.nix

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

nixos/modules/tasks/filesystems/zfs.nix

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

nixos/modules/tasks/network-interfaces.nix

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

nixos/modules/virtualisation/digital-ocean-config.nix

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

nixos/modules/virtualisation/ec2-data.nix

@@ -34,7 +34,7 @@ with lib;
         ${optionalString (config.networking.hostName == "") ''
           echo "setting host name..."
           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
         ''}
 

nixos/modules/virtualisation/vagrant-guest.nix

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

nixos/modules/virtualisation/waagent.nix

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

pkgs/applications/networking/firehol/default.nix

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

pkgs/applications/virtualization/virtualbox/default.nix

@@ -35,7 +35,7 @@
   alsa-lib,
   curl,
   libvpx,
-  nettools,
+  net-tools,
   dbus,
   replaceVars,
   gsoap,
@@ -263,7 +263,7 @@ stdenv.mkDerivation (finalAttrs: {
     ];
 
   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
   '';
 

pkgs/applications/window-managers/awesome/default.nix

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

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

@@ -6,7 +6,7 @@
   darwin,
   fetchFromGitHub,
   coreutils,
-  nettools,
+  net-tools,
   util-linux,
   stdenv,
   dmidecode,
@@ -92,7 +92,7 @@ buildGoModule rec {
 
       substituteInPlace agent/platform/platform_unix.go \
         --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"'
 
       substituteInPlace agent/session/shell/shell_unix.go \

pkgs/by-name/cv/cvsq/package.nix

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

pkgs/by-name/fa/facter/package.nix

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

pkgs/by-name/fr/frr/package.nix

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

pkgs/by-name/fu/fusionInventory/package.nix

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

pkgs/by-name/gi/gitlab/package.nix

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

pkgs/by-name/gi/gitolite/package.nix

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

pkgs/by-name/gl/glpi-agent/package.nix

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

pkgs/by-name/gv/gvpe/package.nix

@@ -6,7 +6,7 @@
   gmp,
   zlib,
   iproute2,
-  nettools,
+  net-tools,
   pkg-config,
 }:
 
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   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@${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; {

pkgs/by-name/ha/hans/package.nix

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

pkgs/by-name/he/heroic/package.nix

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

pkgs/by-name/ho/houdini/package.nix

@@ -38,7 +38,7 @@ buildFHSEnv {
       tbb
       xwayland
       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
       ocl-icd # needed for opencl
       numactl # needed by hfs ocl backend

pkgs/by-name/hp/hplip/package.nix

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

pkgs/by-name/io/iodine/package.nix

@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   zlib,
-  nettools,
+  net-tools,
   nixosTests,
 }:
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   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}" ];
 

pkgs/by-name/is/isabelle/package.nix

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

pkgs/by-name/ju/jumpapp/package.nix

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

pkgs/by-name/li/libbladeRF/package.nix

@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
   # Fixup shebang
   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 = ''
     sed -i 's/$(hostname)/hostname/' host/utilities/bladeRF-cli/src/cmd/doc/generate.bash
   '';

pkgs/by-name/ma/mackerel-agent/package.nix

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

pkgs/by-name/ma/mattermost/tests.nix

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

pkgs/by-name/mi/mininet/package.nix

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

pkgs/by-name/mi/miredo/package.nix

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

pkgs/by-name/mu/munin/package.nix

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

pkgs/by-name/ne/net-snmp/package.nix

@@ -6,7 +6,7 @@
   file,
   openssl,
   perl,
-  nettools,
+  net-tools,
   autoreconfHook,
   withPerlTools ? false,
 }:
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
   ] ++ lib.optional stdenv.hostPlatform.isLinux "--with-mnttab=/proc/mounts";
 
   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 = ''
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [
-    nettools
+    net-tools
     file
     autoreconfHook
   ];

pkgs/by-name/op/opentsdb/package.nix

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

pkgs/by-name/ot/otpw/package.nix

@@ -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 "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 "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 = [

pkgs/by-name/pi/pihole/package.nix

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

pkgs/by-name/rc/rcu/package.nix

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

pkgs/by-name/si/signing-party/package.nix

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

pkgs/by-name/so/socat/package.nix

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

pkgs/by-name/ss/sshuttle/package.nix

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

pkgs/by-name/te/testssl/package.nix

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

pkgs/by-name/un/unhide/package.nix

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

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

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

pkgs/by-name/un/unixbench/package.nix

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

pkgs/by-name/vp/vpnc-scripts/package.nix

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

pkgs/by-name/x2/x2goserver/package.nix

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

pkgs/by-name/xd/xdg-utils/package.nix

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

pkgs/development/haskell-modules/hackage-packages.nix

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

pkgs/development/libraries/gnutls/default.nix

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

pkgs/development/python-modules/django-cacheops/default.nix

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

pkgs/development/python-modules/ethtool/default.nix

@@ -6,7 +6,7 @@
   setuptools,
   pkg-config,
   libnl,
-  nettools,
+  net-tools,
   pytestCheckHook,
 }:
 
@@ -32,7 +32,7 @@ buildPythonPackage rec {
 
   postPatch = ''
     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 ];
@@ -44,7 +44,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "ethtool" ];
 
   nativeCheckInputs = [
-    nettools
+    net-tools
     pytestCheckHook
   ];
 

pkgs/development/python-modules/jaraco-net/default.nix

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

pkgs/development/python-modules/magic-wormhole/default.nix

@@ -29,7 +29,7 @@
   noiseprotocol,
 
   # tests
-  nettools,
+  net-tools,
   unixtools,
   magic-wormhole-transit-relay,
   magic-wormhole-mailbox-server,
@@ -60,7 +60,7 @@ buildPythonPackage rec {
     ''
     # fix the location of the ifconfig binary
     + 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 = [

pkgs/development/python-modules/pytap2/default.nix

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

pkgs/os-specific/linux/kernel/manual-config.nix

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

pkgs/servers/web-apps/discourse/default.nix

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

pkgs/tools/networking/mailutils/default.nix

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

pkgs/top-level/aliases.nix

@@ -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_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
+  nettools = net-tools; # Added 2025-06-11
   nextcloud29 = throw ''
     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

pkgs/top-level/all-packages.nix

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

pkgs/top-level/unixtools.nix

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