diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix
index a4a488a1b3ea9..0ad0cf1fef5af 100644
--- a/nixos/lib/make-disk-image.nix
+++ b/nixos/lib/make-disk-image.nix
@@ -134,7 +134,7 @@ let format' = format; in let
binPath = with pkgs; makeBinPath (
[ rsync
- utillinux
+ util-linux
parted
e2fsprogs
lkl
@@ -239,7 +239,7 @@ let format' = format; in let
in pkgs.vmTools.runInLinuxVM (
pkgs.runCommand name
{ preVM = prepareImage;
- buildInputs = with pkgs; [ utillinux e2fsprogs dosfstools ];
+ buildInputs = with pkgs; [ util-linux e2fsprogs dosfstools ];
postVM = ''
${if format == "raw" then ''
mv $diskImage $out/${filename}
diff --git a/nixos/modules/config/swap.nix b/nixos/modules/config/swap.nix
index adb4e2294213d..4bb66e9b51449 100644
--- a/nixos/modules/config/swap.nix
+++ b/nixos/modules/config/swap.nix
@@ -187,7 +187,7 @@ in
before = [ "${realDevice'}.swap" ];
# If swap is encrypted, depending on rngd resolves a possible entropy starvation during boot
after = mkIf (config.security.rngd.enable && sw.randomEncryption.enable) [ "rngd.service" ];
- path = [ pkgs.utillinux ] ++ optional sw.randomEncryption.enable pkgs.cryptsetup;
+ path = [ pkgs.util-linux ] ++ optional sw.randomEncryption.enable pkgs.cryptsetup;
script =
''
diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix
index c65fa1a684f8e..27d1cef849bc0 100644
--- a/nixos/modules/config/system-path.nix
+++ b/nixos/modules/config/system-path.nix
@@ -37,7 +37,7 @@ let
pkgs.procps
pkgs.su
pkgs.time
- pkgs.utillinux
+ pkgs.util-linux
pkgs.which
pkgs.zstd
];
diff --git a/nixos/modules/config/zram.nix b/nixos/modules/config/zram.nix
index 5e9870bf6b1cf..341101bc184c6 100644
--- a/nixos/modules/config/zram.nix
+++ b/nixos/modules/config/zram.nix
@@ -149,8 +149,8 @@ in
print int($2*${toString cfg.memoryPercent}/100.0/${toString devicesCount}*1024)
}' /proc/meminfo)
- ${pkgs.utillinux}/sbin/zramctl --size $mem --algorithm ${cfg.algorithm} /dev/${dev}
- ${pkgs.utillinux}/sbin/mkswap /dev/${dev}
+ ${pkgs.util-linux}/sbin/zramctl --size $mem --algorithm ${cfg.algorithm} /dev/${dev}
+ ${pkgs.util-linux}/sbin/mkswap /dev/${dev}
'';
restartIfChanged = false;
};
diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix
index 231c7bf0a6c25..d9799aa69c957 100644
--- a/nixos/modules/installer/cd-dvd/sd-image.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image.nix
@@ -147,10 +147,10 @@ in
sdImage.storePaths = [ config.system.build.toplevel ];
system.build.sdImage = pkgs.callPackage ({ stdenv, dosfstools, e2fsprogs,
- mtools, libfaketime, utillinux, zstd }: stdenv.mkDerivation {
+ mtools, libfaketime, util-linux, zstd }: stdenv.mkDerivation {
name = config.sdImage.imageName;
- nativeBuildInputs = [ dosfstools e2fsprogs mtools libfaketime utillinux zstd ];
+ nativeBuildInputs = [ dosfstools e2fsprogs mtools libfaketime util-linux zstd ];
inherit (config.sdImage) compressImage;
@@ -221,7 +221,7 @@ in
set -euo pipefail
set -x
# Figure out device names for the boot device and root filesystem.
- rootPart=$(${pkgs.utillinux}/bin/findmnt -n -o SOURCE /)
+ rootPart=$(${pkgs.util-linux}/bin/findmnt -n -o SOURCE /)
bootDevice=$(lsblk -npo PKNAME $rootPart)
# Resize the root partition and the filesystem to fit the disk
diff --git a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
index 8408f56f94f91..0e67ae7de6980 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
@@ -96,7 +96,7 @@ in
boot.initrd.extraUtilsCommands =
''
- copy_bin_and_libs ${pkgs.utillinux}/sbin/hwclock
+ copy_bin_and_libs ${pkgs.util-linux}/sbin/hwclock
'';
boot.initrd.postDeviceCommands =
diff --git a/nixos/modules/programs/x2goserver.nix b/nixos/modules/programs/x2goserver.nix
index 7d74231e956b7..05707a56542f7 100644
--- a/nixos/modules/programs/x2goserver.nix
+++ b/nixos/modules/programs/x2goserver.nix
@@ -110,7 +110,7 @@ in {
"L+ /usr/local/bin/chmod - - - - ${coreutils}/bin/chmod"
"L+ /usr/local/bin/cp - - - - ${coreutils}/bin/cp"
"L+ /usr/local/bin/sed - - - - ${gnused}/bin/sed"
- "L+ /usr/local/bin/setsid - - - - ${utillinux}/bin/setsid"
+ "L+ /usr/local/bin/setsid - - - - ${util-linux}/bin/setsid"
"L+ /usr/local/bin/xrandr - - - - ${xorg.xrandr}/bin/xrandr"
"L+ /usr/local/bin/xmodmap - - - - ${xorg.xmodmap}/bin/xmodmap"
];
diff --git a/nixos/modules/security/pam_mount.nix b/nixos/modules/security/pam_mount.nix
index 89211bfbde48d..9a0143c155c57 100644
--- a/nixos/modules/security/pam_mount.nix
+++ b/nixos/modules/security/pam_mount.nix
@@ -60,7 +60,7 @@ in
- ${pkgs.utillinux}/bin
+ ${pkgs.util-linux}/bin
diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index 52de21bca9bfd..de6213714ac3a 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -163,8 +163,8 @@ in
# These are mount related wrappers that require the +s permission.
fusermount.source = "${pkgs.fuse}/bin/fusermount";
fusermount3.source = "${pkgs.fuse3}/bin/fusermount3";
- mount.source = "${lib.getBin pkgs.utillinux}/bin/mount";
- umount.source = "${lib.getBin pkgs.utillinux}/bin/umount";
+ mount.source = "${lib.getBin pkgs.util-linux}/bin/mount";
+ umount.source = "${lib.getBin pkgs.util-linux}/bin/umount";
};
boot.specialFileSystems.${parentWrapperDir} = {
diff --git a/nixos/modules/services/admin/salt/master.nix b/nixos/modules/services/admin/salt/master.nix
index cb803d323bbd2..a3069c81c19ae 100644
--- a/nixos/modules/services/admin/salt/master.nix
+++ b/nixos/modules/services/admin/salt/master.nix
@@ -45,7 +45,7 @@ in
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
path = with pkgs; [
- utillinux # for dmesg
+ util-linux # for dmesg
];
serviceConfig = {
ExecStart = "${pkgs.salt}/bin/salt-master";
diff --git a/nixos/modules/services/admin/salt/minion.nix b/nixos/modules/services/admin/salt/minion.nix
index c8fa9461a2094..ac124c570d8d4 100644
--- a/nixos/modules/services/admin/salt/minion.nix
+++ b/nixos/modules/services/admin/salt/minion.nix
@@ -50,7 +50,7 @@ in
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
path = with pkgs; [
- utillinux
+ util-linux
];
serviceConfig = {
ExecStart = "${pkgs.salt}/bin/salt-minion";
diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixos/modules/services/backup/tarsnap.nix
index 6d99a1efb6138..e1200731c2ca7 100644
--- a/nixos/modules/services/backup/tarsnap.nix
+++ b/nixos/modules/services/backup/tarsnap.nix
@@ -308,7 +308,7 @@ in
requires = [ "network-online.target" ];
after = [ "network-online.target" ];
- path = with pkgs; [ iputils tarsnap utillinux ];
+ path = with pkgs; [ iputils tarsnap util-linux ];
# In order for the persistent tarsnap timer to work reliably, we have to
# make sure that the tarsnap server is reachable after systemd starts up
@@ -355,7 +355,7 @@ in
description = "Tarsnap restore '${name}'";
requires = [ "network-online.target" ];
- path = with pkgs; [ iputils tarsnap utillinux ];
+ path = with pkgs; [ iputils tarsnap util-linux ];
script = let
tarsnap = ''tarsnap --configfile "/etc/tarsnap/${name}.conf"'';
diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix
index c3d67552cc8c3..2b6e45ba1b905 100644
--- a/nixos/modules/services/cluster/kubernetes/kubelet.nix
+++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix
@@ -241,7 +241,7 @@ in
description = "Kubernetes Kubelet Service";
wantedBy = [ "kubernetes.target" ];
after = [ "network.target" "docker.service" "kube-apiserver.service" ];
- path = with pkgs; [ gitMinimal openssh docker utillinux iproute ethtool thin-provisioning-tools iptables socat ] ++ top.path;
+ path = with pkgs; [ gitMinimal openssh docker util-linux iproute ethtool thin-provisioning-tools iptables socat ] ++ top.path;
preStart = ''
${concatMapStrings (img: ''
echo "Seeding docker image: ${img}"
diff --git a/nixos/modules/services/computing/torque/mom.nix b/nixos/modules/services/computing/torque/mom.nix
index 0c5f43cf3e6a2..6747bd4b0d5aa 100644
--- a/nixos/modules/services/computing/torque/mom.nix
+++ b/nixos/modules/services/computing/torque/mom.nix
@@ -32,7 +32,7 @@ in
environment.systemPackages = [ pkgs.torque ];
systemd.services.torque-mom-init = {
- path = with pkgs; [ torque utillinux procps inetutils ];
+ path = with pkgs; [ torque util-linux procps inetutils ];
script = ''
pbs_mkdirs -v aux
diff --git a/nixos/modules/services/computing/torque/server.nix b/nixos/modules/services/computing/torque/server.nix
index 21c5a4f46724d..8d923fc04d46d 100644
--- a/nixos/modules/services/computing/torque/server.nix
+++ b/nixos/modules/services/computing/torque/server.nix
@@ -21,7 +21,7 @@ in
environment.systemPackages = [ pkgs.torque ];
systemd.services.torque-server-init = {
- path = with pkgs; [ torque utillinux procps inetutils ];
+ path = with pkgs; [ torque util-linux procps inetutils ];
script = ''
tmpsetup=$(mktemp -t torque-XXXX)
diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix
index 431555309cc9c..c358a5db77c2f 100644
--- a/nixos/modules/services/continuous-integration/gitlab-runner.nix
+++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix
@@ -541,7 +541,7 @@ in
jq
moreutils
remarshal
- utillinux
+ util-linux
cfg.package
] ++ cfg.extraPackages;
reloadIfChanged = true;
diff --git a/nixos/modules/services/databases/riak.nix b/nixos/modules/services/databases/riak.nix
index 885215209bdf4..657eeea87bf4c 100644
--- a/nixos/modules/services/databases/riak.nix
+++ b/nixos/modules/services/databases/riak.nix
@@ -118,7 +118,7 @@ in
after = [ "network.target" ];
path = [
- pkgs.utillinux # for `logger`
+ pkgs.util-linux # for `logger`
pkgs.bash
];
diff --git a/nixos/modules/services/desktops/profile-sync-daemon.nix b/nixos/modules/services/desktops/profile-sync-daemon.nix
index a8ac22ac12765..6206295272fc5 100644
--- a/nixos/modules/services/desktops/profile-sync-daemon.nix
+++ b/nixos/modules/services/desktops/profile-sync-daemon.nix
@@ -36,7 +36,7 @@ in {
description = "Profile Sync daemon";
wants = [ "psd-resync.service" ];
wantedBy = [ "default.target" ];
- path = with pkgs; [ rsync kmod gawk nettools utillinux profile-sync-daemon ];
+ path = with pkgs; [ rsync kmod gawk nettools util-linux profile-sync-daemon ];
unitConfig = {
RequiresMountsFor = [ "/home/" ];
};
@@ -55,7 +55,7 @@ in {
wants = [ "psd-resync.timer" ];
partOf = [ "psd.service" ];
wantedBy = [ "default.target" ];
- path = with pkgs; [ rsync kmod gawk nettools utillinux profile-sync-daemon ];
+ path = with pkgs; [ rsync kmod gawk nettools util-linux profile-sync-daemon ];
serviceConfig = {
Type = "oneshot";
ExecStart = "${pkgs.profile-sync-daemon}/bin/profile-sync-daemon resync";
diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix
index 587b9b0234aa4..a212adb7342dd 100644
--- a/nixos/modules/services/hardware/udev.nix
+++ b/nixos/modules/services/hardware/udev.nix
@@ -57,8 +57,8 @@ let
substituteInPlace $i \
--replace \"/sbin/modprobe \"${pkgs.kmod}/bin/modprobe \
--replace \"/sbin/mdadm \"${pkgs.mdadm}/sbin/mdadm \
- --replace \"/sbin/blkid \"${pkgs.utillinux}/sbin/blkid \
- --replace \"/bin/mount \"${pkgs.utillinux}/bin/mount \
+ --replace \"/sbin/blkid \"${pkgs.util-linux}/sbin/blkid \
+ --replace \"/bin/mount \"${pkgs.util-linux}/bin/mount \
--replace /usr/bin/readlink ${pkgs.coreutils}/bin/readlink \
--replace /usr/bin/basename ${pkgs.coreutils}/bin/basename
done
@@ -280,7 +280,7 @@ in
services.udev.packages = [ extraUdevRules extraHwdbFile ];
- services.udev.path = [ pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.utillinux udev ];
+ services.udev.path = [ pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.util-linux udev ];
boot.kernelParams = mkIf (!config.networking.usePredictableInterfaceNames) [ "net.ifnames=0" ];
diff --git a/nixos/modules/services/misc/fstrim.nix b/nixos/modules/services/misc/fstrim.nix
index b8841a7fe74ce..5258f5acb410c 100644
--- a/nixos/modules/services/misc/fstrim.nix
+++ b/nixos/modules/services/misc/fstrim.nix
@@ -31,7 +31,7 @@ in {
config = mkIf cfg.enable {
- systemd.packages = [ pkgs.utillinux ];
+ systemd.packages = [ pkgs.util-linux ];
systemd.timers.fstrim = {
timerConfig = {
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index c4037b49e7e2c..9342039927900 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -658,7 +658,7 @@ in {
script = ''
set -eu
- PSQL="${pkgs.utillinux}/bin/runuser -u ${pgsql.superUser} -- psql --port=${toString pgsql.port}"
+ PSQL="${pkgs.util-linux}/bin/runuser -u ${pgsql.superUser} -- psql --port=${toString pgsql.port}"
$PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = '${cfg.databaseName}'" | grep -q 1 || $PSQL -tAc 'CREATE DATABASE "${cfg.databaseName}" OWNER "${cfg.databaseUsername}"'
current_owner=$($PSQL -tAc "SELECT pg_catalog.pg_get_userbyid(datdba) FROM pg_catalog.pg_database WHERE datname = '${cfg.databaseName}'")
diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix
index 7f42184735c89..3abb9b7d69c88 100644
--- a/nixos/modules/services/misc/matrix-synapse.nix
+++ b/nixos/modules/services/misc/matrix-synapse.nix
@@ -713,7 +713,7 @@ in {
${ concatMapStringsSep "\n " (x: "--config-path ${x} \\") ([ configFile ] ++ cfg.extraConfigFiles) }
--keys-directory ${cfg.dataDir}
'';
- ExecReload = "${pkgs.utillinux}/bin/kill -HUP $MAINPID";
+ ExecReload = "${pkgs.util-linux}/bin/kill -HUP $MAINPID";
Restart = "on-failure";
};
};
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index ed05882a6343a..0eeff31d6c4d4 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -539,7 +539,7 @@ in
systemd.sockets.nix-daemon.wantedBy = [ "sockets.target" ];
systemd.services.nix-daemon =
- { path = [ nix pkgs.utillinux config.programs.ssh.package ]
+ { path = [ nix pkgs.util-linux config.programs.ssh.package ]
++ optionals cfg.distributedBuilds [ pkgs.gzip ];
environment = cfg.envVars
diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix
index 2e73e15d3a867..db51fdbd2c617 100644
--- a/nixos/modules/services/monitoring/netdata.nix
+++ b/nixos/modules/services/monitoring/netdata.nix
@@ -142,7 +142,7 @@ in {
serviceConfig = {
Environment="PYTHONPATH=${cfg.package}/libexec/netdata/python.d/python_modules";
ExecStart = "${cfg.package}/bin/netdata -P /run/netdata/netdata.pid -D -c ${configFile}";
- ExecReload = "${pkgs.utillinux}/bin/kill -s HUP -s USR1 -s USR2 $MAINPID";
+ ExecReload = "${pkgs.util-linux}/bin/kill -s HUP -s USR1 -s USR2 $MAINPID";
TimeoutStopSec = 60;
Restart = "on-failure";
# User and group
diff --git a/nixos/modules/services/monitoring/smartd.nix b/nixos/modules/services/monitoring/smartd.nix
index c72b4abfcdce3..3ea254371142b 100644
--- a/nixos/modules/services/monitoring/smartd.nix
+++ b/nixos/modules/services/monitoring/smartd.nix
@@ -36,7 +36,7 @@ let
$SMARTD_MESSAGE
EOF
- } | ${pkgs.utillinux}/bin/wall 2>/dev/null
+ } | ${pkgs.util-linux}/bin/wall 2>/dev/null
''}
${optionalString nx.enable ''
export DISPLAY=${nx.display}
diff --git a/nixos/modules/services/network-filesystems/openafs/client.nix b/nixos/modules/services/network-filesystems/openafs/client.nix
index 677111814a018..03884cb729760 100644
--- a/nixos/modules/services/network-filesystems/openafs/client.nix
+++ b/nixos/modules/services/network-filesystems/openafs/client.nix
@@ -244,7 +244,7 @@ in
# postStop, then we get a hang + kernel oops, because AFS can't be
# stopped simply by sending signals to processes.
preStop = ''
- ${pkgs.utillinux}/bin/umount ${cfg.mountPoint}
+ ${pkgs.util-linux}/bin/umount ${cfg.mountPoint}
${openafsBin}/sbin/afsd -shutdown
${pkgs.kmod}/sbin/rmmod libafs
'';
diff --git a/nixos/modules/services/network-filesystems/xtreemfs.nix b/nixos/modules/services/network-filesystems/xtreemfs.nix
index b8f8c1d71174b..27a9fe847c581 100644
--- a/nixos/modules/services/network-filesystems/xtreemfs.nix
+++ b/nixos/modules/services/network-filesystems/xtreemfs.nix
@@ -112,7 +112,7 @@ in
description = ''
Must be set to a unique identifier, preferably a UUID according to
RFC 4122. UUIDs can be generated with `uuidgen` command, found in
- the `utillinux` package.
+ the `util-linux` package.
'';
};
port = mkOption {
@@ -232,7 +232,7 @@ in
description = ''
Must be set to a unique identifier, preferably a UUID according to
RFC 4122. UUIDs can be generated with `uuidgen` command, found in
- the `utillinux` package.
+ the `util-linux` package.
'';
};
port = mkOption {
@@ -370,7 +370,7 @@ in
description = ''
Must be set to a unique identifier, preferably a UUID according to
RFC 4122. UUIDs can be generated with `uuidgen` command, found in
- the `utillinux` package.
+ the `util-linux` package.
'';
};
port = mkOption {
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 201a51ff70b1c..2e680544ec245 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -465,7 +465,7 @@ in {
restartTriggers = [ configFile overrideNameserversScript ];
# useful binaries for user-specified hooks
- path = [ pkgs.iproute pkgs.utillinux pkgs.coreutils ];
+ path = [ pkgs.iproute pkgs.util-linux pkgs.coreutils ];
aliases = [ "dbus-org.freedesktop.nm-dispatcher.service" ];
};
diff --git a/nixos/modules/services/networking/strongswan-swanctl/module.nix b/nixos/modules/services/networking/strongswan-swanctl/module.nix
index 0fec3ef00ad99..f67eedac29612 100644
--- a/nixos/modules/services/networking/strongswan-swanctl/module.nix
+++ b/nixos/modules/services/networking/strongswan-swanctl/module.nix
@@ -63,7 +63,7 @@ in {
description = "strongSwan IPsec IKEv1/IKEv2 daemon using swanctl";
wantedBy = [ "multi-user.target" ];
after = [ "network-online.target" ];
- path = with pkgs; [ kmod iproute iptables utillinux ];
+ path = with pkgs; [ kmod iproute iptables util-linux ];
environment = {
STRONGSWAN_CONF = pkgs.writeTextFile {
name = "strongswan.conf";
diff --git a/nixos/modules/services/networking/strongswan.nix b/nixos/modules/services/networking/strongswan.nix
index 13a1a897c5ed8..f6170b8136545 100644
--- a/nixos/modules/services/networking/strongswan.nix
+++ b/nixos/modules/services/networking/strongswan.nix
@@ -152,7 +152,7 @@ in
systemd.services.strongswan = {
description = "strongSwan IPSec Service";
wantedBy = [ "multi-user.target" ];
- path = with pkgs; [ kmod iproute iptables utillinux ]; # XXX Linux
+ path = with pkgs; [ kmod iproute iptables util-linux ]; # XXX Linux
after = [ "network-online.target" ];
environment = {
STRONGSWAN_CONF = strongswanConf { inherit setup connections ca secretsFile managePlugins enabledPlugins; };
diff --git a/nixos/modules/services/system/cloud-init.nix b/nixos/modules/services/system/cloud-init.nix
index 15fe822aec679..3518e0ee9dca0 100644
--- a/nixos/modules/services/system/cloud-init.nix
+++ b/nixos/modules/services/system/cloud-init.nix
@@ -9,7 +9,7 @@ let cfg = config.services.cloud-init;
nettools
openssh
shadow
- utillinux
+ util-linux
] ++ optional cfg.btrfs.enable btrfs-progs
++ optional cfg.ext4.enable e2fsprogs
;
diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix
index 717c18d367f01..7bec073e26f71 100644
--- a/nixos/modules/services/torrent/transmission.nix
+++ b/nixos/modules/services/torrent/transmission.nix
@@ -397,9 +397,9 @@ in
mr ${getLib pkgs.openssl}/lib/libcrypto*.so*,
mr ${getLib pkgs.openssl}/lib/libssl*.so*,
mr ${getLib pkgs.systemd}/lib/libsystemd*.so*,
- mr ${getLib pkgs.utillinuxMinimal.out}/lib/libblkid.so*,
- mr ${getLib pkgs.utillinuxMinimal.out}/lib/libmount.so*,
- mr ${getLib pkgs.utillinuxMinimal.out}/lib/libuuid.so*,
+ mr ${getLib pkgs.util-linuxMinimal.out}/lib/libblkid.so*,
+ mr ${getLib pkgs.util-linuxMinimal.out}/lib/libmount.so*,
+ mr ${getLib pkgs.util-linuxMinimal.out}/lib/libuuid.so*,
mr ${getLib pkgs.xz}/lib/liblzma*.so*,
mr ${getLib pkgs.zlib}/lib/libz*.so*,
diff --git a/nixos/modules/services/ttys/agetty.nix b/nixos/modules/services/ttys/agetty.nix
index f3a629f7af700..d07746be2377a 100644
--- a/nixos/modules/services/ttys/agetty.nix
+++ b/nixos/modules/services/ttys/agetty.nix
@@ -5,7 +5,7 @@ with lib;
let
autologinArg = optionalString (config.services.mingetty.autologinUser != null) "--autologin ${config.services.mingetty.autologinUser}";
- gettyCmd = extraArgs: "@${pkgs.utillinux}/sbin/agetty agetty --login-program ${pkgs.shadow}/bin/login ${autologinArg} ${extraArgs}";
+ gettyCmd = extraArgs: "@${pkgs.util-linux}/sbin/agetty agetty --login-program ${pkgs.shadow}/bin/login ${autologinArg} ${extraArgs}";
in
diff --git a/nixos/modules/services/web-apps/gerrit.nix b/nixos/modules/services/web-apps/gerrit.nix
index 657b1a4fc5bac..864587aea5651 100644
--- a/nixos/modules/services/web-apps/gerrit.nix
+++ b/nixos/modules/services/web-apps/gerrit.nix
@@ -143,7 +143,7 @@ in
Set a UUID that uniquely identifies the server.
This can be generated with
- nix-shell -p utillinux --run uuidgen.
+ nix-shell -p util-linux --run uuidgen.
'';
};
};
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index 6ffda3d63614d..dc78728d66360 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -750,8 +750,8 @@ in
# Get rid of old semaphores. These tend to accumulate across
# server restarts, eventually preventing it from restarting
# successfully.
- for i in $(${pkgs.utillinux}/bin/ipcs -s | grep ' ${cfg.user} ' | cut -f2 -d ' '); do
- ${pkgs.utillinux}/bin/ipcrm -s $i
+ for i in $(${pkgs.util-linux}/bin/ipcs -s | grep ' ${cfg.user} ' | cut -f2 -d ' '); do
+ ${pkgs.util-linux}/bin/ipcrm -s $i
done
'';
diff --git a/nixos/modules/services/x11/terminal-server.nix b/nixos/modules/services/x11/terminal-server.nix
index 503c14c9b6245..e6b50c21a9526 100644
--- a/nixos/modules/services/x11/terminal-server.nix
+++ b/nixos/modules/services/x11/terminal-server.nix
@@ -32,7 +32,7 @@ with lib;
path =
[ pkgs.xorg.xorgserver.out pkgs.gawk pkgs.which pkgs.openssl pkgs.xorg.xauth
- pkgs.nettools pkgs.shadow pkgs.procps pkgs.utillinux pkgs.bash
+ pkgs.nettools pkgs.shadow pkgs.procps pkgs.util-linux pkgs.bash
];
environment.FD_GEOM = "1024x786x24";
diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix
index 18c77948cb90b..3a6930314b1af 100644
--- a/nixos/modules/system/activation/activation-script.nix
+++ b/nixos/modules/system/activation/activation-script.nix
@@ -25,7 +25,7 @@ let
stdenv.cc.libc # nscd in update-users-groups.pl
shadow
nettools # needed for hostname
- utillinux # needed for mount and mountpoint
+ util-linux # needed for mount and mountpoint
];
scriptType = with types;
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index 2724d9f9cb6f1..03d7e7493230b 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -97,10 +97,11 @@ let
allowSubstitutes = false;
buildCommand = systemBuilder;
- inherit (pkgs) utillinux coreutils;
+ inherit (pkgs) coreutils;
systemd = config.systemd.package;
shell = "${pkgs.bash}/bin/sh";
su = "${pkgs.shadow.su}/bin/su";
+ utillinux = pkgs.util-linux;
kernelParams = config.boot.kernelParams;
installBootLoader =
diff --git a/nixos/modules/system/boot/grow-partition.nix b/nixos/modules/system/boot/grow-partition.nix
index be70c4ad9c8de..87c981b24cec9 100644
--- a/nixos/modules/system/boot/grow-partition.nix
+++ b/nixos/modules/system/boot/grow-partition.nix
@@ -20,8 +20,8 @@ with lib;
boot.initrd.extraUtilsCommands = ''
copy_bin_and_libs ${pkgs.gawk}/bin/gawk
copy_bin_and_libs ${pkgs.gnused}/bin/sed
- copy_bin_and_libs ${pkgs.utillinux}/sbin/sfdisk
- copy_bin_and_libs ${pkgs.utillinux}/sbin/lsblk
+ copy_bin_and_libs ${pkgs.util-linux}/sbin/sfdisk
+ copy_bin_and_libs ${pkgs.util-linux}/sbin/lsblk
substitute "${pkgs.cloud-utils.guest}/bin/.growpart-wrapped" "$out/bin/growpart" \
--replace "${pkgs.bash}/bin/sh" "/bin/sh" \
diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 20e39628eabbc..09f7641dc9d9d 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -66,7 +66,7 @@ let
extraEntriesBeforeNixOS extraPrepareConfig configurationLimit copyKernels
default fsIdentifier efiSupport efiInstallAsRemovable gfxmodeEfi gfxmodeBios gfxpayloadEfi gfxpayloadBios;
path = with pkgs; makeBinPath (
- [ coreutils gnused gnugrep findutils diffutils btrfs-progs utillinux mdadm ]
+ [ coreutils gnused gnugrep findutils diffutils btrfs-progs util-linux mdadm ]
++ optional (cfg.efiSupport && (cfg.version == 2)) efibootmgr
++ optionals cfg.useOSProber [ busybox os-prober ]);
font = if cfg.font == null then ""
@@ -705,7 +705,7 @@ in
let
install-grub-pl = pkgs.substituteAll {
src = ./install-grub.pl;
- inherit (pkgs) utillinux;
+ utillinux = pkgs.util-linux;
btrfsprogs = pkgs.btrfs-progs;
};
in pkgs.writeScript "install-grub.sh" (''
diff --git a/nixos/modules/system/boot/shutdown.nix b/nixos/modules/system/boot/shutdown.nix
index 11041066e07c1..8cda7b3aabe8c 100644
--- a/nixos/modules/system/boot/shutdown.nix
+++ b/nixos/modules/system/boot/shutdown.nix
@@ -18,7 +18,7 @@ with lib;
serviceConfig = {
Type = "oneshot";
- ExecStart = "${pkgs.utillinux}/sbin/hwclock --systohc ${if config.time.hardwareClockInLocalTime then "--localtime" else "--utc"}";
+ ExecStart = "${pkgs.util-linux}/sbin/hwclock --systohc ${if config.time.hardwareClockInLocalTime then "--localtime" else "--utc"}";
};
};
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 6823e12847c2f..0f5787a192102 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -107,8 +107,8 @@ let
copy_bin_and_libs $BIN
done
- # Copy some utillinux stuff.
- copy_bin_and_libs ${pkgs.utillinux}/sbin/blkid
+ # Copy some util-linux stuff.
+ copy_bin_and_libs ${pkgs.util-linux}/sbin/blkid
# Copy dmsetup and lvm.
copy_bin_and_libs ${getBin pkgs.lvm2}/bin/dmsetup
@@ -235,7 +235,7 @@ let
--replace scsi_id ${extraUtils}/bin/scsi_id \
--replace cdrom_id ${extraUtils}/bin/cdrom_id \
--replace ${pkgs.coreutils}/bin/basename ${extraUtils}/bin/basename \
- --replace ${pkgs.utillinux}/bin/blkid ${extraUtils}/bin/blkid \
+ --replace ${pkgs.util-linux}/bin/blkid ${extraUtils}/bin/blkid \
--replace ${getBin pkgs.lvm2}/bin ${extraUtils}/bin \
--replace ${pkgs.mdadm}/sbin ${extraUtils}/sbin \
--replace ${pkgs.bash}/bin/sh ${extraUtils}/bin/sh \
diff --git a/nixos/modules/system/boot/stage-2.nix b/nixos/modules/system/boot/stage-2.nix
index dd6d83ee00947..94bc34fea0db3 100644
--- a/nixos/modules/system/boot/stage-2.nix
+++ b/nixos/modules/system/boot/stage-2.nix
@@ -17,7 +17,7 @@ let
inherit (config.system.build) earlyMountScript;
path = lib.makeBinPath ([
pkgs.coreutils
- pkgs.utillinux
+ pkgs.util-linux
] ++ lib.optional useHostResolvConf pkgs.openresolv);
fsPackagesPath = lib.makeBinPath config.system.fsPackages;
postBootCommands = pkgs.writeText "local-cmds"
diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix
index 3ea67dac7146d..a055072f9c967 100644
--- a/nixos/modules/tasks/filesystems.nix
+++ b/nixos/modules/tasks/filesystems.nix
@@ -286,7 +286,7 @@ in
before = [ mountPoint' "systemd-fsck@${device'}.service" ];
requires = [ device'' ];
after = [ device'' ];
- path = [ pkgs.utillinux ] ++ config.system.fsPackages;
+ path = [ pkgs.util-linux ] ++ config.system.fsPackages;
script =
''
if ! [ -e "${fs.device}" ]; then exit 1; fi
diff --git a/nixos/modules/tasks/filesystems/unionfs-fuse.nix b/nixos/modules/tasks/filesystems/unionfs-fuse.nix
index 1dcc4c87e3cec..f54f3559c3411 100644
--- a/nixos/modules/tasks/filesystems/unionfs-fuse.nix
+++ b/nixos/modules/tasks/filesystems/unionfs-fuse.nix
@@ -18,9 +18,9 @@
boot.initrd.postDeviceCommands = ''
# Hacky!!! fuse hard-codes the path to mount
- mkdir -p /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}-bin/bin
- ln -s $(which mount) /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}-bin/bin
- ln -s $(which umount) /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}-bin/bin
+ mkdir -p /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.util-linux.name}-bin/bin
+ ln -s $(which mount) /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.util-linux.name}-bin/bin
+ ln -s $(which umount) /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.util-linux.name}-bin/bin
'';
})
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index 7b6c2277741b2..6becc69627356 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -440,7 +440,7 @@ in
pkgs.gnugrep
pkgs.gnused
pkgs.nettools
- pkgs.utillinux
+ pkgs.util-linux
];
};
diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix
index 819e93a43e578..26297a7d0f1f7 100644
--- a/nixos/modules/virtualisation/amazon-image.nix
+++ b/nixos/modules/virtualisation/amazon-image.nix
@@ -124,7 +124,7 @@ in
boot.initrd.extraUtilsCommands =
''
# We need swapon in the initrd.
- copy_bin_and_libs ${pkgs.utillinux}/sbin/swapon
+ copy_bin_and_libs ${pkgs.util-linux}/sbin/swapon
'';
# Don't put old configurations in the GRUB menu. The user has no
diff --git a/nixos/modules/virtualisation/azure-agent.nix b/nixos/modules/virtualisation/azure-agent.nix
index e85482af8392e..81413792eda0a 100644
--- a/nixos/modules/virtualisation/azure-agent.nix
+++ b/nixos/modules/virtualisation/azure-agent.nix
@@ -22,7 +22,7 @@ let
nettools # for hostname
procps # for pidof
shadow # for useradd, usermod
- utillinux # for (u)mount, fdisk, sfdisk, mkswap
+ util-linux # for (u)mount, fdisk, sfdisk, mkswap
parted
];
pythonPath = [ pythonPackages.pyasn1 ];
diff --git a/nixos/modules/virtualisation/brightbox-image.nix b/nixos/modules/virtualisation/brightbox-image.nix
index d0efbcc808aa1..4498e3a736185 100644
--- a/nixos/modules/virtualisation/brightbox-image.nix
+++ b/nixos/modules/virtualisation/brightbox-image.nix
@@ -27,7 +27,7 @@ in
popd
'';
diskImageBase = "nixos-image-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}.raw";
- buildInputs = [ pkgs.utillinux pkgs.perl ];
+ buildInputs = [ pkgs.util-linux pkgs.perl ];
exportReferencesGraph =
[ "closure" config.system.build.toplevel ];
}
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 33da920e94cc7..447d1f091c8c9 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -190,7 +190,7 @@ let
'' else ''
''}
'';
- buildInputs = [ pkgs.utillinux ];
+ buildInputs = [ pkgs.util-linux ];
QEMU_OPTS = "-nographic -serial stdio -monitor none"
+ lib.optionalString cfg.useEFIBoot (
" -drive if=pflash,format=raw,unit=0,readonly=on,file=${efiFirmware}"
diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix
index 7b2a66c43489c..5ad647769bbd9 100644
--- a/nixos/modules/virtualisation/xen-dom0.nix
+++ b/nixos/modules/virtualisation/xen-dom0.nix
@@ -201,8 +201,8 @@ in
''
if [ -d /proc/xen ]; then
${pkgs.kmod}/bin/modprobe xenfs 2> /dev/null
- ${pkgs.utillinux}/bin/mountpoint -q /proc/xen || \
- ${pkgs.utillinux}/bin/mount -t xenfs none /proc/xen
+ ${pkgs.util-linux}/bin/mountpoint -q /proc/xen || \
+ ${pkgs.util-linux}/bin/mount -t xenfs none /proc/xen
fi
'';
diff --git a/nixos/tests/os-prober.nix b/nixos/tests/os-prober.nix
index be0235a417536..f778d30bdc06c 100644
--- a/nixos/tests/os-prober.nix
+++ b/nixos/tests/os-prober.nix
@@ -9,7 +9,7 @@ let
${parted}/sbin/parted --script /dev/vda -- mkpart primary ext2 1M -1s
mkdir /mnt
${e2fsprogs}/bin/mkfs.ext4 /dev/vda1
- ${utillinux}/bin/mount -t ext4 /dev/vda1 /mnt
+ ${util-linux}/bin/mount -t ext4 /dev/vda1 /mnt
if test -e /mnt/.debug; then
exec ${bash}/bin/sh
diff --git a/nixos/tests/systemd.nix b/nixos/tests/systemd.nix
index dfa16eecfad21..0fc788f860f74 100644
--- a/nixos/tests/systemd.nix
+++ b/nixos/tests/systemd.nix
@@ -26,7 +26,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
systemd.shutdown.test = pkgs.writeScript "test.shutdown" ''
#!${pkgs.runtimeShell}
- PATH=${lib.makeBinPath (with pkgs; [ utillinux coreutils ])}
+ PATH=${lib.makeBinPath (with pkgs; [ util-linux coreutils ])}
mount -t 9p shared -o trans=virtio,version=9p2000.L /tmp/shared
touch /tmp/shared/shutdown-test
umount /tmp/shared
diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix
index 0d9eafa4a20f3..900ee610a70b9 100644
--- a/nixos/tests/virtualbox.nix
+++ b/nixos/tests/virtualbox.nix
@@ -24,7 +24,7 @@ let
miniInit = ''
#!${pkgs.runtimeShell} -xe
- export PATH="${lib.makeBinPath [ pkgs.coreutils pkgs.utillinux ]}"
+ export PATH="${lib.makeBinPath [ pkgs.coreutils pkgs.util-linux ]}"
mkdir -p /run/dbus
cat > /etc/passwd < $out/bin/shell < $out/bin/shell < $out/bin/transcrypt-depspathprefix << EOF
#!${stdenv.shell}
diff --git a/pkgs/applications/video/vcs/default.nix b/pkgs/applications/video/vcs/default.nix
index 0cbdeaaf6ff86..0280cfb3f1f4e 100644
--- a/pkgs/applications/video/vcs/default.nix
+++ b/pkgs/applications/video/vcs/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, makeWrapper
-, coreutils, ffmpeg, gawk, gnugrep, gnused, imagemagick, mplayer, utillinux
+, coreutils, ffmpeg, gawk, gnugrep, gnused, imagemagick, mplayer, util-linux
, dejavu_fonts
}:
with stdenv.lib;
let
version = "1.13.4";
- runtimeDeps = [ coreutils ffmpeg gawk gnugrep gnused imagemagick mplayer utillinux ];
+ runtimeDeps = [ coreutils ffmpeg gawk gnugrep gnused imagemagick mplayer util-linux ];
in
stdenv.mkDerivation {
pname = "vcs";
diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix
index 30cd93178c25b..e72de8e61f205 100644
--- a/pkgs/applications/video/vdr/plugins.nix
+++ b/pkgs/applications/video/vdr/plugins.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchgit, vdr, alsaLib, fetchFromGitHub
, libvdpau, libxcb, xcbutilwm, graphicsmagick, libav, pcre, xorgserver, ffmpeg_3
-, libiconv, boost, libgcrypt, perl, utillinux, groff, libva, xorg, ncurses
+, libiconv, boost, libgcrypt, perl, util-linux, groff, libva, xorg, ncurses
, callPackage
}: let
mkPlugin = name: stdenv.mkDerivation {
@@ -146,7 +146,7 @@ in {
nativeBuildInputs = [
perl # for pod2man and pos2html
- utillinux
+ util-linux
groff
];
diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix
index 94d0ae94dbded..6301182771fb9 100644
--- a/pkgs/applications/virtualization/OVMF/default.nix
+++ b/pkgs/applications/virtualization/OVMF/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, edk2, utillinux, nasm, iasl
+{ stdenv, lib, edk2, util-linux, nasm, iasl
, csmSupport ? false, seabios ? null
, secureBoot ? false
}:
@@ -24,7 +24,7 @@ edk2.mkDerivation projectDscPath {
outputs = [ "out" "fd" ];
- buildInputs = [ utillinux nasm iasl ];
+ buildInputs = [ util-linux nasm iasl ];
hardeningDisable = [ "format" "stackprotector" "pic" "fortify" ];
diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix
index f3bcefcf17395..c01586ce5c832 100644
--- a/pkgs/applications/virtualization/containerd/default.nix
+++ b/pkgs/applications/virtualization/containerd/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, buildGoPackage, btrfs-progs, go-md2man, installShellFiles, utillinux, nixosTests }:
+{ lib, fetchFromGitHub, buildGoPackage, btrfs-progs, go-md2man, installShellFiles, util-linux, nixosTests }:
with lib;
@@ -18,7 +18,7 @@ buildGoPackage rec {
goPackagePath = "github.com/containerd/containerd";
outputs = [ "out" "man" ];
- nativeBuildInputs = [ go-md2man installShellFiles utillinux ];
+ nativeBuildInputs = [ go-md2man installShellFiles util-linux ];
buildInputs = [ btrfs-progs ];
diff --git a/pkgs/applications/virtualization/cri-o/wrapper.nix b/pkgs/applications/virtualization/cri-o/wrapper.nix
index 6d72623d86cbf..5aca291a60182 100644
--- a/pkgs/applications/virtualization/cri-o/wrapper.nix
+++ b/pkgs/applications/virtualization/cri-o/wrapper.nix
@@ -7,7 +7,7 @@
, runc # Default container runtime
, crun # Container runtime (default with cgroups v2 for podman/buildah)
, conmon # Container runtime monitor
-, utillinux # nsenter
+, util-linux # nsenter
, cni-plugins # not added to path
, iptables
}:
@@ -19,7 +19,7 @@ let
runc
crun
conmon
- utillinux
+ util-linux
iptables
] ++ extraPackages);
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index d3200bba928ce..5df0ae39a2515 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -2,7 +2,7 @@
, makeWrapper, installShellFiles, pkgconfig
, go-md2man, go, containerd, runc, docker-proxy, tini, libtool
, sqlite, iproute, lvm2, systemd
-, btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs, git
+, btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git
, procps, libseccomp
, nixosTests
}:
@@ -140,7 +140,7 @@ rec {
outputs = ["out" "man"];
- extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps utillinux git ]);
+ extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps util-linux git ]);
installPhase = ''
cd ./go/src/${goPackagePath}
diff --git a/pkgs/applications/virtualization/podman/wrapper.nix b/pkgs/applications/virtualization/podman/wrapper.nix
index d97d182496a4e..863888227b37d 100644
--- a/pkgs/applications/virtualization/podman/wrapper.nix
+++ b/pkgs/applications/virtualization/podman/wrapper.nix
@@ -9,7 +9,7 @@
, conmon # Container runtime monitor
, slirp4netns # User-mode networking for unprivileged namespaces
, fuse-overlayfs # CoW for images, much faster than default vfs
-, utillinux # nsenter
+, util-linux # nsenter
, cni-plugins # not added to path
, iptables
}:
@@ -23,7 +23,7 @@ let
conmon
slirp4netns
fuse-overlayfs
- utillinux
+ util-linux
iptables
] ++ extraPackages);
diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix
index 8d04b871e49b0..21c978e1b0e38 100644
--- a/pkgs/applications/virtualization/singularity/default.nix
+++ b/pkgs/applications/virtualization/singularity/default.nix
@@ -1,7 +1,7 @@
{stdenv
, lib
, fetchurl
-, utillinux
+, util-linux
, gpgme
, openssl
, libuuid
@@ -27,7 +27,7 @@ buildGoPackage rec {
goPackagePath = "github.com/sylabs/singularity";
buildInputs = [ gpgme openssl libuuid ];
- nativeBuildInputs = [ utillinux which makeWrapper cryptsetup ];
+ nativeBuildInputs = [ util-linux which makeWrapper cryptsetup ];
propagatedBuildInputs = [ coreutils squashfsTools ];
postPatch = ''
diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix
index 45d1146f43009..1d2a32c54e3a2 100644
--- a/pkgs/applications/virtualization/virt-manager/qt.nix
+++ b/pkgs/applications/virtualization/virt-manager/qt.nix
@@ -1,7 +1,7 @@
{ mkDerivation, lib, fetchFromGitHub, fetchpatch, cmake, pkgconfig
, qtbase, qtmultimedia, qtsvg, qttools, krdc
, libvncserver, libvirt, pcre, pixman, qtermwidget, spice-gtk, spice-protocol
-, libselinux, libsepol, utillinux
+, libselinux, libsepol, util-linux
}:
mkDerivation rec {
@@ -32,7 +32,7 @@ mkDerivation rec {
buildInputs = [
qtbase qtmultimedia qtsvg krdc
libvirt libvncserver pcre pixman qtermwidget spice-gtk spice-protocol
- libselinux libsepol utillinux
+ libselinux libsepol util-linux
];
nativeBuildInputs = [ cmake pkgconfig qttools ];
diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix
index 854debc458a36..53f556e3f0d69 100644
--- a/pkgs/applications/virtualization/xen/generic.nix
+++ b/pkgs/applications/virtualization/xen/generic.nix
@@ -14,7 +14,7 @@ config:
# Scripts
, coreutils, gawk, gnused, gnugrep, diffutils, multipath-tools
, iproute, inetutils, iptables, bridge-utils, openvswitch, nbd, drbd
-, lvm2, utillinux, procps, systemd
+, lvm2, util-linux, procps, systemd
# Documentation
# python2Packages.markdown
@@ -28,7 +28,7 @@ let
#TODO: fix paths instead
scriptEnvPath = concatMapStringsSep ":" (x: "${x}/bin") [
which perl
- coreutils gawk gnused gnugrep diffutils utillinux multipath-tools
+ coreutils gawk gnused gnugrep diffutils util-linux multipath-tools
iproute inetutils iptables bridge-utils openvswitch nbd drbd
];
@@ -146,8 +146,8 @@ stdenv.mkDerivation (rec {
--replace /usr/sbin/lvs ${lvm2}/bin/lvs
substituteInPlace tools/misc/xenpvnetboot \
- --replace /usr/sbin/mount ${utillinux}/bin/mount \
- --replace /usr/sbin/umount ${utillinux}/bin/umount
+ --replace /usr/sbin/mount ${util-linux}/bin/mount \
+ --replace /usr/sbin/umount ${util-linux}/bin/umount
substituteInPlace tools/xenmon/xenmon.py \
--replace /usr/bin/pkill ${procps}/bin/pkill
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 4da26ba7cfdaa..db1062e1b5d87 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -24,7 +24,7 @@
storeDir ? builtins.storeDir,
substituteAll,
symlinkJoin,
- utillinux,
+ util-linux,
vmTools,
writeReferencesToFile,
writeScript,
@@ -204,7 +204,7 @@ rec {
};
inherit fromImage fromImageName fromImageTag;
- nativeBuildInputs = [ utillinux e2fsprogs jshon rsync jq ];
+ nativeBuildInputs = [ util-linux e2fsprogs jshon rsync jq ];
} ''
mkdir disk
mkfs /dev/${vmTools.hd}
diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix
index d937ec6266820..4a54498d117c3 100644
--- a/pkgs/build-support/singularity-tools/default.nix
+++ b/pkgs/build-support/singularity-tools/default.nix
@@ -7,7 +7,7 @@
, bash
, vmTools
, gawk
-, utillinux
+, util-linux
, runtimeShell
, e2fsprogs }:
@@ -47,7 +47,7 @@ rec {
runScriptFile = shellScript "run-script.sh" runScript;
result = vmTools.runInLinuxVM (
runCommand "singularity-image-${name}.img" {
- buildInputs = [ singularity e2fsprogs utillinux gawk ];
+ buildInputs = [ singularity e2fsprogs util-linux gawk ];
layerClosure = writeReferencesToFile layer;
preVM = vmTools.createEmptyImage {
size = diskSize;
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 909cdc6da044a..2f18e96e4ce2e 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -151,7 +151,7 @@ rec {
# Set the system time from the hardware clock. Works around an
# apparent KVM > 1.5.2 bug.
- ${pkgs.utillinux}/bin/hwclock -s
+ ${pkgs.util-linux}/bin/hwclock -s
export NIX_STORE=${storeDir}
export NIX_BUILD_TOP=/tmp
@@ -270,7 +270,7 @@ rec {
defaultCreateRootFS = ''
mkdir /mnt
${e2fsprogs}/bin/mkfs.ext4 /dev/${hd}
- ${utillinux}/bin/mount -t ext4 /dev/${hd} /mnt
+ ${util-linux}/bin/mount -t ext4 /dev/${hd} /mnt
if test -e /mnt/.debug; then
exec ${bash}/bin/sh
@@ -317,7 +317,7 @@ rec {
with pkgs; runInLinuxVM (
stdenv.mkDerivation {
name = "extract-file";
- buildInputs = [ utillinux ];
+ buildInputs = [ util-linux ];
buildCommand = ''
ln -s ${kernel}/lib /lib
${kmod}/bin/modprobe loop
@@ -342,7 +342,7 @@ rec {
with pkgs; runInLinuxVM (
stdenv.mkDerivation {
name = "extract-file-mtd";
- buildInputs = [ utillinux mtdutils ];
+ buildInputs = [ util-linux mtdutils ];
buildCommand = ''
ln -s ${kernel}/lib /lib
${kmod}/bin/modprobe mtd
@@ -417,7 +417,7 @@ rec {
# Make the Nix store available in /mnt, because that's where the RPMs live.
mkdir -p /mnt${storeDir}
- ${utillinux}/bin/mount -o bind ${storeDir} /mnt${storeDir}
+ ${util-linux}/bin/mount -o bind ${storeDir} /mnt${storeDir}
# Newer distributions like Fedora 18 require /lib etc. to be
# symlinked to /usr.
@@ -427,7 +427,7 @@ rec {
ln -s /usr/sbin /mnt/sbin
ln -s /usr/lib /mnt/lib
ln -s /usr/lib64 /mnt/lib64
- ${utillinux}/bin/mount -t proc none /mnt/proc
+ ${util-linux}/bin/mount -t proc none /mnt/proc
''}
echo "unpacking RPMs..."
@@ -445,7 +445,7 @@ rec {
PATH=/usr/bin:/bin:/usr/sbin:/sbin $chroot /mnt \
rpm --initdb
- ${utillinux}/bin/mount -o bind /tmp /mnt/tmp
+ ${util-linux}/bin/mount -o bind /tmp /mnt/tmp
echo "installing RPMs..."
PATH=/usr/bin:/bin:/usr/sbin:/sbin $chroot /mnt \
@@ -456,8 +456,8 @@ rec {
rm /mnt/.debug
- ${utillinux}/bin/umount /mnt${storeDir} /mnt/tmp ${lib.optionalString unifiedSystemDir "/mnt/proc"}
- ${utillinux}/bin/umount /mnt
+ ${util-linux}/bin/umount /mnt${storeDir} /mnt/tmp ${lib.optionalString unifiedSystemDir "/mnt/proc"}
+ ${util-linux}/bin/umount /mnt
'';
passthru = { inherit fullName; };
@@ -587,9 +587,9 @@ rec {
# Make the Nix store available in /mnt, because that's where the .debs live.
mkdir -p /mnt/inst${storeDir}
- ${utillinux}/bin/mount -o bind ${storeDir} /mnt/inst${storeDir}
- ${utillinux}/bin/mount -o bind /proc /mnt/proc
- ${utillinux}/bin/mount -o bind /dev /mnt/dev
+ ${util-linux}/bin/mount -o bind ${storeDir} /mnt/inst${storeDir}
+ ${util-linux}/bin/mount -o bind /proc /mnt/proc
+ ${util-linux}/bin/mount -o bind /dev /mnt/dev
# Misc. files/directories assumed by various packages.
echo "initialising Dpkg DB..."
@@ -635,10 +635,10 @@ rec {
rm /mnt/.debug
- ${utillinux}/bin/umount /mnt/inst${storeDir}
- ${utillinux}/bin/umount /mnt/proc
- ${utillinux}/bin/umount /mnt/dev
- ${utillinux}/bin/umount /mnt
+ ${util-linux}/bin/umount /mnt/inst${storeDir}
+ ${util-linux}/bin/umount /mnt/proc
+ ${util-linux}/bin/umount /mnt/dev
+ ${util-linux}/bin/umount /mnt
'';
passthru = { inherit fullName; };
diff --git a/pkgs/desktops/enlightenment/efl/default.nix b/pkgs/desktops/enlightenment/efl/default.nix
index f8cb1a1c74420..00ea83cb85c3e 100644
--- a/pkgs/desktops/enlightenment/efl/default.nix
+++ b/pkgs/desktops/enlightenment/efl/default.nix
@@ -46,7 +46,7 @@
, python3Packages
, systemd
, udev
-, utillinux
+, util-linux
, wayland
, wayland-protocols
, writeText
@@ -125,7 +125,7 @@ stdenv.mkDerivation rec {
mint-x-icons # Mint-X is a parent icon theme of Enlightenment-X
openjpeg
poppler
- utillinux
+ util-linux
wayland
xorg.libXScrnSaver
xorg.libXcomposite
diff --git a/pkgs/desktops/plasma-5/discover.nix b/pkgs/desktops/plasma-5/discover.nix
index a859285e07898..ccfeaa4f63e3d 100644
--- a/pkgs/desktops/plasma-5/discover.nix
+++ b/pkgs/desktops/plasma-5/discover.nix
@@ -1,7 +1,7 @@
{
mkDerivation,
extra-cmake-modules, gettext, kdoctools, python,
- appstream-qt, discount, flatpak, fwupd, ostree, packagekit-qt, pcre, utillinux,
+ appstream-qt, discount, flatpak, fwupd, ostree, packagekit-qt, pcre, util-linux,
qtquickcontrols2,
karchive, kconfig, kcrash, kdbusaddons, kdeclarative, kio, kirigami2, kitemmodels,
knewstuff, kwindowsystem, kxmlgui, plasma-framework
@@ -12,7 +12,7 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ];
buildInputs = [
# discount is needed for libmarkdown
- appstream-qt discount flatpak fwupd ostree packagekit-qt pcre utillinux
+ appstream-qt discount flatpak fwupd ostree packagekit-qt pcre util-linux
qtquickcontrols2
karchive kconfig kcrash kdbusaddons kdeclarative kio kirigami2 kitemmodels knewstuff kwindowsystem kxmlgui
plasma-framework
diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix
index 8ae48b21f7be0..73e449a13624a 100644
--- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix
@@ -4,7 +4,7 @@
boost, fontconfig, ibus, libXcursor, libXft, libcanberra_kde, libpulseaudio,
libxkbfile, xf86inputevdev, xf86inputsynaptics, xinput, xkeyboard_config,
- xorgserver, utillinux,
+ xorgserver, util-linux,
qtdeclarative, qtquickcontrols, qtquickcontrols2, qtsvg, qtx11extras,
@@ -39,7 +39,7 @@ mkDerivation {
'';
CXXFLAGS = [
"-I${lib.getDev xorgserver}/include/xorg"
- ''-DNIXPKGS_HWCLOCK=\"${lib.getBin utillinux}/sbin/hwclock\"''
+ ''-DNIXPKGS_HWCLOCK=\"${lib.getBin util-linux}/sbin/hwclock\"''
];
cmakeFlags = [
"-DEvdev_INCLUDE_DIRS=${lib.getDev xf86inputevdev}/include/xorg"
diff --git a/pkgs/development/compilers/elm/packages/node-composition.nix b/pkgs/development/compilers/elm/packages/node-composition.nix
index 9c6bdb2006a1a..1b2e11782cd1d 100644
--- a/pkgs/development/compilers/elm/packages/node-composition.nix
+++ b/pkgs/development/compilers/elm/packages/node-composition.nix
@@ -6,7 +6,7 @@
let
nodeEnv = import ../../../node-packages/node-env.nix {
- inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+ inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
inherit nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix
index e9ca1bf35b880..2c00420c36267 100644
--- a/pkgs/development/compilers/osl/default.nix
+++ b/pkgs/development/compilers/osl/default.nix
@@ -1,6 +1,6 @@
{ clangStdenv, stdenv, fetchFromGitHub, cmake, zlib, openexr,
openimageio, llvm, boost165, flex, bison, partio, pugixml,
-utillinux, python
+util-linux, python
}:
let boost_static = boost165.override { enableStatic = true; };
@@ -25,7 +25,7 @@ in clangStdenv.mkDerivation rec {
buildInputs = [
cmake zlib openexr openimageio llvm
boost_static flex bison partio pugixml
- utillinux # needed just for hexdump
+ util-linux # needed just for hexdump
python # CMake doesn't check this?
];
# TODO: How important is partio? CMake doesn't seem to find it
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 694ba6935b040..a1fcd89803a9f 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -112584,7 +112584,7 @@ self: {
, pandoc-citeproc, parsec, process, QuickCheck, random, regex-tdfa
, resourcet, scientific, tagsoup, tasty, tasty-hunit
, tasty-quickcheck, template-haskell, text, time
- , time-locale-compat, unordered-containers, utillinux, vector, wai
+ , time-locale-compat, unordered-containers, util-linux, vector, wai
, wai-app-static, warp, yaml
}:
mkDerivation {
@@ -112608,12 +112608,12 @@ self: {
base bytestring containers filepath QuickCheck tasty tasty-hunit
tasty-quickcheck text unordered-containers yaml
];
- testToolDepends = [ utillinux ];
+ testToolDepends = [ util-linux ];
description = "A static website compiler library";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
- }) {inherit (pkgs) utillinux;};
+ }) {inherit (pkgs) util-linux;};
"hakyll-R" = callPackage
({ mkDerivation, base, directory, filepath, hakyll, pandoc, process
diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix
index a95f131c00c6d..5473801f85d2b 100644
--- a/pkgs/development/libraries/bobcat/default.nix
+++ b/pkgs/development/libraries/bobcat/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitLab, icmake
, libmilter, libX11, openssl, readline
-, utillinux, yodl }:
+, util-linux, yodl }:
stdenv.mkDerivation rec {
pname = "bobcat";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
owner = "fbb-git";
};
- buildInputs = [ libmilter libX11 openssl readline utillinux ];
+ buildInputs = [ libmilter libX11 openssl readline util-linux ];
nativeBuildInputs = [ icmake yodl ];
setSourceRoot = ''
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index de874a798b2bc..072a12410f483 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -1,7 +1,7 @@
{ config, stdenv, fetchurl, gettext, meson, ninja, pkgconfig, perl, python3
, libiconv, zlib, libffi, pcre, libelf, gnome3, libselinux, bash, gnum4, gtk-doc, docbook_xsl, docbook_xml_dtd_45
-# use utillinuxMinimal to avoid circular dependency (utillinux, systemd, glib)
-, utillinuxMinimal ? null
+# use util-linuxMinimal to avoid circular dependency (util-linux, systemd, glib)
+, util-linuxMinimal ? null
, buildPackages
# this is just for tests (not in the closure of any regular package)
@@ -13,7 +13,7 @@
with stdenv.lib;
-assert stdenv.isLinux -> utillinuxMinimal != null;
+assert stdenv.isLinux -> util-linuxMinimal != null;
# TODO:
# * Make it build without python
@@ -94,7 +94,7 @@ stdenv.mkDerivation rec {
bash gnum4 # install glib-gettextize and m4 macros for other apps to use
] ++ optionals stdenv.isLinux [
libselinux
- utillinuxMinimal # for libmount
+ util-linuxMinimal # for libmount
] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
AppKit Carbon Cocoa CoreFoundation CoreServices Foundation
]);
diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix
index 2436fc4afcb2f..d3d50fd6d652a 100644
--- a/pkgs/development/libraries/gnutls/default.nix
+++ b/pkgs/development/libraries/gnutls/default.nix
@@ -1,6 +1,6 @@
{ config, lib, stdenv, fetchurl, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
, perl, gmp, autoconf, autogen, automake, libidn, p11-kit, libiconv
-, unbound, dns-root-data, gettext, cacert, utillinux
+, unbound, dns-root-data, gettext, cacert, util-linux
, guileBindings ? config.gnutls.guile or false, guile
, tpmSupport ? false, trousers, which, nettools, libunistring
, withSecurity ? false, Security # darwin Security.framework
@@ -75,7 +75,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ perl pkgconfig ]
++ lib.optionals (isDarwin && !withSecurity) [ autoconf automake ]
- ++ lib.optionals doCheck [ which nettools utillinux ];
+ ++ lib.optionals doCheck [ which nettools util-linux ];
propagatedBuildInputs = [ nettle ];
diff --git a/pkgs/development/libraries/hyperscan/default.nix b/pkgs/development/libraries/hyperscan/default.nix
index 6e0d351b8bc82..17246f0aa0a94 100644
--- a/pkgs/development/libraries/hyperscan/default.nix
+++ b/pkgs/development/libraries/hyperscan/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, ragel, python3
-, coreutils, gnused, utillinux
+, coreutils, gnused, util-linux
, boost
, withStatic ? false # build only shared libs by default, build static+shared if true
}:
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
cmake ragel python3
# Consider simply using busybox for these
# Need at least: rev, sed, cut, nm
- coreutils gnused utillinux
+ coreutils gnused util-linux
];
cmakeFlags = [
diff --git a/pkgs/development/libraries/kpmcore/default.nix b/pkgs/development/libraries/kpmcore/default.nix
index 8cda52c4aecd5..1c00b6be2f201 100644
--- a/pkgs/development/libraries/kpmcore/default.nix
+++ b/pkgs/development/libraries/kpmcore/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, extra-cmake-modules
, qtbase, kio
, libatasmart, parted
-, utillinux }:
+, util-linux }:
stdenv.mkDerivation rec {
pname = "kpmcore";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
kio
- utillinux # needs blkid (note that this is not provided by utillinux-compat)
+ util-linux # needs blkid (note that this is not provided by util-linux-compat)
];
nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix
index 7628212800f42..39646db87ecdd 100644
--- a/pkgs/development/libraries/libblockdev/default.nix
+++ b/pkgs/development/libraries/libblockdev/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkgconfig, gtk-doc
, docbook_xml_dtd_43, python3, gobject-introspection, glib, udev, kmod, parted
-, cryptsetup, lvm2, dmraid, utillinux, libbytesize, libndctl, nss, volume_key
+, cryptsetup, lvm2, dmraid, util-linux, libbytesize, libndctl, nss, volume_key
, libxslt, docbook_xsl, gptfdisk, libyaml, autoconf-archive
, thin-provisioning-tools, makeWrapper
}:
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- glib udev kmod parted gptfdisk cryptsetup lvm2 dmraid utillinux libbytesize
+ glib udev kmod parted gptfdisk cryptsetup lvm2 dmraid util-linux libbytesize
libndctl nss volume_key libyaml
];
diff --git a/pkgs/development/libraries/libndctl/default.nix b/pkgs/development/libraries/libndctl/default.nix
index c0800c991c450..6ca6c30183167 100644
--- a/pkgs/development/libraries/libndctl/default.nix
+++ b/pkgs/development/libraries/libndctl/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, autoreconfHook
, asciidoctor, pkgconfig, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt
-, json_c, kmod, which, utillinux, udev, keyutils
+, json_c, kmod, which, util-linux, udev, keyutils
}:
stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
];
buildInputs =
- [ json_c kmod utillinux udev keyutils
+ [ json_c kmod util-linux udev keyutils
];
configureFlags =
diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix
index 6ea0e6be465b7..d3d73e46ac265 100644
--- a/pkgs/development/libraries/libseccomp/default.nix
+++ b/pkgs/development/libraries/libseccomp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, getopt, utillinux, gperf }:
+{ stdenv, fetchurl, getopt, util-linux, gperf }:
stdenv.mkDerivation rec {
pname = "libseccomp";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
patchShebangs .
'';
- checkInputs = [ utillinux ];
+ checkInputs = [ util-linux ];
doCheck = false; # dependency cycle
# Hack to ensure that patchelf --shrink-rpath get rids of a $TMPDIR reference.
diff --git a/pkgs/development/libraries/libvirt/5.9.0.nix b/pkgs/development/libraries/libvirt/5.9.0.nix
index 7a023d9489ed8..b880d36427450 100644
--- a/pkgs/development/libraries/libvirt/5.9.0.nix
+++ b/pkgs/development/libraries/libvirt/5.9.0.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, fetchgit
, pkgconfig, makeWrapper, libtool, autoconf, automake, fetchpatch
, coreutils, libxml2, gnutls, perl, python2, attr
-, iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext
+, iproute, iptables, readline, lvm2, util-linux, systemd, libpciaccess, gettext
, libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor
, dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages
, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, glib, rpcsvc-proto, libtirpc
@@ -40,7 +40,7 @@ in stdenv.mkDerivation rec {
] ++ optionals (!buildFromTarball) [
libtool autoconf automake
] ++ optionals stdenv.isLinux [
- libpciaccess lvm2 utillinux systemd libnl numad zfs
+ libpciaccess lvm2 util-linux systemd libnl numad zfs
libapparmor libcap_ng numactl attr parted libtirpc
] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [
xen
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 642baba43767b..224168888c021 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, fetchgit
, pkgconfig, makeWrapper, autoreconfHook, fetchpatch
, coreutils, libxml2, gnutls, perl, python2, attr, glib, docutils
-, iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext
+, iproute, iptables, readline, lvm2, util-linux, systemd, libpciaccess, gettext
, libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor
, dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages
, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, dbus, libtirpc, rpcsvc-proto, darwin
@@ -47,7 +47,7 @@ in stdenv.mkDerivation rec {
libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl
libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib dbus
] ++ optionals stdenv.isLinux [
- libpciaccess lvm2 utillinux systemd libnl numad zfs
+ libpciaccess lvm2 util-linux systemd libnl numad zfs
libapparmor libcap_ng numactl attr parted libtirpc
] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [
xen
diff --git a/pkgs/development/libraries/libxsmm/default.nix b/pkgs/development/libraries/libxsmm/default.nix
index 394347277f6af..30f060405f089 100644
--- a/pkgs/development/libraries/libxsmm/default.nix
+++ b/pkgs/development/libraries/libxsmm/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, coreutils, gfortran, gnused
-, python3, utillinux, which
+, python3, util-linux, which
, enableStatic ? false
}:
@@ -22,7 +22,7 @@ in stdenv.mkDerivation {
gfortran
gnused
python3
- utillinux
+ util-linux
which
];
diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix
index fbf399cb246e1..483b8eeb2065b 100644
--- a/pkgs/development/libraries/speechd/default.nix
+++ b/pkgs/development/libraries/speechd/default.nix
@@ -7,7 +7,7 @@
, itstool
, libtool
, texinfo
-, utillinux
+, util-linux
, autoreconfHook
, glib
, dotconf
@@ -49,7 +49,7 @@ in stdenv.mkDerivation rec {
patches = [
(substituteAll {
src = ./fix-paths.patch;
- inherit utillinux;
+ utillinux = util-linux;
})
];
diff --git a/pkgs/development/libraries/volume-key/default.nix b/pkgs/development/libraries/volume-key/default.nix
index 7ac5a4370107b..084b42c9a2dcd 100644
--- a/pkgs/development/libraries/volume-key/default.nix
+++ b/pkgs/development/libraries/volume-key/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchgit, autoreconfHook, pkgconfig, gettext, python3
-, ncurses, swig, glib, utillinux, cryptsetup, nss, gpgme
+, ncurses, swig, glib, util-linux, cryptsetup, nss, gpgme
, autoconf, automake, libtool
, buildPackages
}:
@@ -20,7 +20,7 @@ in stdenv.mkDerivation {
nativeBuildInputs = [ autoconf automake libtool pkgconfig gettext swig ];
- buildInputs = [ autoreconfHook glib cryptsetup nss utillinux gpgme ncurses ];
+ buildInputs = [ autoreconfHook glib cryptsetup nss util-linux gpgme ncurses ];
configureFlags = [
"--with-gpgme-prefix=${gpgme.dev}"
diff --git a/pkgs/development/misc/google-clasp/google-clasp.nix b/pkgs/development/misc/google-clasp/google-clasp.nix
index a527491777bc4..be260edb643af 100644
--- a/pkgs/development/misc/google-clasp/google-clasp.nix
+++ b/pkgs/development/misc/google-clasp/google-clasp.nix
@@ -6,7 +6,7 @@
let
nodeEnv = import ../../node-packages/node-env.nix {
- inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+ inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
inherit nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
diff --git a/pkgs/development/mobile/abootimg/default.nix b/pkgs/development/mobile/abootimg/default.nix
index fb74d79e7a714..21d24004645ce 100644
--- a/pkgs/development/mobile/abootimg/default.nix
+++ b/pkgs/development/mobile/abootimg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, coreutils, cpio, findutils, gzip, makeWrapper, utillinux }:
+{ stdenv, fetchFromGitHub, coreutils, cpio, findutils, gzip, makeWrapper, util-linux }:
let
version = "0.6";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
sha256 = "1qgx9fxwhylgnixzkz2mzv2707f65qq7rar2rsqak536vhig1z9a";
};
- nativeBuildInputs = [ makeWrapper utillinux ];
+ nativeBuildInputs = [ makeWrapper util-linux ];
postPatch = ''
cat < version.h
diff --git a/pkgs/development/node-packages/composition.nix b/pkgs/development/node-packages/composition.nix
index c970861a86f0d..17879f381d57e 100644
--- a/pkgs/development/node-packages/composition.nix
+++ b/pkgs/development/node-packages/composition.nix
@@ -6,7 +6,7 @@
let
nodeEnv = import ./node-env.nix {
- inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+ inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
inherit nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix
index e1abf53049350..04e3ee097fae8 100644
--- a/pkgs/development/node-packages/node-env.nix
+++ b/pkgs/development/node-packages/node-env.nix
@@ -1,6 +1,6 @@
# This file originates from node2nix
-{stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}:
+{stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}:
let
python = if nodejs ? python then nodejs.python else python2;
@@ -396,7 +396,7 @@ let
stdenv.mkDerivation ({
name = "node_${name}-${version}";
buildInputs = [ tarWrapper python nodejs ]
- ++ stdenv.lib.optional (stdenv.isLinux) utillinux
+ ++ stdenv.lib.optional (stdenv.isLinux) util-linux
++ stdenv.lib.optional (stdenv.isDarwin) libtool
++ buildInputs;
@@ -470,7 +470,7 @@ let
name = "node-dependencies-${name}-${version}";
buildInputs = [ tarWrapper python nodejs ]
- ++ stdenv.lib.optional (stdenv.isLinux) utillinux
+ ++ stdenv.lib.optional (stdenv.isLinux) util-linux
++ stdenv.lib.optional (stdenv.isDarwin) libtool
++ buildInputs;
@@ -516,7 +516,7 @@ let
stdenv.mkDerivation {
name = "node-shell-${name}-${version}";
- buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
+ buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) util-linux ++ buildInputs;
buildCommand = ''
mkdir -p $out/bin
cat > $out/bin/shell < $out/bin/shell < $out/usr/bin/brprintconf_mfcj6510dw_patched
diff --git a/pkgs/misc/drivers/hplip/3.16.11.nix b/pkgs/misc/drivers/hplip/3.16.11.nix
index 452c2c425c1d7..4b9f47d88f94d 100644
--- a/pkgs/misc/drivers/hplip/3.16.11.nix
+++ b/pkgs/misc/drivers/hplip/3.16.11.nix
@@ -2,7 +2,7 @@
, pkgconfig
, cups, libjpeg, libusb1, python2Packages, sane-backends, dbus, usbutils
, net-snmp, openssl, nettools
-, bash, coreutils, utillinux
+, bash, coreutils, util-linux
, qtSupport ? true
, withPlugin ? false
}:
@@ -175,7 +175,7 @@ python2Packages.buildPythonApplication {
substituteInPlace $out/etc/udev/rules.d/56-hpmud.rules \
--replace {,${bash}}/bin/sh \
--replace /usr/bin/nohup "" \
- --replace {,${utillinux}/bin/}logger \
+ --replace {,${util-linux}/bin/}logger \
--replace {/usr,$out}/bin
'';
diff --git a/pkgs/misc/drivers/hplip/3.18.5.nix b/pkgs/misc/drivers/hplip/3.18.5.nix
index f9064720fb645..59b3d2b9d6342 100644
--- a/pkgs/misc/drivers/hplip/3.18.5.nix
+++ b/pkgs/misc/drivers/hplip/3.18.5.nix
@@ -3,7 +3,7 @@
, cups, zlib, libjpeg, libusb1, python2Packages, sane-backends
, dbus, file, ghostscript, usbutils
, net-snmp, openssl, perl, nettools
-, bash, coreutils, utillinux
+, bash, coreutils, util-linux
, withQt5 ? true
, withPlugin ? false
, withStaticPPDInstall ? false
@@ -212,7 +212,7 @@ python2Packages.buildPythonApplication {
substituteInPlace $out/etc/udev/rules.d/56-hpmud.rules \
--replace {,${bash}}/bin/sh \
--replace /usr/bin/nohup "" \
- --replace {,${utillinux}/bin/}logger \
+ --replace {,${util-linux}/bin/}logger \
--replace {/usr,$out}/bin
'';
diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index afd1f8f6fe4f6..b740f5091fa72 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -3,7 +3,7 @@
, cups, zlib, libjpeg, libusb1, python3Packages, sane-backends
, dbus, file, ghostscript, usbutils
, net-snmp, openssl, perl, nettools
-, bash, coreutils, utillinux
+, bash, coreutils, util-linux
# To remove references to gcc-unwrapped
, removeReferencesTo, qt5
, withQt5 ? true
@@ -219,7 +219,7 @@ python3Packages.buildPythonApplication {
substituteInPlace $out/etc/udev/rules.d/56-hpmud.rules \
--replace {,${bash}}/bin/sh \
--replace /usr/bin/nohup "" \
- --replace {,${utillinux}/bin/}logger \
+ --replace {,${util-linux}/bin/}logger \
--replace {/usr,$out}/bin
remove-references-to -t ${stdenv.cc.cc} $(readlink -f $out/lib/*.so)
'' + stdenv.lib.optionalString withQt5 ''
diff --git a/pkgs/misc/emulators/cdemu/libmirage.nix b/pkgs/misc/emulators/cdemu/libmirage.nix
index cc3118ace151e..e824e19347a6e 100644
--- a/pkgs/misc/emulators/cdemu/libmirage.nix
+++ b/pkgs/misc/emulators/cdemu/libmirage.nix
@@ -1,6 +1,6 @@
{ callPackage, gobject-introspection, cmake, pkgconfig
, glib, libsndfile, zlib, bzip2, lzma, libsamplerate, intltool
-, pcre, utillinux, libselinux, libsepol }:
+, pcre, util-linux, libselinux, libsepol }:
let pkg = import ./base.nix {
version = "3.2.3";
@@ -13,6 +13,6 @@ in callPackage pkg {
PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "out"}/share/gir-1.0";
PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0";
nativeBuildInputs = [ cmake gobject-introspection pkgconfig ];
- propagatedBuildInputs = [ pcre utillinux libselinux libsepol ];
+ propagatedBuildInputs = [ pcre util-linux libselinux libsepol ];
};
}
diff --git a/pkgs/misc/emulators/qmc2/default.nix b/pkgs/misc/emulators/qmc2/default.nix
index d089ddf2695b4..5a813c5d2efe2 100644
--- a/pkgs/misc/emulators/qmc2/default.nix
+++ b/pkgs/misc/emulators/qmc2/default.nix
@@ -3,7 +3,7 @@
, minizip, zlib
, qtbase, qtsvg, qtmultimedia, qtwebkit, qttranslations, qtxmlpatterns
, rsync, SDL2, xwininfo
-, utillinux
+, util-linux
, xorg
}:
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ qttools pkgconfig ];
buildInputs = [ minizip qtbase qtsvg qtmultimedia qtwebkit
qttranslations qtxmlpatterns rsync SDL2
- xwininfo zlib utillinux xorg.libxcb ];
+ xwininfo zlib util-linux xorg.libxcb ];
makeFlags = [ "DESTDIR=$(out)"
"PREFIX=/"
diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/misc/emulators/wine/staging.nix
index f3b9fa3042041..a628f5ded58b7 100644
--- a/pkgs/misc/emulators/wine/staging.nix
+++ b/pkgs/misc/emulators/wine/staging.nix
@@ -8,7 +8,7 @@ let patch = (callPackage ./sources.nix {}).staging;
in assert stdenv.lib.getVersion wineUnstable == patch.version;
(stdenv.lib.overrideDerivation wineUnstable (self: {
- buildInputs = build-inputs [ "perl" "utillinux" "autoconf" "gitMinimal" ] self.buildInputs;
+ buildInputs = build-inputs [ "perl" "util-linux" "autoconf" "gitMinimal" ] self.buildInputs;
name = "${self.name}-staging";
diff --git a/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix b/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix
index 446fedeffec41..c49f798899fed 100644
--- a/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix
+++ b/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix
@@ -2,7 +2,7 @@
# -
# -
{ lib, gccStdenv, vscode-utils, autoPatchelfHook, bash, file, makeWrapper, dotnet-sdk_3
-, curl, gcc, icu, libkrb5, libsecret, libunwind, libX11, lttng-ust, openssl, utillinux, zlib
+, curl, gcc, icu, libkrb5, libsecret, libunwind, libX11, lttng-ust, openssl, util-linux, zlib
, desktop-file-utils, xprop
}:
@@ -30,7 +30,7 @@ let
# General
gcc.cc.lib
- utillinux # libuuid
+ util-linux # libuuid
];
in ((vscode-utils.override { stdenv = gccStdenv; }).buildVscodeMarketplaceExtension {
diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix
index 3db9a7d3005c1..dcdafb98d707d 100644
--- a/pkgs/os-specific/linux/displaylink/default.nix
+++ b/pkgs/os-specific/linux/displaylink/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, unzip, utillinux,
+{ stdenv, lib, unzip, util-linux,
libusb1, evdi, systemd, makeWrapper, requireFile, substituteAll }:
let
@@ -7,7 +7,7 @@ let
else if stdenv.hostPlatform.system == "i686-linux" then "x86"
else throw "Unsupported architecture";
bins = "${arch}-ubuntu-1604";
- libPath = lib.makeLibraryPath [ stdenv.cc.cc utillinux libusb1 evdi ];
+ libPath = lib.makeLibraryPath [ stdenv.cc.cc util-linux libusb1 evdi ];
in stdenv.mkDerivation rec {
pname = "displaylink";
diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix
index d087a9e2e26de..696dfd275c742 100644
--- a/pkgs/os-specific/linux/eudev/default.nix
+++ b/pkgs/os-specific/linux/eudev/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, glib, gperf, utillinux, kmod}:
+{stdenv, fetchurl, pkgconfig, glib, gperf, util-linux, kmod}:
let
s = # Generated upstream information
rec {
@@ -11,7 +11,7 @@ let
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- glib gperf utillinux kmod
+ glib gperf util-linux kmod
];
in
stdenv.mkDerivation {
diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix
index 19c64106701ea..b40bd84cbb8db 100644
--- a/pkgs/os-specific/linux/fuse/common.nix
+++ b/pkgs/os-specific/linux/fuse/common.nix
@@ -1,7 +1,7 @@
{ version, sha256Hash }:
{ stdenv, fetchFromGitHub, fetchpatch
-, fusePackages, utillinux, gettext
+, fusePackages, util-linux, gettext
, meson, ninja, pkg-config
, autoreconfHook
, python3Packages, which
@@ -54,7 +54,7 @@ in stdenv.mkDerivation rec {
# $PATH, so it should also work on non-NixOS systems.
export NIX_CFLAGS_COMPILE="-DFUSERMOUNT_DIR=\"/run/wrappers/bin\""
- sed -e 's@/bin/@${utillinux}/bin/@g' -i lib/mount_util.c
+ sed -e 's@/bin/@${util-linux}/bin/@g' -i lib/mount_util.c
'' + (if isFuse3 then ''
# The configure phase will delete these files (temporary workaround for
# ./fuse3-install_man.patch)
diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix
index 7549f379f8a7d..f159a4cbf775e 100644
--- a/pkgs/os-specific/linux/fuse/default.nix
+++ b/pkgs/os-specific/linux/fuse/default.nix
@@ -1,8 +1,8 @@
-{ callPackage, utillinux }:
+{ callPackage, util-linux }:
let
mkFuse = args: callPackage (import ./common.nix args) {
- inherit utillinux;
+ inherit util-linux;
};
in {
fuse_2 = mkFuse {
diff --git a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix
index ba37c71d13455..a272bd286f32a 100644
--- a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, libelf, utillinux, ... } @ args:
+{ stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, libelf, util-linux, ... } @ args:
buildLinux (args // rec {
version = "4.14.165-172";
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 961bdab12b58c..3bdb8c4f2973f 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -302,7 +302,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches
nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr ]
++ optional (stdenv.hostPlatform.platform.kernelTarget == "uImage") buildPackages.ubootTools
++ optional (stdenv.lib.versionAtLeast version "4.14" && stdenv.lib.versionOlder version "5.8") libelf
- # Removed utillinuxMinimal since it should not be a dependency.
+ # Removed util-linuxMinimal since it should not be a dependency.
++ optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ]
++ optional (stdenv.lib.versionAtLeast version "5.2") cpio
++ optional (stdenv.lib.versionAtLeast version "5.8") elfutils
diff --git a/pkgs/os-specific/linux/ldm/default.nix b/pkgs/os-specific/linux/ldm/default.nix
index bbc341caf11f9..352ce53533779 100644
--- a/pkgs/os-specific/linux/ldm/default.nix
+++ b/pkgs/os-specific/linux/ldm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, udev, utillinux, mountPath ? "/media/" }:
+{ stdenv, fetchgit, udev, util-linux, mountPath ? "/media/" }:
assert mountPath != "";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
sha256 = "0lxfypnbamfx6p9ar5k9wra20gvwn665l4pp2j4vsx4yi5q7rw2n";
};
- buildInputs = [ udev utillinux ];
+ buildInputs = [ udev util-linux ];
postPatch = ''
substituteInPlace ldm.c \
diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix
index 7bbd1768c0439..6f1290cf07051 100644
--- a/pkgs/os-specific/linux/lvm2/default.nix
+++ b/pkgs/os-specific/linux/lvm2/default.nix
@@ -2,7 +2,7 @@
, fetchpatch
, fetchurl
, pkgconfig
-, utillinux
+, util-linux
, libuuid
, thin-provisioning-tools, libaio
, enableCmdlib ? false
diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix
index 0067f0881aea6..8fdb72e060f71 100644
--- a/pkgs/os-specific/linux/lxcfs/default.nix
+++ b/pkgs/os-specific/linux/lxcfs/default.nix
@@ -1,5 +1,5 @@
{ config, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, fuse
-, utillinux, makeWrapper
+, util-linux, makeWrapper
, enableDebugBuild ? config.lxcfs.enableDebugBuild or false }:
with stdenv.lib;
@@ -30,9 +30,9 @@ stdenv.mkDerivation rec {
installFlags = [ "SYSTEMD_UNIT_DIR=\${out}/lib/systemd" ];
postInstall = ''
- # `mount` hook requires access to the `mount` command from `utillinux`:
+ # `mount` hook requires access to the `mount` command from `util-linux`:
wrapProgram "$out/share/lxcfs/lxc.mount.hook" \
- --prefix PATH : "${utillinux}/bin"
+ --prefix PATH : "${util-linux}/bin"
'';
postFixup = ''
diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix
index 9ead1f6ad4bd8..f0ef1126154ab 100644
--- a/pkgs/os-specific/linux/mcelog/default.nix
+++ b/pkgs/os-specific/linux/mcelog/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, utillinux }:
+{ stdenv, fetchFromGitHub, util-linux }:
stdenv.mkDerivation rec {
pname = "mcelog";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
substituteInPlace Makefile --replace '"unknown"' '"${version}"'
for i in triggers/*; do
- substituteInPlace $i --replace 'logger' '${utillinux}/bin/logger'
+ substituteInPlace $i --replace 'logger' '${util-linux}/bin/logger'
done
'';
diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix
index 6a71196157b70..2fbe05557a2f5 100644
--- a/pkgs/os-specific/linux/mdadm/default.nix
+++ b/pkgs/os-specific/linux/mdadm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, utillinux, coreutils, fetchurl, groff, system-sendmail }:
+{ stdenv, util-linux, coreutils, fetchurl, groff, system-sendmail }:
stdenv.mkDerivation rec {
name = "mdadm-4.1";
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
-e 's@/usr/sbin/sendmail@${system-sendmail}/bin/sendmail@' -i Makefile
sed -i \
-e 's@/usr/bin/basename@${coreutils}/bin/basename@g' \
- -e 's@BINDIR/blkid@${utillinux}/bin/blkid@g' \
+ -e 's@BINDIR/blkid@${util-linux}/bin/blkid@g' \
*.rules
'';
diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix
index 81ec7e5a661ec..86b0981c5fa30 100644
--- a/pkgs/os-specific/linux/nfs-utils/default.nix
+++ b/pkgs/os-specific/linux/nfs-utils/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, fetchpatch, lib, pkgconfig, utillinux, libcap, libtirpc, libevent
+{ stdenv, fetchurl, fetchpatch, lib, pkgconfig, util-linux, libcap, libtirpc, libevent
, sqlite, kerberos, kmod, libuuid, keyutils, lvm2, systemd, coreutils, tcp_wrappers
, python3, buildPackages, nixosTests, rpcsvc-proto
, enablePython ? true
}:
let
- statdPath = lib.makeBinPath [ systemd utillinux coreutils ];
+ statdPath = lib.makeBinPath [ systemd util-linux coreutils ];
in
stdenv.mkDerivation rec {
diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix
index 6314dcea62d2c..b8aa251489dc0 100644
--- a/pkgs/os-specific/linux/open-iscsi/default.nix
+++ b/pkgs/os-specific/linux/open-iscsi/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, automake, autoconf, libtool, gettext
-, utillinux, openisns, openssl, kmod, perl, systemd, pkgconf
+, util-linux, openisns, openssl, kmod, perl, systemd, pkgconf
}:
stdenv.mkDerivation rec {
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "2.1.2";
nativeBuildInputs = [ autoconf automake gettext libtool perl pkgconf ];
- buildInputs = [ kmod openisns.lib openssl systemd utillinux ];
+ buildInputs = [ kmod openisns.lib openssl systemd util-linux ];
src = fetchFromGitHub {
owner = "open-iscsi";
diff --git a/pkgs/os-specific/linux/openrazer/driver.nix b/pkgs/os-specific/linux/openrazer/driver.nix
index a6bf67db09808..ef96c7697e777 100644
--- a/pkgs/os-specific/linux/openrazer/driver.nix
+++ b/pkgs/os-specific/linux/openrazer/driver.nix
@@ -2,7 +2,7 @@
, fetchFromGitHub
, kernel
, stdenv
-, utillinux
+, util-linux
}:
let
@@ -28,7 +28,7 @@ stdenv.mkDerivation (common // {
substituteInPlace $RAZER_RULES_OUT \
--replace razer_mount $RAZER_MOUNT_OUT
substituteInPlace $RAZER_MOUNT_OUT \
- --replace /usr/bin/logger ${utillinux}/bin/logger \
+ --replace /usr/bin/logger ${util-linux}/bin/logger \
--replace chgrp ${coreutils}/bin/chgrp \
--replace "PATH='/sbin:/bin:/usr/sbin:/usr/bin'" ""
'';
diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix
index 33b252a022540..84f8abf73b0f8 100644
--- a/pkgs/os-specific/linux/openvswitch/default.nix
+++ b/pkgs/os-specific/linux/openvswitch/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, pkgconfig, utillinux, which
+{ stdenv, fetchurl, makeWrapper, pkgconfig, util-linux, which
, procps, libcap_ng, openssl, python3 , perl
, kernel ? null }:
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
kernel = optional (_kernel != null) _kernel.dev;
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ makeWrapper utillinux openssl libcap_ng pythonEnv
+ buildInputs = [ makeWrapper util-linux openssl libcap_ng pythonEnv
perl procps which ];
configureFlags = [
diff --git a/pkgs/os-specific/linux/openvswitch/lts.nix b/pkgs/os-specific/linux/openvswitch/lts.nix
index 358a8b39917bf..54ecefc54b2f4 100644
--- a/pkgs/os-specific/linux/openvswitch/lts.nix
+++ b/pkgs/os-specific/linux/openvswitch/lts.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, pkgconfig, utillinux, which
+{ stdenv, fetchurl, makeWrapper, pkgconfig, util-linux, which
, procps, libcap_ng, openssl, python2, iproute , perl
, automake, autoconf, libtool, kernel ? null }:
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
kernel = optional (_kernel != null) _kernel.dev;
nativeBuildInputs = [ autoconf libtool automake pkgconfig ];
- buildInputs = [ makeWrapper utillinux openssl libcap_ng python2
+ buildInputs = [ makeWrapper util-linux openssl libcap_ng python2
perl procps which ];
preConfigure = "./boot.sh";
diff --git a/pkgs/os-specific/linux/pam_mount/default.nix b/pkgs/os-specific/linux/pam_mount/default.nix
index 3e026be6abb26..ebfd896555ae5 100644
--- a/pkgs/os-specific/linux/pam_mount/default.nix
+++ b/pkgs/os-specific/linux/pam_mount/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, pkgconfig, libtool, pam, libHX, libxml2, pcre, perl, openssl, cryptsetup, utillinux }:
+{ stdenv, fetchurl, autoreconfHook, pkgconfig, libtool, pam, libHX, libxml2, pcre, perl, openssl, cryptsetup, util-linux }:
stdenv.mkDerivation rec {
pname = "pam_mount";
@@ -16,12 +16,12 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace src/mtcrypt.c \
- --replace @@NIX_UTILLINUX@@ ${utillinux}/bin
+ --replace @@NIX_UTILLINUX@@ ${util-linux}/bin
'';
nativeBuildInputs = [ autoreconfHook libtool pkgconfig ];
- buildInputs = [ pam libHX utillinux libxml2 pcre perl openssl cryptsetup ];
+ buildInputs = [ pam libHX util-linux libxml2 pcre perl openssl cryptsetup ];
enableParallelBuilding = true;
diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/os-specific/linux/pktgen/default.nix
index 41db6e936615a..a883935b7b954 100644
--- a/pkgs/os-specific/linux/pktgen/default.nix
+++ b/pkgs/os-specific/linux/pktgen/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, meson, ninja, pkgconfig
-, dpdk, libbsd, libpcap, lua5_3, numactl, utillinux
+, dpdk, libbsd, libpcap, lua5_3, numactl, util-linux
, gtk2, which, withGtk ? false
}:
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
patches = [ ./configure.patch ];
postPatch = ''
- substituteInPlace lib/common/lscpu.h --replace /usr/bin/lscpu ${utillinux}/bin/lscpu
+ substituteInPlace lib/common/lscpu.h --replace /usr/bin/lscpu ${util-linux}/bin/lscpu
'';
postInstall = ''
diff --git a/pkgs/os-specific/linux/pm-utils/default.nix b/pkgs/os-specific/linux/pm-utils/default.nix
index 1d8314923d374..e685402d47390 100644
--- a/pkgs/os-specific/linux/pm-utils/default.nix
+++ b/pkgs/os-specific/linux/pm-utils/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, coreutils, gnugrep, utillinux, kmod
+{ stdenv, fetchurl, coreutils, gnugrep, util-linux, kmod
, procps, kbd, dbus }:
let
binPath = stdenv.lib.makeBinPath
- [ coreutils gnugrep utillinux kmod procps kbd dbus ];
+ [ coreutils gnugrep util-linux kmod procps kbd dbus ];
sbinPath = stdenv.lib.makeSearchPathOutput "bin" "sbin"
[ procps ];
diff --git a/pkgs/os-specific/linux/pmount/default.nix b/pkgs/os-specific/linux/pmount/default.nix
index 63d0c88c1f8e9..01624bff53594 100644
--- a/pkgs/os-specific/linux/pmount/default.nix
+++ b/pkgs/os-specific/linux/pmount/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, intltool, ntfs3g, utillinux
+{ stdenv, fetchurl, intltool, ntfs3g, util-linux
, mediaDir ? "/media/"
, lockDir ? "/var/lock/pmount"
, whiteList ? "/etc/pmount.allow"
@@ -16,14 +16,14 @@ stdenv.mkDerivation rec {
sha256 = "db38fc290b710e8e9e9d442da2fb627d41e13b3ee80326c15cc2595ba00ea036";
};
- buildInputs = [ intltool utillinux ];
+ buildInputs = [ intltool util-linux ];
configureFlags = [
"--with-media-dir=${mediaDir}"
"--with-lock-dir=${lockDir}"
"--with-whitelist=${whiteList}"
- "--with-mount-prog=${utillinux}/bin/mount"
- "--with-umount-prog=${utillinux}/bin/umount"
+ "--with-mount-prog=${util-linux}/bin/mount"
+ "--with-umount-prog=${util-linux}/bin/umount"
"--with-mount-ntfs3g=${ntfs3g}/sbin/mount.ntfs-3g"
];
diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix
index e71dcb497a26b..9b0e38198a33d 100644
--- a/pkgs/os-specific/linux/prl-tools/default.nix
+++ b/pkgs/os-specific/linux/prl-tools/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, makeWrapper, p7zip
-, gawk, utillinux, xorg, glib, dbus-glib, zlib
+, gawk, util-linux, xorg, glib, dbus-glib, zlib
, kernel ? null, libsOnly ? false
, undmg, fetchurl
}:
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
kernelVersion = if libsOnly then "" else lib.getName kernel.name;
kernelDir = if libsOnly then "" else "${kernel.dev}/lib/modules/${kernelVersion}";
- scriptPath = lib.concatStringsSep ":" (lib.optionals (!libsOnly) [ "${utillinux}/bin" "${gawk}/bin" ]);
+ scriptPath = lib.concatStringsSep ":" (lib.optionals (!libsOnly) [ "${util-linux}/bin" "${gawk}/bin" ]);
buildPhase = ''
if test -z "$libsOnly"; then
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 85c78ce1421ba..13b52b86ff432 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -18,7 +18,7 @@
# Mandatory dependencies
, libcap
-, utillinux
+, util-linux
, kbd
, kmod
@@ -277,9 +277,9 @@ stdenv.mkDerivation {
"-Dkill-path=${coreutils}/bin/kill"
"-Dkmod-path=${kmod}/bin/kmod"
- "-Dsulogin-path=${utillinux}/bin/sulogin"
- "-Dmount-path=${utillinux}/bin/mount"
- "-Dumount-path=${utillinux}/bin/umount"
+ "-Dsulogin-path=${util-linux}/bin/sulogin"
+ "-Dmount-path=${util-linux}/bin/mount"
+ "-Dumount-path=${util-linux}/bin/umount"
"-Dcreate-log-dirs=false"
# Upstream uses cgroupsv2 by default. To support docker and other
# container managers we still need v1.
@@ -326,12 +326,12 @@ stdenv.mkDerivation {
test -e $i
substituteInPlace $i \
--replace /usr/bin/getent ${getent}/bin/getent \
- --replace /sbin/mkswap ${lib.getBin utillinux}/sbin/mkswap \
- --replace /sbin/swapon ${lib.getBin utillinux}/sbin/swapon \
- --replace /sbin/swapoff ${lib.getBin utillinux}/sbin/swapoff \
+ --replace /sbin/mkswap ${lib.getBin util-linux}/sbin/mkswap \
+ --replace /sbin/swapon ${lib.getBin util-linux}/sbin/swapon \
+ --replace /sbin/swapoff ${lib.getBin util-linux}/sbin/swapoff \
--replace /bin/echo ${coreutils}/bin/echo \
--replace /bin/cat ${coreutils}/bin/cat \
- --replace /sbin/sulogin ${lib.getBin utillinux}/sbin/sulogin \
+ --replace /sbin/sulogin ${lib.getBin util-linux}/sbin/sulogin \
--replace /sbin/modprobe ${lib.getBin kmod}/sbin/modprobe \
--replace /usr/lib/systemd/systemd-fsck $out/lib/systemd/systemd-fsck \
--replace /bin/plymouth /run/current-system/sw/bin/plymouth # To avoid dependency
diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix
index ccf341e212fe4..9a21aab9f256f 100644
--- a/pkgs/os-specific/linux/tomb/default.nix
+++ b/pkgs/os-specific/linux/tomb/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper
-, gettext, zsh, pinentry, cryptsetup, gnupg, utillinux, e2fsprogs, sudo
+, gettext, zsh, pinentry, cryptsetup, gnupg, util-linux, e2fsprogs, sudo
}:
stdenv.mkDerivation rec {
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
install -Dm644 doc/tomb.1 $out/share/man/man1/tomb.1
wrapProgram $out/bin/tomb \
- --prefix PATH : $out/bin:${lib.makeBinPath [ cryptsetup gettext gnupg pinentry utillinux e2fsprogs ]}
+ --prefix PATH : $out/bin:${lib.makeBinPath [ cryptsetup gettext gnupg pinentry util-linux e2fsprogs ]}
'';
meta = with stdenv.lib; {
diff --git a/pkgs/os-specific/linux/udisks/1-default.nix b/pkgs/os-specific/linux/udisks/1-default.nix
index f8876e5d155a2..725706f9b0eb1 100644
--- a/pkgs/os-specific/linux/udisks/1-default.nix
+++ b/pkgs/os-specific/linux/udisks/1-default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, sg3_utils, udev, glib, dbus, dbus-glib
, polkit, parted, lvm2, libatasmart, intltool, libuuid, mdadm
-, libxslt, docbook_xsl, utillinux, libgudev }:
+, libxslt, docbook_xsl, util-linux, libgudev }:
stdenv.mkDerivation rec {
name = "udisks-1.0.5";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
substituteInPlace src/main.c --replace \
"/sbin:/bin:/usr/sbin:/usr/bin" \
- "${utillinux}/bin:${mdadm}/sbin:/run/current-system/sw/bin:/run/current-system/sw/bin"
+ "${util-linux}/bin:${mdadm}/sbin:/run/current-system/sw/bin:/run/current-system/sw/bin"
'';
buildInputs =
diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix
index 3b502dbe48f50..b47d31ab6fdc5 100644
--- a/pkgs/os-specific/linux/udisks/2-default.nix
+++ b/pkgs/os-specific/linux/udisks/2-default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, fetchpatch, substituteAll, libtool, pkgconfig, gettext, gnused
, gtk-doc, acl, systemd, glib, libatasmart, polkit, coreutils, bash, which
-, expat, libxslt, docbook_xsl, utillinux, mdadm, libgudev, libblockdev, parted
+, expat, libxslt, docbook_xsl, util-linux, mdadm, libgudev, libblockdev, parted
, gobject-introspection, docbook_xml_dtd_412, docbook_xml_dtd_43, autoconf, automake
, xfsprogs, f2fs-tools, dosfstools, e2fsprogs, btrfs-progs, exfat, nilfs-utils, ntfs3g
}:
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
(substituteAll {
src = ./fix-paths.patch;
bash = "${bash}/bin/bash";
- blkid = "${utillinux}/bin/blkid";
+ blkid = "${util-linux}/bin/blkid";
false = "${coreutils}/bin/false";
mdadm = "${mdadm}/bin/mdadm";
sed = "${gnused}/bin/sed";
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
src = ./force-path.patch;
path = stdenv.lib.makeBinPath [
btrfs-progs coreutils dosfstools e2fsprogs exfat f2fs-tools nilfs-utils
- xfsprogs ntfs3g parted utillinux
+ xfsprogs ntfs3g parted util-linux
];
})
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 80fb7389877a1..5406dcf77eba7 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, fetchpatch
-, autoreconfHook, utillinux, nukeReferences, coreutils
+, autoreconfHook, util-linux, nukeReferences, coreutils
, perl, buildPackages
, configFile ? "all"
@@ -50,11 +50,11 @@ let
# The arrays must remain the same length, so we repeat a flag that is
# already part of the command and therefore has no effect.
substituteInPlace ./module/${optionalString isUnstable "os/linux/"}zfs/zfs_ctldir.c \
- --replace '"/usr/bin/env", "umount"' '"${utillinux}/bin/umount", "-n"' \
- --replace '"/usr/bin/env", "mount"' '"${utillinux}/bin/mount", "-n"'
+ --replace '"/usr/bin/env", "umount"' '"${util-linux}/bin/umount", "-n"' \
+ --replace '"/usr/bin/env", "mount"' '"${util-linux}/bin/mount", "-n"'
'' + optionalString buildUser ''
- substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/umount" "${utillinux}/bin/umount" \
- --replace "/bin/mount" "${utillinux}/bin/mount"
+ substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/umount" "${util-linux}/bin/umount" \
+ --replace "/bin/mount" "${util-linux}/bin/mount"
substituteInPlace ./lib/libshare/${optionalString isUnstable "os/linux/"}nfs.c --replace "/usr/sbin/exportfs" "${
# We don't *need* python support, but we set it like this to minimize closure size:
# If it's disabled by default, no need to enable it, even if we have python enabled
@@ -142,7 +142,7 @@ let
postInstall = optionalString buildKernel ''
# Add reference that cannot be detected due to compressed kernel module
mkdir -p "$out/nix-support"
- echo "${utillinux}" >> "$out/nix-support/extra-refs"
+ echo "${util-linux}" >> "$out/nix-support/extra-refs"
'' + optionalString buildUser ''
# Remove provided services as they are buggy
rm $out/etc/systemd/system/zfs-import-*.service
@@ -162,7 +162,7 @@ let
'';
postFixup = let
- path = "PATH=${makeBinPath [ coreutils gawk gnused gnugrep utillinux smartmontools sysstat ]}:$PATH";
+ path = "PATH=${makeBinPath [ coreutils gawk gnused gnugrep util-linux smartmontools sysstat ]}:$PATH";
in ''
for i in $out/libexec/zfs/zpool.d/*; do
sed -i '2i${path}' $i
diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix
index ad047ba31f861..bdbb77faf6c1d 100644
--- a/pkgs/servers/apcupsd/default.nix
+++ b/pkgs/servers/apcupsd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, systemd, utillinux, coreutils, wall, hostname, man
+{ stdenv, fetchurl, pkgconfig, systemd, util-linux, coreutils, wall, hostname, man
, enableCgiScripts ? true, gd
}:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ utillinux man ] ++ stdenv.lib.optional enableCgiScripts gd;
+ buildInputs = [ util-linux man ] ++ stdenv.lib.optional enableCgiScripts gd;
prePatch = ''
sed -e "s,\$(INSTALL_PROGRAM) \$(STRIP),\$(INSTALL_PROGRAM)," \
diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix
index 9a393cdeb0094..6e960bd92fe9c 100644
--- a/pkgs/servers/asterisk/default.nix
+++ b/pkgs/servers/asterisk/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, fetchsvn,
jansson, libedit, libxml2, libxslt, ncurses, openssl, sqlite,
- utillinux, dmidecode, libuuid, newt,
+ util-linux, dmidecode, libuuid, newt,
lua, speex,
srtp, wget, curl, iksemel, pkgconfig
}:
@@ -14,7 +14,7 @@ let
dmidecode libuuid newt
lua speex
srtp wget curl iksemel ];
- nativeBuildInputs = [ utillinux pkgconfig ];
+ nativeBuildInputs = [ util-linux pkgconfig ];
patches = [
# We want the Makefile to install the default /var skeleton
diff --git a/pkgs/servers/computing/torque/default.nix b/pkgs/servers/computing/torque/default.nix
index 0941ca969223c..de358a5d66f82 100644
--- a/pkgs/servers/computing/torque/default.nix
+++ b/pkgs/servers/computing/torque/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, openssl, flex, bison, pkgconfig, groff, libxml2, utillinux
+{ stdenv, fetchFromGitHub, openssl, flex, bison, pkgconfig, groff, libxml2, util-linux
, coreutils, file, libtool, which, boost, autoreconfHook
}:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
strictDeps = true;
nativeBuildInputs = [ autoreconfHook pkgconfig flex bison libxml2 ];
buildInputs = [
- openssl groff libxml2 utillinux libtool
+ openssl groff libxml2 util-linux libtool
which boost
];
diff --git a/pkgs/servers/hylafaxplus/default.nix b/pkgs/servers/hylafaxplus/default.nix
index 9585ac46e5a31..1bbaacd584467 100644
--- a/pkgs/servers/hylafaxplus/default.nix
+++ b/pkgs/servers/hylafaxplus/default.nix
@@ -15,7 +15,7 @@
, libtiff
, psmisc
, sharutils
-, utillinux
+, util-linux
, zlib
## optional packages (using `null` disables some functionality)
, jbigkit ? null
@@ -76,7 +76,7 @@ stdenv.mkDerivation {
libtiff
psmisc # for `fuser` command
sharutils # for `uuencode` command
- utillinux # for `agetty` command
+ util-linux # for `agetty` command
zlib
jbigkit # optional
lcms2 # optional
diff --git a/pkgs/servers/matrix-appservice-discord/node-composition.nix b/pkgs/servers/matrix-appservice-discord/node-composition.nix
index 42b6358224cf3..6080388b05e81 100644
--- a/pkgs/servers/matrix-appservice-discord/node-composition.nix
+++ b/pkgs/servers/matrix-appservice-discord/node-composition.nix
@@ -6,7 +6,7 @@
let
nodeEnv = import ../../development/node-packages/node-env.nix {
- inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+ inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
inherit nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix
index 36da6132423c1..0f86a16aef504 100644
--- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix
+++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix
@@ -6,7 +6,7 @@
let
nodeEnv = import ../../../development/node-packages/node-env.nix {
- inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+ inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
inherit nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
diff --git a/pkgs/servers/search/elasticsearch/6.x.nix b/pkgs/servers/search/elasticsearch/6.x.nix
index 04e81fe150a9d..673167030dc17 100644
--- a/pkgs/servers/search/elasticsearch/6.x.nix
+++ b/pkgs/servers/search/elasticsearch/6.x.nix
@@ -4,7 +4,7 @@
, fetchurl
, makeWrapper
, jre_headless
-, utillinux, gnugrep, coreutils
+, util-linux, gnugrep, coreutils
, autoPatchelfHook
, zlib
}:
@@ -35,7 +35,7 @@ stdenv.mkDerivation (rec {
"ES_CLASSPATH=\"\$ES_CLASSPATH:$out/\$additional_classpath_directory/*\""
'';
- buildInputs = [ makeWrapper jre_headless utillinux ]
+ buildInputs = [ makeWrapper jre_headless util-linux ]
++ optional enableUnfree zlib;
installPhase = ''
@@ -45,7 +45,7 @@ stdenv.mkDerivation (rec {
chmod -x $out/bin/*.*
wrapProgram $out/bin/elasticsearch \
- --prefix PATH : "${makeBinPath [ utillinux gnugrep coreutils ]}" \
+ --prefix PATH : "${makeBinPath [ util-linux gnugrep coreutils ]}" \
--set JAVA_HOME "${jre_headless}"
wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre_headless}"
diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/pkgs/servers/search/elasticsearch/7.x.nix
index 73a947066bfa6..c3d50f8fbddd0 100644
--- a/pkgs/servers/search/elasticsearch/7.x.nix
+++ b/pkgs/servers/search/elasticsearch/7.x.nix
@@ -4,7 +4,7 @@
, fetchurl
, makeWrapper
, jre_headless
-, utillinux, gnugrep, coreutils
+, util-linux, gnugrep, coreutils
, autoPatchelfHook
, zlib
}:
@@ -46,7 +46,7 @@ stdenv.mkDerivation (rec {
"ES_CLASSPATH=\"\$ES_CLASSPATH:$out/\$additional_classpath_directory/*\""
'';
- buildInputs = [ makeWrapper jre_headless utillinux ]
+ buildInputs = [ makeWrapper jre_headless util-linux ]
++ optional enableUnfree zlib;
installPhase = ''
@@ -56,7 +56,7 @@ stdenv.mkDerivation (rec {
chmod +x $out/bin/*
wrapProgram $out/bin/elasticsearch \
- --prefix PATH : "${makeBinPath [ utillinux coreutils gnugrep ]}" \
+ --prefix PATH : "${makeBinPath [ util-linux coreutils gnugrep ]}" \
--set JAVA_HOME "${jre_headless}"
wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre_headless}"
diff --git a/pkgs/servers/web-apps/cryptpad/node-packages.nix b/pkgs/servers/web-apps/cryptpad/node-packages.nix
index 19c034aa78b30..208bb3c72c7f5 100644
--- a/pkgs/servers/web-apps/cryptpad/node-packages.nix
+++ b/pkgs/servers/web-apps/cryptpad/node-packages.nix
@@ -6,7 +6,7 @@
let
nodeEnv = import ../../../development/node-packages/node-env.nix {
- inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+ inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
inherit nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix
index 2cf4d9465aec3..f6a8f658039b1 100644
--- a/pkgs/servers/xmpp/ejabberd/default.nix
+++ b/pkgs/servers/xmpp/ejabberd/default.nix
@@ -1,5 +1,5 @@
{ stdenv, writeScriptBin, makeWrapper, lib, fetchurl, git, cacert, libpng, libjpeg, libwebp
-, erlang, openssl, expat, libyaml, bash, gnused, gnugrep, coreutils, utillinux, procps, gd
+, erlang, openssl, expat, libyaml, bash, gnused, gnugrep, coreutils, util-linux, procps, gd
, flock
, withMysql ? false
, withPgsql ? false
@@ -21,7 +21,7 @@ let
fi
'';
- ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils utillinux procps ];
+ ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils util-linux procps ];
in stdenv.mkDerivation rec {
version = "20.03";
diff --git a/pkgs/servers/zigbee2mqtt/node.nix b/pkgs/servers/zigbee2mqtt/node.nix
index 42b6358224cf3..6080388b05e81 100644
--- a/pkgs/servers/zigbee2mqtt/node.nix
+++ b/pkgs/servers/zigbee2mqtt/node.nix
@@ -6,7 +6,7 @@
let
nodeEnv = import ../../development/node-packages/node-env.nix {
- inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+ inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
inherit nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix
index 0bdaede49a5ec..657bbc8d66488 100644
--- a/pkgs/servers/zoneminder/default.nix
+++ b/pkgs/servers/zoneminder/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, fetchurl, fetchpatch, substituteAll, cmake, makeWrapper, pkgconfig
, curl, ffmpeg_3, glib, libjpeg, libselinux, libsepol, mp4v2, libmysqlclient, mysql, pcre, perl, perlPackages
-, polkit, utillinuxMinimal, x264, zlib
+, polkit, util-linuxMinimal, x264, zlib
, coreutils, procps, psmisc, nixosTests }:
# NOTES:
@@ -148,7 +148,7 @@ in stdenv.mkDerivation rec {
buildInputs = [
curl ffmpeg_3 glib libjpeg libselinux libsepol mp4v2 libmysqlclient mysql.client pcre perl polkit x264 zlib
- utillinuxMinimal # for libmount
+ util-linuxMinimal # for libmount
] ++ (with perlPackages; [
# build-time dependencies
DateManip DBI DBDmysql LWP SysMmap
diff --git a/pkgs/shells/bash/4.4.nix b/pkgs/shells/bash/4.4.nix
index deeb4093c6822..d06157fa77cc1 100644
--- a/pkgs/shells/bash/4.4.nix
+++ b/pkgs/shells/bash/4.4.nix
@@ -1,5 +1,5 @@
{ stdenv, buildPackages
-, fetchurl, binutils ? null, bison, autoconf, utillinux
+, fetchurl, binutils ? null, bison, autoconf, util-linux
# patch for cygwin requires readline support
, interactive ? stdenv.isCygwin, readline70 ? null
@@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
"SHOBJ_LIBS=-lbash"
];
- checkInputs = [ utillinux ];
+ checkInputs = [ util-linux ];
doCheck = false; # dependency cycle, needs to be interactive
postInstall = ''
diff --git a/pkgs/shells/bash/5.0.nix b/pkgs/shells/bash/5.0.nix
index 09030493fb608..7120910d79e7f 100644
--- a/pkgs/shells/bash/5.0.nix
+++ b/pkgs/shells/bash/5.0.nix
@@ -1,5 +1,5 @@
{ stdenv, buildPackages
-, fetchurl, binutils ? null, bison, utillinux
+, fetchurl, binutils ? null, bison, util-linux
# patch for cygwin requires readline support
, interactive ? stdenv.isCygwin, readline80 ? null
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
"SHOBJ_LIBS=-lbash"
];
- checkInputs = [ utillinux ];
+ checkInputs = [ util-linux ];
doCheck = false; # dependency cycle, needs to be interactive
postInstall = ''
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index 3faa7f996575e..eabed40e8ebcd 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -2,7 +2,7 @@
, lib
, fetchurl
, coreutils
-, utillinux
+, util-linux
, which
, gnused
, gnugrep
@@ -178,7 +178,7 @@ let
EOF
'' + optionalString stdenv.isLinux ''
- sed -e "s| ul| ${utillinux}/bin/ul|" \
+ sed -e "s| ul| ${util-linux}/bin/ul|" \
-i "$out/share/fish/functions/__fish_print_help.fish"
for cur in $out/share/fish/functions/*.fish; do
sed -e "s|/usr/bin/getent|${getent}/bin/getent|" \
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index 7f46e017c3672..3f1bf557ae8e1 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, callPackage, substituteAll, python3, pkgconfig, writeText
, xorg, gtk3, glib, pango, cairo, gdk-pixbuf, atk
-, wrapGAppsHook, xorgserver, getopt, xauth, utillinux, which
+, wrapGAppsHook, xorgserver, getopt, xauth, util-linux, which
, ffmpeg, x264, libvpx, libwebp, x265
, libfakeXinerama
, gst_all_1, pulseaudio, gobject-introspection
@@ -97,7 +97,7 @@ in buildPythonApplication rec {
--set XPRA_INSTALL_PREFIX "$out"
--set XPRA_COMMAND "$out/bin/xpra"
--prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib
- --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux pulseaudio ]}
+ --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which util-linux pulseaudio ]}
)
'';
diff --git a/pkgs/tools/archivers/fsarchiver/default.nix b/pkgs/tools/archivers/fsarchiver/default.nix
index 621e3f718e023..721accd93f030 100644
--- a/pkgs/tools/archivers/fsarchiver/default.nix
+++ b/pkgs/tools/archivers/fsarchiver/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
, zlib, bzip2, lzma, lzo, lz4, zstd, xz
-, libgcrypt, e2fsprogs, utillinux, libgpgerror }:
+, libgcrypt, e2fsprogs, util-linux, libgpgerror }:
let
version = "0.8.5";
@@ -22,7 +22,7 @@ in stdenv.mkDerivation {
buildInputs = [
zlib bzip2 lzma lzo lz4 zstd xz
- libgcrypt e2fsprogs utillinux libgpgerror
+ libgcrypt e2fsprogs util-linux libgpgerror
];
meta = with stdenv.lib; {
diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix
index 0c528bcea1ec8..6e450b11aa2b8 100644
--- a/pkgs/tools/backup/btrbk/default.nix
+++ b/pkgs/tools/backup/btrbk/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, coreutils, bash, btrfs-progs, openssh, perl, perlPackages
-, utillinux, asciidoc, asciidoctor, mbuffer, makeWrapper }:
+, util-linux, asciidoc, asciidoctor, mbuffer, makeWrapper }:
stdenv.mkDerivation rec {
pname = "btrbk";
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
# Fix SSH filter script
sed -i '/^export PATH/d' ssh_filter_btrbk.sh
- substituteInPlace ssh_filter_btrbk.sh --replace logger ${utillinux}/bin/logger
+ substituteInPlace ssh_filter_btrbk.sh --replace logger ${util-linux}/bin/logger
'';
preFixup = ''
diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix
index c12cc1198c9cf..1f62834e4d19e 100644
--- a/pkgs/tools/backup/duplicity/default.nix
+++ b/pkgs/tools/backup/duplicity/default.nix
@@ -7,7 +7,7 @@
, gnupg
, gnutar
, par2cmdline
-, utillinux
+, util-linux
, rsync
, backblaze-b2
, makeWrapper
@@ -72,7 +72,7 @@ pythonPackages.buildPythonApplication rec {
librsync # Add 'rdiff' to PATH.
par2cmdline # Add 'par2' to PATH.
] ++ stdenv.lib.optionals stdenv.isLinux [
- utillinux # Add 'setsid' to PATH.
+ util-linux # Add 'setsid' to PATH.
] ++ (with pythonPackages; [
lockfile
mock
diff --git a/pkgs/tools/backup/ori/default.nix b/pkgs/tools/backup/ori/default.nix
index e3b4a0fb537e0..9f00a7f2133a7 100644
--- a/pkgs/tools/backup/ori/default.nix
+++ b/pkgs/tools/backup/ori/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, pkgconfig, scons, utillinux, fuse, libevent, openssl, zlib }:
+{ stdenv, fetchurl, boost, pkgconfig, scons, util-linux, fuse, libevent, openssl, zlib }:
stdenv.mkDerivation {
version = "0.8.1";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
};
buildInputs = [
- boost pkgconfig scons utillinux fuse libevent openssl zlib
+ boost pkgconfig scons util-linux fuse libevent openssl zlib
];
buildPhase = ''
diff --git a/pkgs/tools/bluetooth/blueberry/default.nix b/pkgs/tools/bluetooth/blueberry/default.nix
index 16563c3809989..25e72c1b880d6 100644
--- a/pkgs/tools/bluetooth/blueberry/default.nix
+++ b/pkgs/tools/bluetooth/blueberry/default.nix
@@ -8,7 +8,7 @@
, intltool
, pavucontrol
, python3Packages
-, utillinux
+, util-linux
, wrapGAppsHook
}:
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
cinnamon.xapps
gnome3.gnome-bluetooth
python3Packages.python
- utillinux
+ util-linux
];
pythonPath = with python3Packages; [
@@ -68,8 +68,8 @@ stdenv.mkDerivation rec {
--replace /usr/lib/blueberry $out/lib/blueberry \
--replace /usr/share $out/share
substituteInPlace $out/lib/blueberry/rfkillMagic.py \
- --replace /usr/bin/rfkill ${utillinux}/bin/rfkill \
- --replace /usr/sbin/rfkill ${utillinux}/bin/rfkill \
+ --replace /usr/bin/rfkill ${util-linux}/bin/rfkill \
+ --replace /usr/sbin/rfkill ${util-linux}/bin/rfkill \
--replace /usr/lib/blueberry $out/lib/blueberry
substituteInPlace $out/share/applications/blueberry.desktop \
--replace Exec=blueberry Exec=$out/bin/blueberry
diff --git a/pkgs/tools/cd-dvd/bashburn/default.nix b/pkgs/tools/cd-dvd/bashburn/default.nix
index 9b232be8ce00c..0acf55da7fe25 100644
--- a/pkgs/tools/cd-dvd/bashburn/default.nix
+++ b/pkgs/tools/cd-dvd/bashburn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, utillinux
+{ stdenv, fetchurl, util-linux
, cdparanoia, cdrdao, dvdplusrwtools, flac, lame, mpg123, normalize
, vorbis-tools, xorriso }:
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
name = "${pname}-${version}.tar.gz";
};
- nativeBuildInputs = [ utillinux ];
+ nativeBuildInputs = [ util-linux ];
postPatch = ''
for path in \
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
BB_OGGENC=${vorbis-tools}/bin/oggenc \
BB_OGGDEC=${vorbis-tools}/bin/oggdec \
BB_FLACCMD=${flac.bin}/bin/flac \
- BB_EJECT=${utillinux}/bin/eject \
+ BB_EJECT=${util-linux}/bin/eject \
BB_NORMCMD=${normalize}/bin/normalize \
; do
echo $path
diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix
index ae9e6724facc7..b935bc02d1508 100644
--- a/pkgs/tools/cd-dvd/unetbootin/default.nix
+++ b/pkgs/tools/cd-dvd/unetbootin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, makeWrapper, qt4, utillinux, coreutils, which, qmake4Hook
+{ stdenv, fetchFromGitHub, makeWrapper, qt4, util-linux, coreutils, which, qmake4Hook
, p7zip, mtools, syslinux }:
stdenv.mkDerivation rec {
@@ -24,9 +24,9 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace unetbootin.cpp \
--replace /bin/df ${coreutils}/bin/df \
- --replace /sbin/blkid ${utillinux}/sbin/blkid \
- --replace /sbin/fdisk ${utillinux}/sbin/fdisk \
- --replace /sbin/sfdisk ${utillinux}/sbin/sfdisk \
+ --replace /sbin/blkid ${util-linux}/sbin/blkid \
+ --replace /sbin/fdisk ${util-linux}/sbin/fdisk \
+ --replace /sbin/sfdisk ${util-linux}/sbin/sfdisk \
--replace /usr/bin/syslinux ${syslinux}/bin/syslinux \
--replace /usr/bin/extlinux ${syslinux}/sbin/extlinux \
--replace /usr/share/syslinux ${syslinux}/share/syslinux
diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/tools/compression/pigz/default.nix
index 1953b793657ee..07c7bf95607dd 100644
--- a/pkgs/tools/compression/pigz/default.nix
+++ b/pkgs/tools/compression/pigz/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib, utillinux }:
+{ stdenv, fetchurl, zlib, util-linux }:
let name = "pigz";
version = "2.4";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
- buildInputs = [zlib] ++ stdenv.lib.optional stdenv.isLinux utillinux;
+ buildInputs = [zlib] ++ stdenv.lib.optional stdenv.isLinux util-linux;
makeFlags = [ "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" ];
diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/pkgs/tools/filesystems/bcache-tools/default.nix
index c3b1759bcdd51..6e39ff1745885 100644
--- a/pkgs/tools/filesystems/bcache-tools/default.nix
+++ b/pkgs/tools/filesystems/bcache-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, utillinux, bash }:
+{ stdenv, fetchurl, pkgconfig, util-linux, bash }:
stdenv.mkDerivation rec {
pname = "bcache-tools";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ utillinux ];
+ buildInputs = [ util-linux ];
# * Remove broken install rules (they ignore $PREFIX) for stuff we don't need
# anyway (it's distro specific stuff).
diff --git a/pkgs/tools/filesystems/bees/default.nix b/pkgs/tools/filesystems/bees/default.nix
index 82a9742c07175..bdca893a136cf 100644
--- a/pkgs/tools/filesystems/bees/default.nix
+++ b/pkgs/tools/filesystems/bees/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, runCommand, fetchFromGitHub, bash, btrfs-progs, coreutils, python3Packages, utillinux }:
+{ stdenv, runCommand, fetchFromGitHub, bash, btrfs-progs, coreutils, python3Packages, util-linux }:
let
@@ -15,7 +15,7 @@ let
buildInputs = [
btrfs-progs # for btrfs/ioctl.h
- utillinux # for uuid.h
+ util-linux # for uuid.h
];
nativeBuildInputs = [
@@ -56,7 +56,8 @@ let
in
runCommand "bees-service" {
- inherit bash bees coreutils utillinux;
+ inherit bash bees coreutils;
+ utillinux = util-linux; # needs to be a valid shell variable name
btrfsProgs = btrfs-progs; # needs to be a valid shell variable name
} ''
mkdir -p -- "$out/bin"
diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix
index 7ada070aba68e..07420bf222007 100644
--- a/pkgs/tools/filesystems/ceph/default.nix
+++ b/pkgs/tools/filesystems/ceph/default.nix
@@ -27,7 +27,7 @@
, nss ? null, nspr ? null
# Linux Only Dependencies
-, linuxHeaders, utillinux, libuuid, udev, keyutils, rdma-core, rabbitmq-c
+, linuxHeaders, util-linux, libuuid, udev, keyutils, rdma-core, rabbitmq-c
, libaio ? null, libxfs ? null, zfs ? null
, ...
}:
@@ -148,7 +148,7 @@ in rec {
malloc zlib openldap lttng-ust babeltrace gperf gtest cunit
snappy rocksdb lz4 oathToolkit leveldb libnl libcap_ng rdkafka
] ++ optionals stdenv.isLinux [
- linuxHeaders utillinux libuuid udev keyutils optLibaio optLibxfs optZfs
+ linuxHeaders util-linux libuuid udev keyutils optLibaio optLibxfs optZfs
# ceph 14
rdma-core rabbitmq-c
] ++ optionals hasRadosgw [
diff --git a/pkgs/tools/filesystems/fatresize/default.nix b/pkgs/tools/filesystems/fatresize/default.nix
index 79551df00ee91..c8366a96f0750 100644
--- a/pkgs/tools/filesystems/fatresize/default.nix
+++ b/pkgs/tools/filesystems/fatresize/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, parted, utillinux, pkg-config }:
+{ stdenv, fetchFromGitHub, parted, util-linux, pkg-config }:
stdenv.mkDerivation rec {
@@ -12,10 +12,10 @@ stdenv.mkDerivation rec {
sha256 = "1vhz84kxfyl0q7mkqn68nvzzly0a4xgzv76m6db0bk7xyczv1qr2";
};
- buildInputs = [ parted utillinux ];
+ buildInputs = [ parted util-linux ];
nativeBuildInputs = [ pkg-config ];
- propagatedBuildInputs = [ parted utillinux ];
+ propagatedBuildInputs = [ parted util-linux ];
meta = with stdenv.lib; {
description = "The FAT16/FAT32 non-destructive resizer";
diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix
index e7028ec124943..f495b56e32523 100644
--- a/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/pkgs/tools/filesystems/glusterfs/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl, fuse, bison, flex_2_5_35, openssl, python3, ncurses, readline,
autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2, acl, sqlite,
liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which,
- openssh, gawk, findutils, utillinux, lvm2, btrfs-progs, e2fsprogs, xfsprogs, systemd,
+ openssh, gawk, findutils, util-linux, lvm2, btrfs-progs, e2fsprogs, xfsprogs, systemd,
rsync, glibc, rpcsvc-proto, libtirpc
}:
let
@@ -24,7 +24,7 @@ let
buildInputs = [
fuse bison flex_2_5_35 openssl ncurses readline
autoconf automake libtool pkgconfig zlib libaio libxml2
- acl sqlite liburcu attr makeWrapper utillinux libtirpc
+ acl sqlite liburcu attr makeWrapper util-linux libtirpc
(python3.withPackages (pkgs: [
pkgs.flask
pkgs.prettytable
@@ -56,7 +56,7 @@ let
openssh # ssh
rsync # rsync, e.g. for geo-replication
systemd # systemctl
- utillinux # mount umount
+ util-linux # mount umount
which # which
xfsprogs # xfs_info
];
@@ -76,9 +76,9 @@ stdenv.mkDerivation
substituteInPlace libglusterfs/src/glusterfs/lvm-defaults.h \
--replace '/sbin/' '${lvm2}/bin/'
substituteInPlace libglusterfs/src/glusterfs/compat.h \
- --replace '/bin/umount' '${utillinux}/bin/umount'
+ --replace '/bin/umount' '${util-linux}/bin/umount'
substituteInPlace contrib/fuse-lib/mount-gluster-compat.h \
- --replace '/bin/mount' '${utillinux}/bin/mount'
+ --replace '/bin/mount' '${util-linux}/bin/mount'
'';
# Note that the VERSION file is something that is present in release tarballs
diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
index 6ba29cb98d404..15d6686fbc33a 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
@@ -1,7 +1,7 @@
# FIXME: Unify with pkgs/development/python-modules/blivet/default.nix.
{ stdenv, fetchurl, buildPythonApplication, pykickstart, pyparted, pyblock
-, libselinux, cryptsetup, multipath_tools, lsof, utillinux
+, libselinux, cryptsetup, multipath_tools, lsof, util-linux
, useNixUdev ? true, systemd ? null
# useNixUdev is here for bw compatibility
}:
@@ -24,11 +24,11 @@ buildPythonApplication rec {
sed -i -e 's|"multipath"|"${multipath_tools}/sbin/multipath"|' \
blivet/devicelibs/mpath.py blivet/devices.py
sed -i -e '/"wipefs"/ {
- s|wipefs|${utillinux.bin}/sbin/wipefs|
+ s|wipefs|${util-linux.bin}/sbin/wipefs|
s/-f/--force/
}' blivet/formats/__init__.py
sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.py
- sed -i -r -e 's|"(u?mount)"|"${utillinux.bin}/bin/\1"|' blivet/util.py
+ sed -i -r -e 's|"(u?mount)"|"${util-linux.bin}/bin/\1"|' blivet/util.py
sed -i -e '/find_library/,/find_library/ {
c libudev = "${stdenv.lib.getLib systemd}/lib/libudev.so.1"
}' blivet/pyudev.py
diff --git a/pkgs/tools/filesystems/nixpart/0.4/default.nix b/pkgs/tools/filesystems/nixpart/0.4/default.nix
index 1f672701d382c..703d918f92a98 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/default.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/default.nix
@@ -13,7 +13,7 @@ let
inherit stdenv fetchurl buildPythonApplication;
inherit pykickstart pyparted pyblock cryptsetup libselinux multipath_tools;
inherit useNixUdev;
- inherit (pkgs) lsof utillinux systemd;
+ inherit (pkgs) lsof util-linux systemd;
};
cryptsetup = import ./cryptsetup.nix {
@@ -27,7 +27,7 @@ let
lvm2 = import ./lvm2.nix {
inherit stdenv fetchurl;
- inherit (pkgs) fetchpatch pkgconfig utillinux systemd coreutils;
+ inherit (pkgs) fetchpatch pkgconfig util-linux systemd coreutils;
};
multipath_tools = import ./multipath-tools.nix {
@@ -37,7 +37,7 @@ let
parted = import ./parted.nix {
inherit stdenv fetchurl;
- inherit (pkgs) fetchpatch utillinux readline libuuid gettext check lvm2;
+ inherit (pkgs) fetchpatch util-linux readline libuuid gettext check lvm2;
};
pyblock = import ./pyblock.nix {
diff --git a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix
index fc0005a14d452..4369d659034e9 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, systemd, utillinux, coreutils }:
+{ stdenv, fetchurl, fetchpatch, pkgconfig, systemd, util-linux, coreutils }:
let
v = "2.02.106";
@@ -60,7 +60,7 @@ stdenv.mkDerivation {
postInstall =
''
substituteInPlace $out/lib/udev/rules.d/13-dm-disk.rules \
- --replace $out/sbin/blkid ${utillinux.bin}/sbin/blkid
+ --replace $out/sbin/blkid ${util-linux.bin}/sbin/blkid
# Systemd stuff
mkdir -p $out/etc/systemd/system $out/lib/systemd/system-generators
diff --git a/pkgs/tools/filesystems/nixpart/0.4/parted.nix b/pkgs/tools/filesystems/nixpart/0.4/parted.nix
index 16f3a57ea147e..7fe1b74546687 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/parted.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/parted.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, lvm2, libuuid, gettext, readline
-, utillinux, check, enableStatic ? false }:
+, util-linux, check, enableStatic ? false }:
stdenv.mkDerivation rec {
name = "parted-3.1";
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional enableStatic "--enable-static";
doCheck = true;
- checkInputs = [ check utillinux ];
+ checkInputs = [ check util-linux ];
meta = {
description = "Create, destroy, resize, check, and copy partitions";
diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix
index abe171170d41b..2065e31e97a08 100644
--- a/pkgs/tools/filesystems/ntfs-3g/default.nix
+++ b/pkgs/tools/filesystems/ntfs-3g/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, utillinux, libuuid
+{stdenv, fetchurl, util-linux, libuuid
, crypto ? false, libgcrypt, gnutls, pkgconfig}:
stdenv.mkDerivation rec {
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
substituteInPlace src/Makefile.in --replace /sbin '@sbindir@'
substituteInPlace ntfsprogs/Makefile.in --replace /sbin '@sbindir@'
substituteInPlace libfuse-lite/mount_util.c \
- --replace /bin/mount ${utillinux}/bin/mount \
- --replace /bin/umount ${utillinux}/bin/umount
+ --replace /bin/mount ${util-linux}/bin/mount \
+ --replace /bin/umount ${util-linux}/bin/umount
'';
configureFlags = [
diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix
index 8f365d023d2c3..815129f7f0f74 100644
--- a/pkgs/tools/misc/calamares/default.nix
+++ b/pkgs/tools/misc/calamares/default.nix
@@ -1,6 +1,6 @@
{ lib, fetchurl, boost, cmake, extra-cmake-modules, kparts, kpmcore
, kservice, libatasmart, libxcb, libyamlcpp, parted, polkit-qt, python, qtbase
-, qtquickcontrols, qtsvg, qttools, qtwebengine, utillinux, glibc, tzdata
+, qtquickcontrols, qtsvg, qttools, qtwebengine, util-linux, glibc, tzdata
, ckbcomp, xkeyboard_config, mkDerivation
}:
@@ -17,7 +17,7 @@ mkDerivation rec {
buildInputs = [
boost cmake extra-cmake-modules kparts.dev kpmcore.out kservice.dev
libatasmart libxcb libyamlcpp parted polkit-qt python qtbase
- qtquickcontrols qtsvg qttools qtwebengine.dev utillinux
+ qtquickcontrols qtsvg qttools qtwebengine.dev util-linux
];
enableParallelBuilding = false;
diff --git a/pkgs/tools/misc/cloud-utils/default.nix b/pkgs/tools/misc/cloud-utils/default.nix
index bd6d59c8a0ce9..1bd3def87c415 100644
--- a/pkgs/tools/misc/cloud-utils/default.nix
+++ b/pkgs/tools/misc/cloud-utils/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, makeWrapper
-, gawk, gnused, utillinux, file
+, gawk, gnused, util-linux, file
, wget, python3, qemu-utils, euca2ools
, e2fsprogs, cdrkit
, gptfdisk }:
@@ -7,7 +7,7 @@
let
# according to https://packages.debian.org/sid/cloud-image-utils + https://packages.debian.org/sid/admin/cloud-guest-utils
guestDeps = [
- e2fsprogs gptfdisk gawk gnused utillinux
+ e2fsprogs gptfdisk gawk gnused util-linux
];
binDeps = guestDeps ++ [
wget file qemu-utils cdrkit
diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix
index 2940ff0a57385..4d4afb0b995f5 100644
--- a/pkgs/tools/misc/debootstrap/default.nix
+++ b/pkgs/tools/misc/debootstrap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, dpkg, gawk, perl, wget, coreutils, utillinux
+{ stdenv, fetchurl, dpkg, gawk, perl, wget, coreutils, util-linux
, gnugrep, gnutar, gnused, gzip, makeWrapper }:
# USAGE like this: debootstrap sid /tmp/target-chroot-directory
# There is also cdebootstrap now. Is that easier to maintain?
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
substituteInPlace debootstrap \
--replace 'CHROOT_CMD="chroot ' 'CHROOT_CMD="${coreutils}/bin/chroot ' \
- --replace 'CHROOT_CMD="unshare ' 'CHROOT_CMD="${utillinux}/bin/unshare ' \
+ --replace 'CHROOT_CMD="unshare ' 'CHROOT_CMD="${util-linux}/bin/unshare ' \
--replace /usr/bin/dpkg ${dpkg}/bin/dpkg \
--replace '#!/bin/sh' '#!/bin/bash' \
--subst-var-by VERSION ${version}
diff --git a/pkgs/tools/misc/etcher/default.nix b/pkgs/tools/misc/etcher/default.nix
index fec78db979c04..6634d2d23ca2e 100644
--- a/pkgs/tools/misc/etcher/default.nix
+++ b/pkgs/tools/misc/etcher/default.nix
@@ -3,7 +3,7 @@
, gcc-unwrapped
, dpkg
, polkit
-, utillinux
+, util-linux
, bash
, nodePackages
, makeWrapper
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
# use Nix(OS) paths
sed -i "s|/usr/bin/pkexec|/usr/bin/pkexec', '/run/wrappers/bin/pkexec|" tmp/node_modules/sudo-prompt/index.js
sed -i 's|/bin/bash|${bash}/bin/bash|' tmp/node_modules/sudo-prompt/index.js
- sed -i "s|'lsblk'|'${utillinux}/bin/lsblk'|" tmp/node_modules/drivelist/js/lsblk/index.js
+ sed -i "s|'lsblk'|'${util-linux}/bin/lsblk'|" tmp/node_modules/drivelist/js/lsblk/index.js
sed -i "s|process.resourcesPath|'$out/share/${pname}/resources/'|" tmp/generated/gui.js
${nodePackages.asar}/bin/asar pack tmp opt/balenaEtcher/resources/app.asar
rm -rf tmp
diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix
index 6292fb4a72275..7d610416da47b 100644
--- a/pkgs/tools/misc/gparted/default.nix
+++ b/pkgs/tools/misc/gparted/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, intltool, gettext, makeWrapper, coreutils, gnused, gnome3
, gnugrep, parted, glib, libuuid, pkgconfig, gtkmm3, libxml2
-, gpart, hdparm, procps, utillinux, polkit, wrapGAppsHook, substituteAll
+, gpart, hdparm, procps, util-linux, polkit, wrapGAppsHook, substituteAll
}:
stdenv.mkDerivation rec {
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
preFixup = ''
gappsWrapperArgs+=(
- --prefix PATH : "${stdenv.lib.makeBinPath [ gpart hdparm utillinux procps coreutils gnused gnugrep ]}"
+ --prefix PATH : "${stdenv.lib.makeBinPath [ gpart hdparm util-linux procps coreutils gnused gnugrep ]}"
)
'';
diff --git a/pkgs/tools/misc/memtest86-efi/default.nix b/pkgs/tools/misc/memtest86-efi/default.nix
index c33aa074404f9..dc29aad2a549f 100644
--- a/pkgs/tools/misc/memtest86-efi/default.nix
+++ b/pkgs/tools/misc/memtest86-efi/default.nix
@@ -1,7 +1,7 @@
{ stdenv
, lib
, fetchzip
-, utillinux
+, util-linux
, jq
, mtools
}:
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- utillinux
+ util-linux
jq
mtools
];
diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix
index 56262d8171ee9..28ac3a82f0aa2 100644
--- a/pkgs/tools/misc/ostree/default.nix
+++ b/pkgs/tools/misc/ostree/default.nix
@@ -19,7 +19,7 @@
, automake
, libtool
, fuse
-, utillinuxMinimal
+, util-linuxMinimal
, libselinux
, libsodium
, libarchive
@@ -93,7 +93,7 @@ in stdenv.mkDerivation rec {
libarchive
bzip2
xz
- utillinuxMinimal # for libmount
+ util-linuxMinimal # for libmount
# for installed tests
testPython
diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix
index 808b0382f3210..693e99c464527 100644
--- a/pkgs/tools/misc/parted/default.nix
+++ b/pkgs/tools/misc/parted/default.nix
@@ -9,7 +9,7 @@
, e2fsprogs
, perl
, python2
-, utillinux
+, util-linux
, check
, enableStatic ? false
}:
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
# Tests were previously failing due to Hydra running builds as uid 0.
# That should hopefully be fixed now.
doCheck = !stdenv.hostPlatform.isMusl; /* translation test */
- checkInputs = [ check dosfstools e2fsprogs perl python2 utillinux ];
+ checkInputs = [ check dosfstools e2fsprogs perl python2 util-linux ];
meta = {
description = "Create, destroy, resize, check, and copy partitions";
diff --git a/pkgs/tools/misc/partition-manager/default.nix b/pkgs/tools/misc/partition-manager/default.nix
index 1b5f7dbdbece4..1a779616ab833 100644
--- a/pkgs/tools/misc/partition-manager/default.nix
+++ b/pkgs/tools/misc/partition-manager/default.nix
@@ -1,7 +1,7 @@
{ mkDerivation, fetchurl, lib
, extra-cmake-modules, kdoctools, wrapGAppsHook, wrapQtAppsHook
, kconfig, kcrash, kinit, kpmcore
-, eject, libatasmart , utillinux, qtbase
+, eject, libatasmart , util-linux, qtbase
}:
let
@@ -20,7 +20,7 @@ in mkDerivation rec {
nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook wrapQtAppsHook ];
# refer to kpmcore for the use of eject
- buildInputs = [ eject libatasmart utillinux ];
+ buildInputs = [ eject libatasmart util-linux ];
propagatedBuildInputs = [ kconfig kcrash kinit kpmcore ];
meta = with lib; {
diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/tools/misc/profile-sync-daemon/default.nix
index 5c4a3301d2720..b4497c4d7c877 100644
--- a/pkgs/tools/misc/profile-sync-daemon/default.nix
+++ b/pkgs/tools/misc/profile-sync-daemon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, utillinux, coreutils}:
+{ stdenv, fetchurl, util-linux, coreutils}:
stdenv.mkDerivation rec {
version = "6.42";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
# $HOME detection fails (and is unnecessary)
sed -i '/^HOME/d' $out/bin/profile-sync-daemon
substituteInPlace $out/bin/psd-overlay-helper \
- --replace "PATH=/usr/bin:/bin" "PATH=${utillinux.bin}/bin:${coreutils}/bin" \
+ --replace "PATH=/usr/bin:/bin" "PATH=${util-linux.bin}/bin:${coreutils}/bin" \
--replace "sudo " "/run/wrappers/bin/sudo "
'';
diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix
index 936c78b695d18..36da8d0a463b0 100644
--- a/pkgs/tools/misc/rmlint/default.nix
+++ b/pkgs/tools/misc/rmlint/default.nix
@@ -14,7 +14,7 @@
, python3
, scons
, sphinx
-, utillinux
+, util-linux
, wrapGAppsHook
, withGui ? false }:
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
sha256 = "15xfkcw1bkfyf3z8kl23k3rlv702m0h7ghqxvhniynvlwbgh6j2x";
};
- CFLAGS="-I${stdenv.lib.getDev utillinux}/include";
+ CFLAGS="-I${stdenv.lib.getDev util-linux}/include";
nativeBuildInputs = [
pkgconfig
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
glib
json-glib
libelf
- utillinux
+ util-linux
] ++ stdenv.lib.optionals withGui [
cairo
gobject-introspection
diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix
index 0ba72852c40fe..abca71febb939 100644
--- a/pkgs/tools/misc/rpm-ostree/default.nix
+++ b/pkgs/tools/misc/rpm-ostree/default.nix
@@ -33,7 +33,7 @@
, json_c
, zchunk
, libmodulemd
-, utillinux
+, util-linux
, sqlite
, cppunit
}:
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
json_c
zchunk
libmodulemd
- utillinux # for smartcols.pc
+ util-linux # for smartcols.pc
sqlite
cppunit
];
diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix
index 576e1d7807446..177580c099b6b 100644
--- a/pkgs/tools/misc/snapper/default.nix
+++ b/pkgs/tools/misc/snapper/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub
, autoreconfHook, pkgconfig, docbook_xsl, libxslt, docbook_xml_dtd_45
, acl, attr, boost, btrfs-progs, dbus, diffutils, e2fsprogs, libxml2
-, lvm2, pam, python, utillinux, fetchpatch, json_c, nixosTests }:
+, lvm2, pam, python, util-linux, fetchpatch, json_c, nixosTests }:
stdenv.mkDerivation rec {
pname = "snapper";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
acl attr boost btrfs-progs dbus diffutils e2fsprogs libxml2
- lvm2 pam python utillinux json_c
+ lvm2 pam python util-linux json_c
];
passthru.tests.snapper = nixosTests.snapper;
diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix
index a32e941ad849f..b39f631f95bfd 100644
--- a/pkgs/tools/misc/tlp/default.nix
+++ b/pkgs/tools/misc/tlp/default.nix
@@ -16,7 +16,7 @@
, shellcheck
, smartmontools
, systemd
-, utillinux
+, util-linux
, x86_energy_perf_policy
# RDW only works with NetworkManager, and thus is optional with default off
, enableRDW ? false
@@ -86,7 +86,7 @@
perl
smartmontools
systemd
- utillinux
+ util-linux
] ++ lib.optional enableRDW networkmanager
++ lib.optional (lib.any (lib.meta.platformMatch stdenv.hostPlatform) x86_energy_perf_policy.meta.platforms) x86_energy_perf_policy
);
diff --git a/pkgs/tools/misc/woeusb/default.nix b/pkgs/tools/misc/woeusb/default.nix
index 4c235b4866f2c..fddb98d8dc38b 100644
--- a/pkgs/tools/misc/woeusb/default.nix
+++ b/pkgs/tools/misc/woeusb/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, autoreconfHook, makeWrapper
-, coreutils, dosfstools, findutils, gawk, gnugrep, grub2_light, ncurses, ntfs3g, parted, p7zip, utillinux, wget
+, coreutils, dosfstools, findutils, gawk, gnugrep, grub2_light, ncurses, ntfs3g, parted, p7zip, util-linux, wget
, wxGTK30 }:
stdenv.mkDerivation rec {
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
# should be patched with a less useless default PATH, but for now
# we add everything we need manually.
wrapProgram "$out/bin/woeusb" \
- --set PATH '${stdenv.lib.makeBinPath [ coreutils dosfstools findutils gawk gnugrep grub2_light ncurses ntfs3g parted utillinux wget p7zip ]}'
+ --set PATH '${stdenv.lib.makeBinPath [ coreutils dosfstools findutils gawk gnugrep grub2_light ncurses ntfs3g parted util-linux wget p7zip ]}'
'';
doInstallCheck = true;
diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix
index 5f6d2bb1278d8..3bc01048c1edc 100644
--- a/pkgs/tools/misc/xfstests/default.nix
+++ b/pkgs/tools/misc/xfstests/default.nix
@@ -1,7 +1,7 @@
{ stdenv, acl, attr, autoconf, automake, bash, bc, coreutils, e2fsprogs
, fetchgit, fio, gawk, keyutils, killall, lib, libaio, libcap, libtool
, libuuid, libxfs, lvm2, openssl, perl, procps, quota
-, time, utillinux, which, writeScript, xfsprogs, runtimeShell }:
+, time, util-linux, which, writeScript, xfsprogs, runtimeShell }:
stdenv.mkDerivation {
name = "xfstests-2019-09-08";
@@ -96,7 +96,7 @@ stdenv.mkDerivation {
export PATH=${lib.makeBinPath [acl attr bc e2fsprogs fio gawk keyutils
libcap lvm2 perl procps killall quota
- utillinux which xfsprogs]}:$PATH
+ util-linux which xfsprogs]}:$PATH
exec ./check "$@"
'';
diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix
index 04c1902f3a0b9..02a2d67de53dd 100644
--- a/pkgs/tools/misc/xvfb-run/default.nix
+++ b/pkgs/tools/misc/xvfb-run/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, makeWrapper, xorgserver, getopt
-, xauth, utillinux, which, fontsConf, gawk, coreutils }:
+, xauth, util-linux, which, fontsConf, gawk, coreutils }:
let
xvfb_run = fetchurl {
name = "xvfb-run";
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
patchShebangs $out/bin/xvfb-run
wrapProgram $out/bin/xvfb-run \
--set FONTCONFIG_FILE "${fontsConf}" \
- --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux gawk coreutils ]}
+ --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which util-linux gawk coreutils ]}
'';
meta = with stdenv.lib; {
diff --git a/pkgs/tools/networking/airfield/node.nix b/pkgs/tools/networking/airfield/node.nix
index e306e49c84982..055fc5267c37a 100644
--- a/pkgs/tools/networking/airfield/node.nix
+++ b/pkgs/tools/networking/airfield/node.nix
@@ -6,7 +6,7 @@
let
nodeEnv = import ../../../development/node-packages/node-env.nix {
- inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+ inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
inherit nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
diff --git a/pkgs/tools/networking/bud/default.nix b/pkgs/tools/networking/bud/default.nix
index a79cbdc8bbd8a..724d25d49f938 100644
--- a/pkgs/tools/networking/bud/default.nix
+++ b/pkgs/tools/networking/bud/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchgit, python, gyp, utillinux }:
+{ stdenv, lib, fetchgit, python, gyp, util-linux }:
stdenv.mkDerivation {
pname = "bud";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
buildInputs = [
python gyp
- ] ++ lib.optional stdenv.isLinux utillinux;
+ ] ++ lib.optional stdenv.isLinux util-linux;
buildPhase = ''
python ./gyp_bud -f make
diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix
index 438f107c27c48..28a418c27f28c 100644
--- a/pkgs/tools/networking/cjdns/default.nix
+++ b/pkgs/tools/networking/cjdns/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, nodejs, which, python27, utillinux, nixosTests }:
+{ stdenv, fetchFromGitHub, nodejs, which, python27, util-linux, nixosTests }:
stdenv.mkDerivation rec {
pname = "cjdns";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ which python27 nodejs ] ++
# for flock
- stdenv.lib.optional stdenv.isLinux utillinux;
+ stdenv.lib.optional stdenv.isLinux util-linux;
CFLAGS = "-O2 -Wno-error=stringop-truncation";
buildPhase =
diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix
index 1df6260a09c70..04ac97003102c 100644
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@@ -9,7 +9,7 @@
, pam
, useSystemd ? stdenv.isLinux
, systemd ? null
-, utillinux ? null
+, util-linux ? null
, pkcs11Support ? false
, pkcs11helper ? null
}:
@@ -63,7 +63,7 @@ let
'' + optionalString useSystemd ''
install -Dm555 ${update-resolved} $out/libexec/update-systemd-resolved
wrapProgram $out/libexec/update-systemd-resolved \
- --prefix PATH : ${makeBinPath [ runtimeShell iproute systemd utillinux ]}
+ --prefix PATH : ${makeBinPath [ runtimeShell iproute systemd util-linux ]}
'';
enableParallelBuilding = true;
diff --git a/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix b/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix
index d73b8e911b9d5..f50d17eaf7de7 100644
--- a/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix
+++ b/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, makeWrapper, coreutils, gawk, utillinux }:
+{ stdenv, fetchgit, makeWrapper, coreutils, gawk, util-linux }:
stdenv.mkDerivation {
name = "openvpn-learnaddress-19b03c3";
@@ -9,13 +9,13 @@ stdenv.mkDerivation {
sha256 = "16pcyvyhwsx34i0cjkkx906lmrwdd9gvznvqdwlad4ha8l8f8z42";
};
- buildInputs = [ makeWrapper coreutils gawk utillinux ];
+ buildInputs = [ makeWrapper coreutils gawk util-linux ];
installPhase = ''
install -Dm555 ovpn-learnaddress $out/libexec/openvpn/openvpn-learnaddress
wrapProgram $out/libexec/openvpn/openvpn-learnaddress \
- --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gawk utillinux ]}
+ --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gawk util-linux ]}
'';
meta = {
diff --git a/pkgs/tools/networking/openvpn/update-systemd-resolved.nix b/pkgs/tools/networking/openvpn/update-systemd-resolved.nix
index 4d18372363b68..1a192ce6688a5 100644
--- a/pkgs/tools/networking/openvpn/update-systemd-resolved.nix
+++ b/pkgs/tools/networking/openvpn/update-systemd-resolved.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub
, makeWrapper
-, iproute, systemd, coreutils, utillinux }:
+, iproute, systemd, coreutils, util-linux }:
stdenv.mkDerivation rec {
pname = "update-systemd-resolved";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
installPhase = ''
wrapProgram $out/libexec/openvpn/update-systemd-resolved \
- --prefix PATH : ${lib.makeBinPath [ iproute systemd coreutils utillinux ]}
+ --prefix PATH : ${lib.makeBinPath [ iproute systemd coreutils util-linux ]}
'';
meta = with stdenv.lib; {
diff --git a/pkgs/tools/networking/shorewall/default.nix b/pkgs/tools/networking/shorewall/default.nix
index 67f81b8210531..c56f0eac7ff8c 100644
--- a/pkgs/tools/networking/shorewall/default.nix
+++ b/pkgs/tools/networking/shorewall/default.nix
@@ -10,7 +10,7 @@
, perlPackages
, stdenv
, tree
-, utillinux
+, util-linux
}:
let
PATH = stdenv.lib.concatStringsSep ":"
@@ -19,7 +19,7 @@ let
"${iptables}/bin"
"${ipset}/bin"
"${ebtables}/bin"
- "${utillinux}/bin"
+ "${util-linux}/bin"
"${gnugrep}/bin"
"${gnused}/bin"
];
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
ipset
iptables
ebtables
- utillinux
+ util-linux
gnugrep
gnused
perl
diff --git a/pkgs/tools/networking/tgt/default.nix b/pkgs/tools/networking/tgt/default.nix
index 478c1ed35f290..d9d8478e9856d 100644
--- a/pkgs/tools/networking/tgt/default.nix
+++ b/pkgs/tools/networking/tgt/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, libxslt, libaio, systemd, perl, perlPackages
-, docbook_xsl, coreutils, lsof, rdma-core, makeWrapper, sg3_utils, utillinux
+, docbook_xsl, coreutils, lsof, rdma-core, makeWrapper, sg3_utils, util-linux
}:
stdenv.mkDerivation rec {
diff --git a/pkgs/tools/package-management/nixui/nixui.nix b/pkgs/tools/package-management/nixui/nixui.nix
index e306e49c84982..055fc5267c37a 100644
--- a/pkgs/tools/package-management/nixui/nixui.nix
+++ b/pkgs/tools/package-management/nixui/nixui.nix
@@ -6,7 +6,7 @@
let
nodeEnv = import ../../../development/node-packages/node-env.nix {
- inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+ inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
inherit nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
diff --git a/pkgs/tools/security/ecryptfs/default.nix b/pkgs/tools/security/ecryptfs/default.nix
index e4caa9c4e18de..1a8329885ba2a 100644
--- a/pkgs/tools/security/ecryptfs/default.nix
+++ b/pkgs/tools/security/ecryptfs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, perl, utillinux, keyutils, nss, nspr, python2, pam, enablePython ? false
+{ stdenv, fetchurl, pkgconfig, perl, util-linux, keyutils, nss, nspr, python2, pam, enablePython ? false
, intltool, makeWrapper, coreutils, bash, gettext, cryptsetup, lvm2, rsync, which, lsof }:
stdenv.mkDerivation rec {
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
FILES="$(grep -r '/bin/sh' src/utils -l; find src -name \*.c)"
for file in $FILES; do
substituteInPlace "$file" \
- --replace /bin/mount ${utillinux}/bin/mount \
- --replace /bin/umount ${utillinux}/bin/umount \
+ --replace /bin/mount ${util-linux}/bin/mount \
+ --replace /bin/umount ${util-linux}/bin/umount \
--replace /sbin/mount.ecryptfs_private ${wrapperDir}/mount.ecryptfs_private \
--replace /sbin/umount.ecryptfs_private ${wrapperDir}/umount.ecryptfs_private \
--replace /sbin/mount.ecryptfs $out/sbin/mount.ecryptfs \
diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix
index b3c0864886290..d46aac93e86b3 100644
--- a/pkgs/tools/security/pass/rofi-pass.nix
+++ b/pkgs/tools/security/pass/rofi-pass.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pass, rofi, coreutils, utillinux, xdotool, gnugrep
+{ stdenv, fetchFromGitHub, pass, rofi, coreutils, util-linux, xdotool, gnugrep
, libnotify, pwgen, findutils, gawk, gnused, xclip, makeWrapper
}:
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
(pass.withExtensions (ext: [ ext.pass-otp ]))
pwgen
rofi
- utillinux
+ util-linux
xclip
xdotool
];
diff --git a/pkgs/tools/security/scrypt/default.nix b/pkgs/tools/security/scrypt/default.nix
index 66b5afc9a9b78..e230b2ee45745 100644
--- a/pkgs/tools/security/scrypt/default.nix
+++ b/pkgs/tools/security/scrypt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, utillinux, getconf }:
+{ stdenv, fetchurl, openssl, util-linux, getconf }:
stdenv.mkDerivation rec {
pname = "scrypt";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
doCheck = true;
checkTarget = "test";
- checkInputs = [ utillinux ];
+ checkInputs = [ util-linux ];
meta = with stdenv.lib; {
description = "Encryption utility";
diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix
index f9ea99432bf02..2a101bba8865d 100644
--- a/pkgs/tools/system/facter/default.nix
+++ b/pkgs/tools/system/facter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, boost, cmake, cpp-hocon, curl, leatherman, libwhereami, libyamlcpp, openssl, ruby, utillinux }:
+{ stdenv, fetchFromGitHub, boost, cmake, cpp-hocon, curl, leatherman, libwhereami, libyamlcpp, openssl, ruby, util-linux }:
stdenv.mkDerivation rec {
pname = "facter";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-Wno-error";
nativeBuildInputs = [ cmake ];
- buildInputs = [ boost cpp-hocon curl leatherman libwhereami libyamlcpp openssl ruby utillinux ];
+ buildInputs = [ boost cpp-hocon curl leatherman libwhereami libyamlcpp openssl ruby util-linux ];
enableParallelBuilding = true;
diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix
index 4257e2f2fd1b8..e5747a09f9c50 100644
--- a/pkgs/tools/system/inxi/default.nix
+++ b/pkgs/tools/system/inxi/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper
, ps, dnsutils # dig is recommended for multiple categories
, withRecommends ? false # Install (almost) all recommended tools (see --recommends)
-, withRecommendedSystemPrograms ? withRecommends, utillinuxMinimal, dmidecode
+, withRecommendedSystemPrograms ? withRecommends, util-linuxMinimal, dmidecode
, file, hddtemp, iproute, ipmitool, usbutils, kmod, lm_sensors, smartmontools
, binutils, tree, upower
, withRecommendedDisplayInformationPrograms ? withRecommends, glxinfo, xorg
@@ -11,7 +11,7 @@ let
prefixPath = programs:
"--prefix PATH ':' '${stdenv.lib.makeBinPath programs}'";
recommendedSystemPrograms = lib.optionals withRecommendedSystemPrograms [
- utillinuxMinimal dmidecode file hddtemp iproute ipmitool usbutils kmod
+ util-linuxMinimal dmidecode file hddtemp iproute ipmitool usbutils kmod
lm_sensors smartmontools binutils tree upower
];
recommendedDisplayInformationPrograms = lib.optionals
diff --git a/pkgs/tools/system/rofi-systemd/default.nix b/pkgs/tools/system/rofi-systemd/default.nix
index 92c13527c6fe3..7d4ea120a8e62 100644
--- a/pkgs/tools/system/rofi-systemd/default.nix
+++ b/pkgs/tools/system/rofi-systemd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rofi, systemd, coreutils, utillinux, gawk, makeWrapper
+{ stdenv, fetchFromGitHub, rofi, systemd, coreutils, util-linux, gawk, makeWrapper
}:
stdenv.mkDerivation rec {
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
wrapperPath = with stdenv.lib; makeBinPath [
rofi
coreutils
- utillinux
+ util-linux
gawk
systemd
];
diff --git a/pkgs/tools/virtualization/alpine-make-vm-image/default.nix b/pkgs/tools/virtualization/alpine-make-vm-image/default.nix
index 08d37a1d53bc7..d6dad6433e7a8 100644
--- a/pkgs/tools/virtualization/alpine-make-vm-image/default.nix
+++ b/pkgs/tools/virtualization/alpine-make-vm-image/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper
, apk-tools, coreutils, e2fsprogs, findutils, gnugrep, gnused, kmod, qemu-utils
-, utillinux
+, util-linux
}:
stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
postInstall = ''
wrapProgram $out/bin/alpine-make-vm-image --set PATH ${lib.makeBinPath [
apk-tools coreutils e2fsprogs findutils gnugrep gnused kmod qemu-utils
- utillinux
+ util-linux
]}
'';
diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix
index 34f2bc9e19097..be62ace4797b5 100644
--- a/pkgs/tools/virtualization/google-compute-engine/default.nix
+++ b/pkgs/tools/virtualization/google-compute-engine/default.nix
@@ -4,7 +4,7 @@
, bash
, bashInteractive
, systemd
-, utillinux
+, util-linux
, boto
, setuptools
, distro
@@ -31,14 +31,14 @@ buildPythonApplication rec {
substituteInPlace "$file" \
--replace /bin/systemctl "/run/current-system/systemd/bin/systemctl" \
--replace /bin/bash "${bashInteractive}/bin/bash" \
- --replace /sbin/hwclock "${utillinux}/bin/hwclock"
+ --replace /sbin/hwclock "${util-linux}/bin/hwclock"
# SELinux tool ??? /sbin/restorecon
done
substituteInPlace google_config/udev/64-gce-disk-removal.rules \
--replace /bin/sh "${bash}/bin/sh" \
- --replace /bin/umount "${utillinux}/bin/umount" \
- --replace /usr/bin/logger "${utillinux}/bin/logger"
+ --replace /bin/umount "${util-linux}/bin/umount" \
+ --replace /usr/bin/logger "${util-linux}/bin/logger"
'';
postInstall = ''
diff --git a/pkgs/tools/virtualization/nixos-container/default.nix b/pkgs/tools/virtualization/nixos-container/default.nix
index 32a7c1e2c3367..badd25b4e248a 100644
--- a/pkgs/tools/virtualization/nixos-container/default.nix
+++ b/pkgs/tools/virtualization/nixos-container/default.nix
@@ -1,4 +1,4 @@
-{ substituteAll, perlPackages, shadow, utillinux }:
+{ substituteAll, perlPackages, shadow, util-linux }:
substituteAll {
name = "nixos-container";
@@ -7,7 +7,7 @@ substituteAll {
src = ./nixos-container.pl;
perl = "${perlPackages.perl}/bin/perl -I${perlPackages.FileSlurp}/${perlPackages.perl.libPrefix}";
su = "${shadow.su}/bin/su";
- inherit utillinux;
+ utillinux = util-linux;
postInstall = ''
t=$out/share/bash-completion/completions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 078d4bc2eca46..9187b127c93d1 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -491,7 +491,7 @@ mapAliases ({
retroshare06 = retroshare;
gtk-recordmydesktop = throw "gtk-recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10
qt-recordmydesktop = throw "qt-recordmydesktop has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10
- rfkill = throw "rfkill has been removed, as it's included in utillinux"; # added 2020-08-23
+ rfkill = throw "rfkill has been removed, as it's included in util-linux"; # added 2020-08-23
riak-cs = throw "riak-cs is not maintained anymore"; # added 2020-10-14
rkt = throw "rkt was archived by upstream"; # added 2020-05-16
ruby_2_0_0 = throw "ruby_2_0_0 was deprecated on 2018-02-13: use a newer version of ruby";
@@ -642,6 +642,7 @@ mapAliases ({
unicorn-emu = unicorn; # added 2020-10-29
usb_modeswitch = usb-modeswitch; # added 2016-05-10
usbguard-nox = usbguard; # added 2019-09-04
+ utillinux = util-linux; # added 2020-11-24
uzbl = throw "uzbl has been removed from nixpkgs, as it's unmaintained and uses insecure libraries";
v4l_utils = v4l-utils; # added 2019-08-07
v8_3_16_14 = throw "v8_3_16_14 was removed in 2019-11-01: no longer referenced by other packages";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 92e68417e479f..c6fbfb05243ab 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2647,7 +2647,7 @@ in
mstflint = callPackage ../tools/misc/mstflint { };
mcelog = callPackage ../os-specific/linux/mcelog {
- utillinux = utillinuxMinimal;
+ util-linux = util-linuxMinimal;
};
sqlint = callPackage ../development/tools/sqlint { };
@@ -3631,21 +3631,21 @@ in
elk7Version = "7.5.1";
elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix {
- utillinux = utillinuxMinimal;
+ util-linux = util-linuxMinimal;
jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
elasticsearch6-oss = callPackage ../servers/search/elasticsearch/6.x.nix {
enableUnfree = false;
- utillinux = utillinuxMinimal;
+ util-linux = util-linuxMinimal;
jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
elasticsearch7 = callPackage ../servers/search/elasticsearch/7.x.nix {
- utillinux = utillinuxMinimal;
+ util-linux = util-linuxMinimal;
jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
elasticsearch7-oss = callPackage ../servers/search/elasticsearch/7.x.nix {
enableUnfree = false;
- utillinux = utillinuxMinimal;
+ util-linux = util-linuxMinimal;
jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
elasticsearch = elasticsearch6;
@@ -13064,7 +13064,7 @@ in
gnutls = callPackage ../development/libraries/gnutls/default.nix {
inherit (darwin.apple_sdk.frameworks) Security;
- utillinux = utillinuxMinimal; # break the cyclic dependency
+ util-linux = util-linuxMinimal; # break the cyclic dependency
};
gnutls-kdh = callPackage ../development/libraries/gnutls-kdh/3.5.nix {
@@ -17875,7 +17875,7 @@ in
libossp_uuid = callPackage ../development/libraries/libossp-uuid { };
libuuid = if stdenv.isLinux
- then utillinuxMinimal
+ then util-linuxMinimal
else null;
light = callPackage ../os-specific/linux/light { };
@@ -17908,7 +17908,7 @@ in
};
fusePackages = dontRecurseIntoAttrs (callPackage ../os-specific/linux/fuse {
- utillinux = utillinuxMinimal;
+ util-linux = util-linuxMinimal;
});
fuse = lowPrio fusePackages.fuse_2;
fuse3 = fusePackages.fuse_3;
@@ -18960,7 +18960,7 @@ in
systemd = callPackage ../os-specific/linux/systemd {
# break some cyclic dependencies
- utillinux = utillinuxMinimal;
+ util-linux = util-linuxMinimal;
# provide a super minimal gnupg used for systemd-machined
gnupg = callPackage ../tools/security/gnupg/22.nix {
enableMinimal = true;
@@ -19080,7 +19080,7 @@ in
stdenv = crossLibcStdenv;
};
- eudev = callPackage ../os-specific/linux/eudev { utillinux = utillinuxMinimal; };
+ eudev = callPackage ../os-specific/linux/eudev { util-linux = util-linuxMinimal; };
libudev0-shim = callPackage ../os-specific/linux/libudev0-shim { };
@@ -19104,17 +19104,17 @@ in
usermount = callPackage ../os-specific/linux/usermount { };
- utillinux = if stdenv.isLinux then callPackage ../os-specific/linux/util-linux { }
- else unixtools.utillinux;
+ util-linux = if stdenv.isLinux then callPackage ../os-specific/linux/util-linux { }
+ else unixtools.util-linux;
- utillinuxCurses = utillinux;
+ util-linuxCurses = util-linux;
- utillinuxMinimal = if stdenv.isLinux then appendToName "minimal" (utillinux.override {
+ util-linuxMinimal = if stdenv.isLinux then appendToName "minimal" (util-linux.override {
minimal = true;
ncurses = null;
perl = null;
systemd = null;
- }) else utillinux;
+ }) else util-linux;
v4l-utils = qt5.callPackage ../os-specific/linux/v4l-utils { };
diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index 41aa86a8c463b..5e591ec7a8575 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -160,8 +160,8 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; };
udev = linux;
unzip = all;
usbutils = linux;
- utillinux = linux;
- utillinuxMinimal = linux;
+ util-linux = linux;
+ util-linuxMinimal = linux;
w3m = all;
webkitgtk = linux;
wget = all;
diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix
index cdad9de61f41b..b4f708ad56511 100644
--- a/pkgs/top-level/unix-tools.nix
+++ b/pkgs/top-level/unix-tools.nix
@@ -55,15 +55,15 @@ let
darwin = pkgs.darwin.network_cmds;
};
col = {
- linux = pkgs.utillinux;
+ linux = pkgs.util-linux;
darwin = pkgs.darwin.text_cmds;
};
column = {
- linux = pkgs.utillinux;
+ linux = pkgs.util-linux;
darwin = pkgs.netbsd.column;
};
eject = {
- linux = pkgs.utillinux;
+ linux = pkgs.util-linux;
};
getconf = {
linux = if stdenv.hostPlatform.libc == "glibc" then pkgs.stdenv.cc.libc
@@ -76,19 +76,19 @@ let
darwin = pkgs.netbsd.getent;
};
getopt = {
- linux = pkgs.utillinux;
+ linux = pkgs.util-linux;
darwin = pkgs.getopt;
};
fdisk = {
- linux = pkgs.utillinux;
+ linux = pkgs.util-linux;
darwin = pkgs.darwin.diskdev_cmds;
};
fsck = {
- linux = pkgs.utillinux;
+ linux = pkgs.util-linux;
darwin = pkgs.darwin.diskdev_cmds;
};
hexdump = {
- linux = pkgs.utillinux;
+ linux = pkgs.util-linux;
darwin = pkgs.darwin.shell_cmds;
};
hostname = {
@@ -108,14 +108,14 @@ let
darwin = pkgs.netbsd.locale;
};
logger = {
- linux = pkgs.utillinux;
+ linux = pkgs.util-linux;
};
more = {
- linux = pkgs.utillinux;
+ linux = pkgs.util-linux;
darwin = more_compat;
};
mount = {
- linux = pkgs.utillinux;
+ linux = pkgs.util-linux;
darwin = pkgs.darwin.diskdev_cmds;
};
netstat = {
@@ -139,7 +139,7 @@ let
darwin = pkgs.darwin.network_cmds;
};
script = {
- linux = pkgs.utillinux;
+ linux = pkgs.util-linux;
darwin = pkgs.darwin.shell_cmds;
};
sysctl = {
@@ -151,15 +151,15 @@ let
darwin = pkgs.darwin.top;
};
umount = {
- linux = pkgs.utillinux;
+ linux = pkgs.util-linux;
darwin = pkgs.darwin.diskdev_cmds;
};
whereis = {
- linux = pkgs.utillinux;
+ linux = pkgs.util-linux;
darwin = pkgs.darwin.shell_cmds;
};
wall = {
- linux = pkgs.utillinux;
+ linux = pkgs.util-linux;
};
watch = {
linux = pkgs.procps;
@@ -169,7 +169,7 @@ let
darwin = pkgs.callPackage ../os-specific/linux/procps-ng {};
};
write = {
- linux = pkgs.utillinux;
+ linux = pkgs.util-linux;
darwin = pkgs.darwin.basic_cmds;
};
xxd = {
@@ -188,7 +188,7 @@ let
# Provided for old usage of these commands.
compat = with bins; lib.mapAttrs makeCompat {
procps = [ ps sysctl top watch ];
- utillinux = [ fsck fdisk getopt hexdump mount
+ util-linux = [ fsck fdisk getopt hexdump mount
script umount whereis write col column ];
nettools = [ arp hostname ifconfig netstat route ];
};