diff --git a/nixos/modules/services/cluster/spark/default.nix b/nixos/modules/services/cluster/spark/default.nix index ffec1512d42b..90538deafd77 100644 --- a/nixos/modules/services/cluster/spark/default.nix +++ b/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."; diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index df586356306a..db83c9fe06fd 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/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 ]; diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index 59c868d6628e..2dd40033903d 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/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 [ diff --git a/nixos/modules/services/desktops/profile-sync-daemon.nix b/nixos/modules/services/desktops/profile-sync-daemon.nix index 17ac1df9baae..4dccffc6debe 100644 --- a/nixos/modules/services/desktops/profile-sync-daemon.nix +++ b/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 ]; diff --git a/nixos/modules/services/misc/zoneminder.nix b/nixos/modules/services/misc/zoneminder.nix index c6299d654e28..fc886a859da1 100644 --- a/nixos/modules/services/misc/zoneminder.nix +++ b/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} diff --git a/nixos/modules/services/monitoring/zabbix-agent.nix b/nixos/modules/services/monitoring/zabbix-agent.nix index 8a8afcb501c8..c93d0d8c37bb 100644 --- a/nixos/modules/services/monitoring/zabbix-agent.nix +++ b/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. diff --git a/nixos/modules/services/monitoring/zabbix-proxy.nix b/nixos/modules/services/monitoring/zabbix-proxy.nix index 2336446d6f47..db9d9376aa4d 100644 --- a/nixos/modules/services/monitoring/zabbix-proxy.nix +++ b/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. diff --git a/nixos/modules/services/monitoring/zabbix-server.nix b/nixos/modules/services/monitoring/zabbix-server.nix index 3fd18ce2d6d1..7a65ac96a994 100644 --- a/nixos/modules/services/monitoring/zabbix-server.nix +++ b/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. diff --git a/nixos/modules/services/networking/libreswan.nix b/nixos/modules/services/networking/libreswan.nix index 916b6f8293d0..57cbb9a8a6c6 100644 --- a/nixos/modules/services/networking/libreswan.nix +++ b/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 diff --git a/nixos/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix index bdedfd9900d5..0bd9d2a2f474 100644 --- a/nixos/modules/services/networking/openvpn.nix +++ b/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}"; diff --git a/nixos/modules/services/networking/tetrd.nix b/nixos/modules/services/networking/tetrd.nix index a182cc347306..939c1227886f 100644 --- a/nixos/modules/services/networking/tetrd.nix +++ b/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 = [ diff --git a/nixos/modules/services/system/cloud-init.nix b/nixos/modules/services/system/cloud-init.nix index 372fa8aac804..d99a3af8fb07 100644 --- a/nixos/modules/services/system/cloud-init.nix +++ b/nixos/modules/services/system/cloud-init.nix @@ -11,7 +11,7 @@ let [ cloud-init iproute2 - nettools + net-tools openssh shadow util-linux diff --git a/nixos/modules/services/x11/terminal-server.nix b/nixos/modules/services/x11/terminal-server.nix index c8fa744d8869..c178e7403ec7 100644 --- a/nixos/modules/services/x11/terminal-server.nix +++ b/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 diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix index d398c6069e71..30320f120f0e 100644 --- a/nixos/modules/system/activation/activation-script.nix +++ b/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 ]; diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index f8e36eb1646c..2c589a36bcd8 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/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 ]; }; diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index fb8dab1c33ff..d557e1458bbc 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/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? diff --git a/nixos/modules/virtualisation/digital-ocean-config.nix b/nixos/modules/virtualisation/digital-ocean-config.nix index a38d2d15ab84..b46cf0f82131 100644 --- a/nixos/modules/virtualisation/digital-ocean-config.nix +++ b/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" ]; diff --git a/nixos/modules/virtualisation/ec2-data.nix b/nixos/modules/virtualisation/ec2-data.nix index 84508da0c5a0..da1bb3cfe26c 100644 --- a/nixos/modules/virtualisation/ec2-data.nix +++ b/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 ''} diff --git a/nixos/modules/virtualisation/vagrant-guest.nix b/nixos/modules/virtualisation/vagrant-guest.nix index d4686a678181..a4768c610672 100644 --- a/nixos/modules/virtualisation/vagrant-guest.nix +++ b/nixos/modules/virtualisation/vagrant-guest.nix @@ -23,7 +23,7 @@ in environment.systemPackages = with pkgs; [ findutils iputils - nettools + net-tools netcat nfs-utils rsync diff --git a/nixos/modules/virtualisation/waagent.nix b/nixos/modules/virtualisation/waagent.nix index dc80456ebb91..56daa3f46ec7 100644 --- a/nixos/modules/virtualisation/waagent.nix +++ b/nixos/modules/virtualisation/waagent.nix @@ -351,7 +351,7 @@ in parted # for hostname - nettools + net-tools # for pidof procps # for useradd, usermod diff --git a/pkgs/applications/networking/firehol/default.nix b/pkgs/applications/networking/firehol/default.nix index bc358bc4d036..18ebf9e1618d 100644 --- a/pkgs/applications/networking/firehol/default.nix +++ b/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 diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index b36afd4bdc7f..1dc5effb7044 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/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 ''; diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 2e60bcf41e68..c2ac127b6841 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/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 diff --git a/pkgs/by-name/am/amazon-ssm-agent/package.nix b/pkgs/by-name/am/amazon-ssm-agent/package.nix index 6bf362ef3e1f..8266e3596036 100644 --- a/pkgs/by-name/am/amazon-ssm-agent/package.nix +++ b/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 \ diff --git a/pkgs/by-name/cv/cvsq/package.nix b/pkgs/by-name/cv/cvsq/package.nix index 13f7ee5547d4..f0e0334d6a35 100644 --- a/pkgs/by-name/cv/cvsq/package.nix +++ b/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 diff --git a/pkgs/by-name/fa/facter/package.nix b/pkgs/by-name/fa/facter/package.nix index 864efc67eac1..095730aaf27e 100644 --- a/pkgs/by-name/fa/facter/package.nix +++ b/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 diff --git a/pkgs/by-name/fr/frr/package.nix b/pkgs/by-name/fr/frr/package.nix index 70b2d4312217..9dec87026de7 100644 --- a/pkgs/by-name/fr/frr/package.nix +++ b/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 ]; diff --git a/pkgs/by-name/fu/fusionInventory/package.nix b/pkgs/by-name/fu/fusionInventory/package.nix index f07e449bab80..f2bc200723bf 100644 --- a/pkgs/by-name/fu/fusionInventory/package.nix +++ b/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 ] } diff --git a/pkgs/by-name/gi/gitlab/package.nix b/pkgs/by-name/gi/gitlab/package.nix index 81c204476608..370fca8d9f78 100644 --- a/pkgs/by-name/gi/gitlab/package.nix +++ b/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 = [ diff --git a/pkgs/by-name/gi/gitolite/package.nix b/pkgs/by-name/gi/gitolite/package.nix index 0a4b4b9a2df6..79b5169df336 100644 --- a/pkgs/by-name/gi/gitolite/package.nix +++ b/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" ''; diff --git a/pkgs/by-name/gl/glpi-agent/package.nix b/pkgs/by-name/gl/glpi-agent/package.nix index a683021591d4..e6aef1932490 100644 --- a/pkgs/by-name/gl/glpi-agent/package.nix +++ b/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 ] } diff --git a/pkgs/by-name/gv/gvpe/package.nix b/pkgs/by-name/gv/gvpe/package.nix index cca9f556a2d5..d67e119fefac 100644 --- a/pkgs/by-name/gv/gvpe/package.nix +++ b/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; { diff --git a/pkgs/by-name/ha/hans/package.nix b/pkgs/by-name/ha/hans/package.nix index 8314ef012ef2..fb73c3e09533 100644 --- a/pkgs/by-name/ha/hans/package.nix +++ b/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; diff --git a/pkgs/by-name/he/heroic/package.nix b/pkgs/by-name/he/heroic/package.nix index 6ffb8e0fc6c7..d8218c4a94ae 100644 --- a/pkgs/by-name/he/heroic/package.nix +++ b/pkgs/by-name/he/heroic/package.nix @@ -28,7 +28,7 @@ buildFHSEnv { zenity kdePackages.kdialog mangohud - nettools + net-tools opencl-headers p7zip pciutils diff --git a/pkgs/by-name/ho/houdini/package.nix b/pkgs/by-name/ho/houdini/package.nix index 1971ae3c4882..c5ec5f4711b4 100644 --- a/pkgs/by-name/ho/houdini/package.nix +++ b/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 diff --git a/pkgs/by-name/hp/hplip/package.nix b/pkgs/by-name/hp/hplip/package.nix index 12ace2d35cbc..286ba7d49f04 100644 --- a/pkgs/by-name/hp/hplip/package.nix +++ b/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 = [ diff --git a/pkgs/by-name/io/iodine/package.nix b/pkgs/by-name/io/iodine/package.nix index 683708af9ebc..081c65318655 100644 --- a/pkgs/by-name/io/iodine/package.nix +++ b/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}" ]; diff --git a/pkgs/by-name/is/isabelle/package.nix b/pkgs/by-name/is/isabelle/package.nix index 82dae0ed306a..556f71b15b68 100644 --- a/pkgs/by-name/is/isabelle/package.nix +++ b/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 ]; diff --git a/pkgs/by-name/ju/jumpapp/package.nix b/pkgs/by-name/ju/jumpapp/package.nix index fd6a3b8c7276..f02e9b2941f4 100644 --- a/pkgs/by-name/ju/jumpapp/package.nix +++ b/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 = diff --git a/pkgs/by-name/li/libbladeRF/package.nix b/pkgs/by-name/li/libbladeRF/package.nix index f09ab673cd87..0f5364bc21b9 100644 --- a/pkgs/by-name/li/libbladeRF/package.nix +++ b/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 ''; diff --git a/pkgs/by-name/ma/mackerel-agent/package.nix b/pkgs/by-name/ma/mackerel-agent/package.nix index 35c9b5460f4d..fb38a764e41a 100644 --- a/pkgs/by-name/ma/mackerel-agent/package.nix +++ b/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="; diff --git a/pkgs/by-name/ma/mattermost/tests.nix b/pkgs/by-name/ma/mattermost/tests.nix index e6918b8bff70..aab719eb2e53 100644 --- a/pkgs/by-name/ma/mattermost/tests.nix +++ b/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 ]; diff --git a/pkgs/by-name/mi/mininet/package.nix b/pkgs/by-name/mi/mininet/package.nix index 8980443d16b0..bc9d921bfea3 100644 --- a/pkgs/by-name/mi/mininet/package.nix +++ b/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 ]; diff --git a/pkgs/by-name/mi/miredo/package.nix b/pkgs/by-name/mi/miredo/package.nix index 2ac01fede0ec..f07457e82bac 100644 --- a/pkgs/by-name/mi/miredo/package.nix +++ b/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' ''; diff --git a/pkgs/by-name/mu/munin/package.nix b/pkgs/by-name/mu/munin/package.nix index fdf82910c6dc..7041ac25a64c 100644 --- a/pkgs/by-name/mu/munin/package.nix +++ b/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 diff --git a/pkgs/by-name/ne/net-snmp/package.nix b/pkgs/by-name/ne/net-snmp/package.nix index c1ad4ea5d064..06341c78eeea 100644 --- a/pkgs/by-name/ne/net-snmp/package.nix +++ b/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 ]; diff --git a/pkgs/by-name/op/opentsdb/package.nix b/pkgs/by-name/op/opentsdb/package.nix index 83c8681f1ff1..250566cdb84a 100644 --- a/pkgs/by-name/op/opentsdb/package.nix +++ b/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 ]; diff --git a/pkgs/by-name/ot/otpw/package.nix b/pkgs/by-name/ot/otpw/package.nix index c83b44e472d2..8814b6ffee54 100644 --- a/pkgs/by-name/ot/otpw/package.nix +++ b/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 = [ diff --git a/pkgs/by-name/pi/pihole/package.nix b/pkgs/by-name/pi/pihole/package.nix index d55a7f99273b..c963506d0d01 100644 --- a/pkgs/by-name/pi/pihole/package.nix +++ b/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 diff --git a/pkgs/by-name/rc/rcu/package.nix b/pkgs/by-name/rc/rcu/package.nix index c73584db7f5f..3f8ebd58600f 100644 --- a/pkgs/by-name/rc/rcu/package.nix +++ b/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 ] } diff --git a/pkgs/by-name/si/signing-party/package.nix b/pkgs/by-name/si/signing-party/package.nix index f0d0b2b70349..b8b71030cb71 100644 --- a/pkgs/by-name/si/signing-party/package.nix +++ b/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 ] }" diff --git a/pkgs/by-name/so/socat/package.nix b/pkgs/by-name/so/socat/package.nix index 257529fe2366..8ff1ad42c7ac 100644 --- a/pkgs/by-name/so/socat/package.nix +++ b/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 diff --git a/pkgs/by-name/ss/sshuttle/package.nix b/pkgs/by-name/ss/sshuttle/package.nix index e17517008d44..10c43f5e1fb5 100644 --- a/pkgs/by-name/ss/sshuttle/package.nix +++ b/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 ] ) }" \ diff --git a/pkgs/by-name/te/testssl/package.nix b/pkgs/by-name/te/testssl/package.nix index cc9f1e1c8469..929940124146 100644 --- a/pkgs/by-name/te/testssl/package.nix +++ b/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 diff --git a/pkgs/by-name/un/unhide/package.nix b/pkgs/by-name/un/unhide/package.nix index eede250876f5..2981a313bdd5 100644 --- a/pkgs/by-name/un/unhide/package.nix +++ b/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 ]; diff --git a/pkgs/by-name/un/unix-privesc-check/package.nix b/pkgs/by-name/un/unix-privesc-check/package.nix index aacd8e29394f..a20adcd41ce0 100644 --- a/pkgs/by-name/un/unix-privesc-check/package.nix +++ b/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 diff --git a/pkgs/by-name/un/unixbench/package.nix b/pkgs/by-name/un/unixbench/package.nix index 52ccbc26a416..2179124818cc 100644 --- a/pkgs/by-name/un/unixbench/package.nix +++ b/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 diff --git a/pkgs/by-name/vp/vpnc-scripts/package.nix b/pkgs/by-name/vp/vpnc-scripts/package.nix index 9be974347412..eaa27cc2d290 100644 --- a/pkgs/by-name/vp/vpnc-scripts/package.nix +++ b/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 diff --git a/pkgs/by-name/x2/x2goserver/package.nix b/pkgs/by-name/x2/x2goserver/package.nix index a07a7bc9d2d8..37a19b0a063c 100644 --- a/pkgs/by-name/x2/x2goserver/package.nix +++ b/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 diff --git a/pkgs/by-name/xd/xdg-utils/package.nix b/pkgs/by-name/xd/xdg-utils/package.nix index 60ab18c0e4a7..14c6b17cc616 100644 --- a/pkgs/by-name/xd/xdg-utils/package.nix +++ b/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 ]; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 755fcf702c1f..6d25d9b50e72 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/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; }; diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index dbf8bf7b0333..5d3ff4170d5d 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/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 ]; diff --git a/pkgs/development/python-modules/django-cacheops/default.nix b/pkgs/development/python-modules/django-cacheops/default.nix index df171f75d234..39e57deac515 100644 --- a/pkgs/development/python-modules/django-cacheops/default.nix +++ b/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 ]; diff --git a/pkgs/development/python-modules/ethtool/default.nix b/pkgs/development/python-modules/ethtool/default.nix index e7f87548ea05..d4b522b12b7c 100644 --- a/pkgs/development/python-modules/ethtool/default.nix +++ b/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 ]; diff --git a/pkgs/development/python-modules/jaraco-net/default.nix b/pkgs/development/python-modules/jaraco-net/default.nix index fe6497b618b9..2e2983c8f6e6 100644 --- a/pkgs/development/python-modules/jaraco-net/default.nix +++ b/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 diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index 0d32ac8bcbbf..bc7d2684cf2d 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/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 = [ diff --git a/pkgs/development/python-modules/pytap2/default.nix b/pkgs/development/python-modules/pytap2/default.nix index 1e080f0bbad3..83f82fef49ea 100644 --- a/pkgs/development/python-modules/pytap2/default.nix +++ b/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 ]; diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 77eb4965bda1..c70cf2266e75 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/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 diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 9cdc0889e307..3d8fceacbe13 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/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 diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index d770fae131ab..6e5a4c47abb4 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/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 ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b48c0a419d13..60943a7e8316 100644 --- a/pkgs/top-level/aliases.nix +++ b/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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9a1e6f14f641..5cc804807405 100644 --- a/pkgs/top-level/all-packages.nix +++ b/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 { }; diff --git a/pkgs/top-level/unixtools.nix b/pkgs/top-level/unixtools.nix index d2d678467c5f..46dba97718bb 100644 --- a/pkgs/top-level/unixtools.nix +++ b/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