utillinux: rename to util-linux

Changed files
+574 -571
nixos
pkgs
applications
audio
clerk
strawberry
whipper
blockchains
graphics
comical
misc
clight
clipmenu
corectrl
imag
lutris
multibootusb
todoist-electron
udevil
vifm
networking
browsers
chromium
google-chrome
ungoogled-chromium
cluster
firehol
instant-messengers
matrix-recorder
telegram
tdesktop
zoom-us
remote
x2goserver
testssl
office
libreoffice
softmaker
science
math
terminal-emulators
roxterm
version-management
commitizen
git-and-tools
git-recent
hub
transcrypt
video
virtualization
OVMF
containerd
cri-o
docker
podman
singularity
virt-manager
xen
build-support
docker
singularity-tools
vm
desktops
enlightenment
plasma-5
plasma-desktop
development
compilers
haskell-modules
libraries
bobcat
glib
gnutls
hyperscan
kpmcore
libblockdev
libndctl
libseccomp
libvirt
libxsmm
speechd
volume-key
misc
google-clasp
mobile
abootimg
node-packages
python-modules
blivet
coloredlogs
git-annex-adapter
nuitka
pytorch
supervise_api
xlib
r-modules
ruby-modules
gem-config
tools
buildah
git-quick-stats
halfempty
misc
creduce
usb-modeswitch
yodl
web
games
unnethack
misc
base16-builder
cups
drivers
mfcj6510dwlpr
drivers
emulators
vscode-extensions
ms-vsliveshare-vsliveshare
os-specific
servers
apcupsd
asterisk
computing
torque
hylafaxplus
matrix-appservice-discord
matrix-synapse
matrix-appservice-slack
search
elasticsearch
web-apps
xmpp
ejabberd
zigbee2mqtt
zoneminder
shells
tools
X11
archivers
fsarchiver
backup
btrbk
duplicity
ori
bluetooth
blueberry
cd-dvd
bashburn
unetbootin
compression
filesystems
bcache-tools
bees
ceph
fatresize
glusterfs
nixpart
ntfs-3g
misc
calamares
cloud-utils
debootstrap
etcher
gparted
memtest86-efi
ostree
parted
partition-manager
profile-sync-daemon
rmlint
rpm-ostree
snapper
tlp
woeusb
xfstests
xvfb-run
networking
package-management
nixui
security
ecryptfs
pass
scrypt
system
facter
inxi
rofi-systemd
virtualization
alpine-make-vm-image
google-compute-engine
nixos-container
top-level
+2 -2
nixos/lib/make-disk-image.nix
···
binPath = with pkgs; makeBinPath (
[ rsync
-
utillinux
+
util-linux
parted
e2fsprogs
lkl
···
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}
+1 -1
nixos/modules/config/swap.nix
···
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 =
''
+1 -1
nixos/modules/config/system-path.nix
···
pkgs.procps
pkgs.su
pkgs.time
-
pkgs.utillinux
+
pkgs.util-linux
pkgs.which
pkgs.zstd
];
+2 -2
nixos/modules/config/zram.nix
···
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;
};
+3 -3
nixos/modules/installer/cd-dvd/sd-image.nix
···
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;
···
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
+1 -1
nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
···
boot.initrd.extraUtilsCommands =
''
-
copy_bin_and_libs ${pkgs.utillinux}/sbin/hwclock
+
copy_bin_and_libs ${pkgs.util-linux}/sbin/hwclock
'';
boot.initrd.postDeviceCommands =
+1 -1
nixos/modules/programs/x2goserver.nix
···
"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"
];
+1 -1
nixos/modules/security/pam_mount.nix
···
<!-- if activated, requires ofl from hxtools to be present -->
<logout wait="0" hup="no" term="no" kill="no" />
<!-- set PATH variable for pam_mount module -->
-
<path>${pkgs.utillinux}/bin</path>
+
<path>${pkgs.util-linux}/bin</path>
<!-- create mount point if not present -->
<mkmountpoint enable="1" remove="true" />
+2 -2
nixos/modules/security/wrappers/default.nix
···
# 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} = {
+1 -1
nixos/modules/services/admin/salt/master.nix
···
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
path = with pkgs; [
-
utillinux # for dmesg
+
util-linux # for dmesg
];
serviceConfig = {
ExecStart = "${pkgs.salt}/bin/salt-master";
+1 -1
nixos/modules/services/admin/salt/minion.nix
···
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
path = with pkgs; [
-
utillinux
+
util-linux
];
serviceConfig = {
ExecStart = "${pkgs.salt}/bin/salt-minion";
+2 -2
nixos/modules/services/backup/tarsnap.nix
···
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
···
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"'';
+1 -1
nixos/modules/services/cluster/kubernetes/kubelet.nix
···
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}"
+1 -1
nixos/modules/services/computing/torque/mom.nix
···
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
+1 -1
nixos/modules/services/computing/torque/server.nix
···
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)
+1 -1
nixos/modules/services/continuous-integration/gitlab-runner.nix
···
jq
moreutils
remarshal
-
utillinux
+
util-linux
cfg.package
] ++ cfg.extraPackages;
reloadIfChanged = true;
+1 -1
nixos/modules/services/databases/riak.nix
···
after = [ "network.target" ];
path = [
-
pkgs.utillinux # for `logger`
+
pkgs.util-linux # for `logger`
pkgs.bash
];
+2 -2
nixos/modules/services/desktops/profile-sync-daemon.nix
···
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/" ];
};
···
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";
+3 -3
nixos/modules/services/hardware/udev.nix
···
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
···
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" ];
+1 -1
nixos/modules/services/misc/fstrim.nix
···
config = mkIf cfg.enable {
-
systemd.packages = [ pkgs.utillinux ];
+
systemd.packages = [ pkgs.util-linux ];
systemd.timers.fstrim = {
timerConfig = {
+1 -1
nixos/modules/services/misc/gitlab.nix
···
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}'")
+1 -1
nixos/modules/services/misc/matrix-synapse.nix
···
${ 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";
};
};
+1 -1
nixos/modules/services/misc/nix-daemon.nix
···
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
+1 -1
nixos/modules/services/monitoring/netdata.nix
···
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
+1 -1
nixos/modules/services/monitoring/smartd.nix
···
$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}
+1 -1
nixos/modules/services/network-filesystems/openafs/client.nix
···
# 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
'';
+3 -3
nixos/modules/services/network-filesystems/xtreemfs.nix
···
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 {
···
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 {
···
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 {
+1 -1
nixos/modules/services/networking/networkmanager.nix
···
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" ];
};
+1 -1
nixos/modules/services/networking/strongswan-swanctl/module.nix
···
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";
+1 -1
nixos/modules/services/networking/strongswan.nix
···
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; };
+1 -1
nixos/modules/services/system/cloud-init.nix
···
nettools
openssh
shadow
-
utillinux
+
util-linux
] ++ optional cfg.btrfs.enable btrfs-progs
++ optional cfg.ext4.enable e2fsprogs
;
+3 -3
nixos/modules/services/torrent/transmission.nix
···
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*,
+1 -1
nixos/modules/services/ttys/agetty.nix
···
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
+1 -1
nixos/modules/services/web-apps/gerrit.nix
···
Set a UUID that uniquely identifies the server.
This can be generated with
-
<literal>nix-shell -p utillinux --run uuidgen</literal>.
+
<literal>nix-shell -p util-linux --run uuidgen</literal>.
'';
};
};
+2 -2
nixos/modules/services/web-servers/apache-httpd/default.nix
···
# 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
'';
+1 -1
nixos/modules/services/x11/terminal-server.nix
···
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";
+1 -1
nixos/modules/system/activation/activation-script.nix
···
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;
+2 -1
nixos/modules/system/activation/top-level.nix
···
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 =
+2 -2
nixos/modules/system/boot/grow-partition.nix
···
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" \
+2 -2
nixos/modules/system/boot/loader/grub/grub.nix
···
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 ""
···
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" (''
+1 -1
nixos/modules/system/boot/shutdown.nix
···
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"}";
};
};
+3 -3
nixos/modules/system/boot/stage-1.nix
···
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
···
--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 \
+1 -1
nixos/modules/system/boot/stage-2.nix
···
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"
+1 -1
nixos/modules/tasks/filesystems.nix
···
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
+3 -3
nixos/modules/tasks/filesystems/unionfs-fuse.nix
···
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
'';
})
+1 -1
nixos/modules/tasks/filesystems/zfs.nix
···
pkgs.gnugrep
pkgs.gnused
pkgs.nettools
-
pkgs.utillinux
+
pkgs.util-linux
];
};
+1 -1
nixos/modules/virtualisation/amazon-image.nix
···
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
+1 -1
nixos/modules/virtualisation/azure-agent.nix
···
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 ];
+1 -1
nixos/modules/virtualisation/brightbox-image.nix
···
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 ];
}
+1 -1
nixos/modules/virtualisation/qemu-vm.nix
···
'' 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}"
+2 -2
nixos/modules/virtualisation/xen-dom0.nix
···
''
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
'';
+1 -1
nixos/tests/os-prober.nix
···
${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
+1 -1
nixos/tests/systemd.nix
···
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
+3 -3
nixos/tests/virtualbox.nix
···
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 <<EOF
···
boot.initrd.extraUtilsCommands = ''
copy_bin_and_libs "${guestAdditions}/bin/mount.vboxsf"
-
copy_bin_and_libs "${pkgs.utillinux}/bin/unshare"
+
copy_bin_and_libs "${pkgs.util-linux}/bin/unshare"
${(attrs.extraUtilsCommands or (const "")) pkgs}
'';
···
"$diskImage" "$out/disk.vdi"
'';
-
buildInputs = [ pkgs.utillinux pkgs.perl ];
+
buildInputs = [ pkgs.util-linux pkgs.perl ];
} ''
${pkgs.parted}/sbin/parted --script /dev/vda mklabel msdos
${pkgs.parted}/sbin/parted --script /dev/vda -- mkpart primary ext2 1M -1s
+2 -2
pkgs/applications/audio/clerk/default.nix
···
{ stdenv, fetchFromGitHub, makeWrapper, rofi, mpc_cli, perl,
-
utillinux, pythonPackages, libnotify }:
+
util-linux, pythonPackages, libnotify }:
stdenv.mkDerivation {
name = "clerk-2016-10-14";
···
installPhase = ''
DESTDIR=$out PREFIX=/ make install
wrapProgram $out/bin/clerk \
-
--prefix PATH : "${stdenv.lib.makeBinPath [ rofi mpc_cli perl utillinux libnotify ]}"
+
--prefix PATH : "${stdenv.lib.makeBinPath [ rofi mpc_cli perl util-linux libnotify ]}"
'';
meta = with stdenv.lib; {
+2 -2
pkgs/applications/audio/strawberry/default.nix
···
, libselinux ? null
, libsepol ? null
, p11-kit ? null
-
, utillinux ? null
+
, util-linux ? null
, qtbase
, qtx11extras
, qttools
···
libselinux
libsepol
p11-kit
-
utillinux
+
util-linux
]
++ lib.optionals withGstreamer (with gst_all_1; [
gstreamer
+2 -2
pkgs/applications/audio/whipper/default.nix
···
{ stdenv, fetchFromGitHub, python3, cdparanoia, cdrdao, flac
-
, sox, accuraterip-checksum, libsndfile, utillinux, substituteAll }:
+
, sox, accuraterip-checksum, libsndfile, util-linux, substituteAll }:
python3.pkgs.buildPythonApplication rec {
pname = "whipper";
···
];
makeWrapperArgs = [
-
"--prefix" "PATH" ":" (stdenv.lib.makeBinPath [ accuraterip-checksum cdrdao utillinux flac sox ])
+
"--prefix" "PATH" ":" (stdenv.lib.makeBinPath [ accuraterip-checksum cdrdao util-linux flac sox ])
];
preBuild = ''
+2 -2
pkgs/applications/blockchains/bitcoin-abc.nix
···
{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, openssl, db53, boost
-
, zlib, miniupnpc, qtbase ? null , qttools ? null, utillinux, protobuf, qrencode, libevent
+
, zlib, miniupnpc, qtbase ? null , qttools ? null, util-linux, protobuf, qrencode, libevent
, withGui, python3, jemalloc, zeromq4 }:
with stdenv.lib;
···
nativeBuildInputs = [ pkgconfig cmake ];
buildInputs = [ openssl db53 boost zlib python3 jemalloc zeromq4
-
miniupnpc utillinux protobuf libevent ]
+
miniupnpc util-linux protobuf libevent ]
++ optionals withGui [ qtbase qttools qrencode ];
cmakeFlags = optionals (!withGui) [
+2 -2
pkgs/applications/blockchains/bitcoin-classic.nix
···
{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost
-
, zlib, miniupnpc, qtbase ? null, qttools ? null, utillinux, protobuf, qrencode, libevent
+
, zlib, miniupnpc, qtbase ? null, qttools ? null, util-linux, protobuf, qrencode, libevent
, withGui }:
with stdenv.lib;
···
nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = [ openssl db48 boost zlib
-
miniupnpc utillinux protobuf libevent ]
+
miniupnpc util-linux protobuf libevent ]
++ optionals withGui [ qtbase qttools qrencode ];
configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
+2 -2
pkgs/applications/blockchains/bitcoin-knots.nix
···
, miniupnpc
, libevent
, protobuf
-
, utillinux
+
, util-linux
}:
stdenv.mkDerivation rec {
···
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
-
buildInputs = [ openssl db5 openssl utillinux
+
buildInputs = [ openssl db5 openssl util-linux
protobuf boost zlib miniupnpc libevent ];
configureFlags = [ "--with-incompatible-bdb"
+2 -2
pkgs/applications/blockchains/bitcoin-unlimited.nix
···
{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost
-
, zlib, miniupnpc, utillinux, protobuf, qrencode, libevent, python3
+
, zlib, miniupnpc, util-linux, protobuf, qrencode, libevent, python3
, withGui, wrapQtAppsHook ? null, qtbase ? null, qttools ? null
, Foundation, ApplicationServices, AppKit }:
···
nativeBuildInputs = [ pkgconfig autoreconfHook python3 ]
++ optionals withGui [ wrapQtAppsHook qttools ];
buildInputs = [ openssl db48 boost zlib
-
miniupnpc utillinux protobuf libevent ]
+
miniupnpc util-linux protobuf libevent ]
++ optionals withGui [ qtbase qttools qrencode ]
++ optionals stdenv.isDarwin [ Foundation ApplicationServices AppKit ];
+2 -2
pkgs/applications/blockchains/bitcoin.nix
···
, qtbase ? null
, qttools ? null
, wrapQtAppsHook ? null
-
, utillinux
+
, util-linux
, python3
, qrencode
, libevent
···
++ optional stdenv.isDarwin hexdump
++ optional withGui wrapQtAppsHook;
buildInputs = [ db48 boost zlib zeromq miniupnpc libevent ]
-
++ optionals stdenv.isLinux [ utillinux ]
+
++ optionals stdenv.isLinux [ util-linux ]
++ optionals withGui [ qtbase qttools qrencode ];
postInstall = optional withGui ''
+2 -2
pkgs/applications/blockchains/dashpay.nix
···
{ fetchFromGitHub, stdenv, pkgconfig, autoreconfHook
, openssl, db48, boost, zlib, miniupnpc
, qrencode, glib, protobuf, yasm, libevent
-
, utillinux
+
, util-linux
, enable_Upnp ? false
, disable_Wallet ? false
, disable_Daemon ? false }:
···
nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = [ glib openssl db48 yasm boost zlib libevent
-
miniupnpc protobuf qrencode utillinux ];
+
miniupnpc protobuf qrencode util-linux ];
configureFlags = [ "--with-boost-libdir=${boost.out}/lib --with-gui=no" ]
+2 -2
pkgs/applications/blockchains/dogecoin.nix
···
{ stdenv , fetchFromGitHub
, pkgconfig, autoreconfHook
, db5, openssl, boost, zlib, miniupnpc, libevent
-
, protobuf, utillinux, qt4, qrencode
+
, protobuf, util-linux, qt4, qrencode
, withGui }:
with stdenv.lib;
···
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
-
buildInputs = [ openssl db5 openssl utillinux
+
buildInputs = [ openssl db5 openssl util-linux
protobuf boost zlib miniupnpc libevent ]
++ optionals withGui [ qt4 qrencode ];
+2 -2
pkgs/applications/blockchains/exodus/default.nix
···
{ stdenv, lib, fetchurl, unzip, glib, systemd, nss, nspr, gtk3-x11, pango,
-
atk, cairo, gdk-pixbuf, xorg, xorg_sys_opengl, utillinux, alsaLib, dbus, at-spi2-atk,
+
atk, cairo, gdk-pixbuf, xorg, xorg_sys_opengl, util-linux, alsaLib, dbus, at-spi2-atk,
cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core }:
stdenv.mkDerivation rec {
···
xorg.libXrender
xorg.libXtst
xorg_sys_opengl
-
utillinux
+
util-linux
xorg.libXrandr
xorg.libXScrnSaver
alsaLib
+2 -2
pkgs/applications/blockchains/litecoin.nix
···
{ stdenv, mkDerivation, fetchFromGitHub
, pkgconfig, autoreconfHook
, openssl, db48, boost, zlib, miniupnpc
-
, glib, protobuf, utillinux, qrencode
+
, glib, protobuf, util-linux, qrencode
, AppKit
, withGui ? true, libevent
, qtbase, qttools
···
nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = [ openssl db48 boost zlib zeromq
-
miniupnpc glib protobuf utillinux libevent ]
+
miniupnpc glib protobuf util-linux libevent ]
++ optionals stdenv.isDarwin [ AppKit ]
++ optionals withGui [ qtbase qttools qrencode ];
+2 -2
pkgs/applications/blockchains/pivx.nix
···
{ fetchFromGitHub, stdenv, pkgconfig, autoreconfHook, wrapQtAppsHook ? null
, openssl, db48, boost, zlib, miniupnpc, gmp
, qrencode, glib, protobuf, yasm, libevent
-
, utillinux, qtbase ? null, qttools ? null
+
, util-linux, qtbase ? null, qttools ? null
, enableUpnp ? false
, disableWallet ? false
, disableDaemon ? false
···
};
nativeBuildInputs = [ pkgconfig autoreconfHook ] ++ optionals withGui [ wrapQtAppsHook ];
-
buildInputs = [ glib gmp openssl db48 yasm boost zlib libevent miniupnpc protobuf utillinux ]
+
buildInputs = [ glib gmp openssl db48 yasm boost zlib libevent miniupnpc protobuf util-linux ]
++ optionals withGui [ qtbase qttools qrencode ];
configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
+2 -2
pkgs/applications/blockchains/zcash/default.nix
···
{ stdenv, libsodium, fetchFromGitHub, wget, pkgconfig, autoreconfHook, openssl, db62, boost17x
-
, zlib, gtest, gmock, callPackage, gmp, qt4, utillinux, protobuf, qrencode, libevent }:
+
, zlib, gtest, gmock, callPackage, gmp, qt4, util-linux, protobuf, qrencode, libevent }:
let librustzcash = callPackage ./librustzcash {};
in
···
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ gtest gmock gmp openssl wget db62 boost17x zlib
protobuf libevent libsodium librustzcash ]
-
++ optionals stdenv.isLinux [ utillinux ];
+
++ optionals stdenv.isLinux [ util-linux ];
configureFlags = [ "--with-boost-libdir=${boost17x.out}/lib" ];
+2 -2
pkgs/applications/graphics/comical/default.nix
···
-
{stdenv, fetchurl, wxGTK, utillinux, zlib }:
+
{stdenv, fetchurl, wxGTK, util-linux, zlib }:
stdenv.mkDerivation rec {
name = "comical-0.8";
···
url = "mirror://sourceforge/comical/${name}.tar.gz";
sha256 = "0b6527cc06b25a937041f1eb248d0fd881cf055362097036b939817f785ab85e";
};
-
buildInputs = [ wxGTK utillinux zlib ];
+
buildInputs = [ wxGTK util-linux zlib ];
preBuild="makeFlags=\"prefix=$out\"";
patches = [ ./wxgtk-2.8.patch ];
+2 -2
pkgs/applications/misc/clight/clightd.nix
···
{ lib, stdenv, fetchFromGitHub
, dbus, cmake, pkgconfig
, glib, udev, polkit, libmodule
-
, pcre, libXdmcp, utillinux, libpthreadstubs
+
, pcre, libXdmcp, util-linux, libpthreadstubs
, enableDdc ? true, ddcutil
, enableDpms ? true, libXext
, enableGamma ? true, libXrandr
···
pcre
libXdmcp
-
utillinux
+
util-linux
libpthreadstubs
] ++ optional enableDdc ddcutil
++ optional enableDpms libXext
+2 -2
pkgs/applications/misc/clipmenu/default.nix
···
-
{ clipnotify, makeWrapper, xsel, dmenu, utillinux, gawk, stdenv, fetchFromGitHub, fetchpatch, lib }:
+
{ clipnotify, makeWrapper, xsel, dmenu, util-linux, gawk, stdenv, fetchFromGitHub, fetchpatch, lib }:
let
-
runtimePath = lib.makeBinPath [ clipnotify xsel dmenu utillinux gawk ];
+
runtimePath = lib.makeBinPath [ clipnotify xsel dmenu util-linux gawk ];
in
stdenv.mkDerivation rec {
pname = "clipmenu";
+2 -2
pkgs/applications/misc/corectrl/default.nix
···
, libdrm
, mesa-demos
, procps
-
, utillinux
+
, util-linux
, vulkan-tools
, qtbase
, qtcharts
···
libdrm
mesa-demos
procps
-
utillinux
+
util-linux
vulkan-tools
qtbase
qtcharts
+2 -2
pkgs/applications/misc/imag/default.nix
···
, installShellFiles
, Security
, gitMinimal
-
, utillinuxMinimal
+
, util-linuxMinimal
}:
rustPlatform.buildRustPackage rec {
···
nativeBuildInputs = [ installShellFiles pkg-config ];
buildInputs = [ openssl ]
++ stdenv.lib.optional stdenv.isDarwin Security;
-
checkInputs = [ gitMinimal utillinuxMinimal ];
+
checkInputs = [ gitMinimal util-linuxMinimal ];
LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
+1 -1
pkgs/applications/misc/lutris/fhsenv.nix
···
# WINE
cups lcms2 mpg123 cairo unixODBC samba4 sane-backends openldap
-
ocl-icd utillinux libkrb5
+
ocl-icd util-linux libkrb5
# Proton
libselinux
+2 -2
pkgs/applications/misc/multibootusb/default.nix
···
{ fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, qemu, unzip, zip,
coreutils, gnugrep, which, gnused, e2fsprogs, autoPatchelfHook, gptfdisk,
-
python36Packages, qt5, runtimeShell, stdenv, utillinux, wrapQtAppsHook }:
+
python36Packages, qt5, runtimeShell, stdenv, util-linux, wrapQtAppsHook }:
# Note: Multibootusb is tricky to maintain. It relies on the
# $PYTHONPATH variable containing some of their code, so that
···
gnugrep
which
parted
-
utillinux
+
util-linux
qemu
p7zip
gnused
+2 -2
pkgs/applications/misc/todoist-electron/default.nix
···
{ stdenv, lib, fetchurl, makeDesktopItem, dpkg, atk, at-spi2-atk, glib, pango, gdk-pixbuf
, gtk3, cairo, freetype, fontconfig, dbus, xorg, nss, nspr, alsaLib, cups, expat
-
, udev, libpulseaudio, utillinux, makeWrapper }:
+
, udev, libpulseaudio, util-linux, makeWrapper }:
stdenv.mkDerivation rec {
pname = "todoist-electron";
···
installPhase = let
libPath = lib.makeLibraryPath ([
stdenv.cc.cc gtk3 atk at-spi2-atk glib pango gdk-pixbuf cairo freetype fontconfig dbus
-
nss nspr alsaLib libpulseaudio cups expat udev utillinux
+
nss nspr alsaLib libpulseaudio cups expat udev util-linux
] ++ (with xorg; [
libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb
libXrender libX11 libXtst libXScrnSaver
+4 -4
pkgs/applications/misc/udevil/default.nix
···
-
{ stdenv, fetchurl, intltool, glib, pkgconfig, udev, utillinux, acl }:
+
{ stdenv, fetchurl, intltool, glib, pkgconfig, udev, util-linux, acl }:
stdenv.mkDerivation {
name = "udevil-0.4.4";
src = fetchurl {
···
substituteInPlace src/Makefile.in --replace 4755 0755
./configure \
--prefix=$out \
-
--with-mount-prog=${utillinux}/bin/mount \
-
--with-umount-prog=${utillinux}/bin/umount \
-
--with-losetup-prog=${utillinux}/bin/losetup \
+
--with-mount-prog=${util-linux}/bin/mount \
+
--with-umount-prog=${util-linux}/bin/umount \
+
--with-losetup-prog=${util-linux}/bin/losetup \
--with-setfacl-prog=${acl.bin}/bin/setfacl \
--sysconfdir=$prefix/etc
'';
+2 -2
pkgs/applications/misc/vifm/default.nix
···
{ stdenv, fetchurl, makeWrapper
, pkgconfig
, ncurses, libX11
-
, utillinux, file, which, groff
+
, util-linux, file, which, groff
# adds support for handling removable media (vifm-media). Linux only!
, mediaSupport ? false, python3 ? null, udisks2 ? null, lib ? null
···
};
nativeBuildInputs = [ pkgconfig makeWrapper ];
-
buildInputs = [ ncurses libX11 utillinux file which groff ];
+
buildInputs = [ ncurses libX11 util-linux file which groff ];
postFixup = let
path = lib.makeBinPath
+2 -2
pkgs/applications/networking/browsers/chromium/common.nix
···
, python2Packages, perl, pkgconfig
, nspr, systemd, kerberos
-
, utillinux, alsaLib
+
, util-linux, alsaLib
, bison, gperf
, glib, gtk3, dbus-glib
, glibc
···
buildInputs = defaultDependencies ++ [
nspr nss systemd
-
utillinux alsaLib
+
util-linux alsaLib
bison gperf kerberos
glib gtk3 dbus-glib
libXScrnSaver libXcursor libXtst libGLU libGL
+2 -2
pkgs/applications/networking/browsers/google-chrome/default.nix
···
# Additional dependencies according to other distros.
## Ubuntu
-
, liberation_ttf, curl, utillinux, xdg_utils, wget
+
, liberation_ttf, curl, util-linux, xdg_utils, wget
## Arch Linux.
, flac, harfbuzz, icu, libpng, libopus, snappy, speechd
## Gentoo
···
dbus gdk-pixbuf gcc-unwrapped.lib
systemd
libexif
-
liberation_ttf curl utillinux xdg_utils wget
+
liberation_ttf curl util-linux xdg_utils wget
flac harfbuzz icu libpng opusWithCustomModes snappy speechd
bzip2 libcap at-spi2-atk at-spi2-core
kerberos libdrm mesa coreutils
+2 -2
pkgs/applications/networking/browsers/ungoogled-chromium/common.nix
···
, python2Packages, perl, pkgconfig
, nspr, systemd, kerberos
-
, utillinux, alsaLib
+
, util-linux, alsaLib
, bison, gperf
, glib, gtk3, dbus-glib
, glibc
···
buildInputs = defaultDependencies ++ [
nspr nss systemd
-
utillinux alsaLib
+
util-linux alsaLib
bison gperf kerberos
glib gtk3 dbus-glib
libXScrnSaver libXcursor libXtst libGLU libGL
+2 -2
pkgs/applications/networking/cluster/k3s/default.nix
···
, libseccomp
, pkgconfig
, ethtool
-
, utillinux
+
, util-linux
, ipset
, fetchFromGitHub
, fetchurl
···
iproute
bridge-utils
ethtool
-
utillinux
+
util-linux
ipset
conntrack-tools
];
+1 -1
pkgs/applications/networking/cluster/openshift/default.nix
···
-
{ stdenv, lib, fetchFromGitHub, buildGoPackage, which, go-bindata, rsync, utillinux
+
{ stdenv, lib, fetchFromGitHub, buildGoPackage, which, go-bindata, rsync, util-linux
, coreutils, kerberos, ncurses, clang, installShellFiles
, components ? [
"cmd/oc"
+1 -1
pkgs/applications/networking/cluster/spacegun/node-composition.nix
···
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;
};
+2 -2
pkgs/applications/networking/firehol/default.nix
···
{ stdenv, lib, fetchFromGitHub, pkgs
, autoconf, automake, curl, iprange, iproute, ipset, iptables, iputils
-
, kmod, nettools, procps, tcpdump, traceroute, utillinux, whois
+
, kmod, nettools, procps, tcpdump, traceroute, util-linux, whois
# If true, just install FireQOS without FireHOL
, onlyQOS ? false
···
nativeBuildInputs = [ autoconf automake ];
buildInputs = [
curl iprange iproute ipset iptables iputils kmod
-
nettools procps tcpdump traceroute utillinux whois
+
nettools procps tcpdump traceroute util-linux whois
];
preConfigure = "./autogen.sh";
+1 -1
pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix
···
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;
};
+4 -4
pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix
···
# 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;
···
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;
···
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;
···
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 <<EOF
+2 -2
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
···
, dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3
, tl-expected, hunspell
# TODO: Shouldn't be required:
-
, pcre, xorg, utillinux, libselinux, libsepol, epoxy, at-spi2-core, libXtst
+
, pcre, xorg, util-linux, libselinux, libsepol, epoxy, at-spi2-core, libXtst
, xdg_utils
}:
···
tl-expected hunspell
tg_owt
# TODO: Shouldn't be required:
-
pcre xorg.libpthreadstubs xorg.libXdmcp utillinux libselinux libsepol epoxy at-spi2-core libXtst
+
pcre xorg.libpthreadstubs xorg.libXdmcp util-linux libselinux libsepol epoxy at-spi2-core libXtst
];
enableParallelBuilding = true;
+2 -2
pkgs/applications/networking/instant-messengers/zoom-us/default.nix
···
, qtquickcontrols2, qtscript, qtsvg , qttools, qtwayland, qtwebchannel
, qtwebengine
# Runtime
-
, coreutils, faac, pciutils, procps, utillinux
+
, coreutils, faac, pciutils, procps, util-linux
, pulseaudioSupport ? true, libpulseaudio ? null
, alsaSupport ? stdenv.isLinux, alsaLib ? null
}:
···
dontWrapQtApps = true;
qtWrapperArgs = [
-
''--prefix PATH : ${makeBinPath [ coreutils glib.dev pciutils procps qttools.dev utillinux ]}''
+
''--prefix PATH : ${makeBinPath [ coreutils glib.dev pciutils procps qttools.dev util-linux ]}''
# --run "cd ${placeholder "out"}/share/zoom-us"
# ^^ unfortunately, breaks run arg into multiple array elements, due to
# some bad array propagation. We'll do that in bash below
+2 -2
pkgs/applications/networking/remote/x2goserver/default.nix
···
{ stdenv, lib, fetchurl, perlPackages, makeWrapper, perl, which, nx-libs
-
, utillinux, coreutils, glibc, gawk, gnused, gnugrep, findutils, xorg
+
, util-linux, coreutils, glibc, gawk, gnused, gnugrep, findutils, xorg
, nettools, iproute, bc, procps, psmisc, lsof, pwgen, openssh, sshfs, bash
}:
···
]);
binaryDeps = [
-
perlEnv which nx-libs utillinux coreutils glibc.bin gawk gnused gnugrep
+
perlEnv which nx-libs util-linux coreutils glibc.bin gawk gnused gnugrep
findutils nettools iproute bc procps psmisc lsof pwgen openssh sshfs
xorg.xauth xorg.xinit xorg.xrandr xorg.xmodmap xorg.xwininfo xorg.fontutil
xorg.xkbcomp xorg.setxkbmap
+2 -2
pkgs/applications/networking/testssl/default.nix
···
{ stdenv, fetchFromGitHub, makeWrapper, lib
-
, dnsutils, coreutils, openssl, nettools, utillinux, procps }:
+
, dnsutils, coreutils, openssl, nettools, util-linux, procps }:
stdenv.mkDerivation rec {
pname = "testssl.sh";
···
nettools # for hostname
openssl # for openssl
procps # for ps
-
utillinux # for hexdump
+
util-linux # for hexdump
];
postPatch = ''
+2 -2
pkgs/applications/office/libreoffice/default.nix
···
, libxml2, db, curl, fontconfig, libsndfile, neon
, bison, flex, zip, unzip, gtk3, libmspack, getopt, file, cairo, which
, icu, boost, jdk, ant, cups, xorg, libcmis, fontforge
-
, openssl, gperf, cppunit, poppler, utillinux
+
, openssl, gperf, cppunit, poppler, util-linux
, librsvg, libGLU, libGL, bsh, CoinMP, libwps, libabw, libmysqlclient
, autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
, libwpg, dbus-glib, clucene_core, libcdr, lcms
···
neon nspr nss openldap openssl pam perl pkgconfig poppler
python3 sane-backends unzip which zip zlib
mdds bluez5 libcmis libwps libabw libzmf
-
libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux
+
libxshmfence libatomic_ops graphite2 harfbuzz gpgme util-linux
librevenge libe-book libmwaw glm ncurses epoxy
libodfgen CoinMP librdf_rasqal gnome3.adwaita-icon-theme gettext
]
+2 -2
pkgs/applications/office/softmaker/generic.nix
···
, coreutils, libredirect
# Extra utilities used by the SoftMaker applications.
-
, gnugrep, utillinux, which
+
, gnugrep, util-linux, which
, pname, version, edition, suiteName, src, archive
···
extraWrapperArgs = ''
--set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
--set NIX_REDIRECTS "/bin/ls=${coreutils}/bin/ls" \
-
--prefix PATH : "${stdenv.lib.makeBinPath [ coreutils gnugrep utillinux which ]}"
+
--prefix PATH : "${stdenv.lib.makeBinPath [ coreutils gnugrep util-linux which ]}"
'';
in ''
runHook preInstall
+2 -2
pkgs/applications/science/math/calc/default.nix
···
-
{ stdenv, lib, fetchurl, utillinux, makeWrapper
+
{ stdenv, lib, fetchurl, util-linux, makeWrapper
, enableReadline ? true, readline, ncurses }:
stdenv.mkDerivation rec {
···
--replace '-install_name ''${LIBDIR}/libcustcalc''${LIB_EXT_VERSION}' '-install_name ''${T}''${LIBDIR}/libcustcalc''${LIB_EXT_VERSION}'
'';
-
buildInputs = [ utillinux makeWrapper ]
+
buildInputs = [ util-linux makeWrapper ]
++ lib.optionals enableReadline [ readline ncurses ];
makeFlags = [
+2 -2
pkgs/applications/terminal-emulators/roxterm/default.nix
···
{ at-spi2-core, cmake, dbus, dbus-glib, docbook_xsl, epoxy, fetchpatch, fetchFromGitHub
, glib, gtk3, harfbuzz, libXdmcp, libXtst, libpthreadstubs
, libselinux, libsepol, libtasn1, libxkbcommon, libxslt, p11-kit, pcre2
-
, pkgconfig, stdenv, utillinuxMinimal, vte, wrapGAppsHook, xmlto
+
, pkgconfig, stdenv, util-linuxMinimal, vte, wrapGAppsHook, xmlto
}:
stdenv.mkDerivation rec {
···
buildInputs =
[ gtk3 dbus dbus-glib vte pcre2 harfbuzz libpthreadstubs libXdmcp
-
utillinuxMinimal glib docbook_xsl xmlto libselinux
+
util-linuxMinimal glib docbook_xsl xmlto libselinux
libsepol libxkbcommon epoxy at-spi2-core libXtst libtasn1 p11-kit
];
+1 -1
pkgs/applications/version-management/commitizen/node-composition.nix
···
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;
};
+4 -4
pkgs/applications/version-management/commitizen/node-env.nix
···
# 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;
···
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;
···
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;
···
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 <<EOF
+1 -1
pkgs/applications/version-management/git-and-tools/default.nix
···
git-radar = callPackage ./git-radar { };
git-recent = callPackage ./git-recent {
-
utillinux = if stdenv.isLinux then utillinuxMinimal else utillinux;
+
util-linux = if stdenv.isLinux then util-linuxMinimal else util-linux;
};
git-remote-codecommit = python3Packages.callPackage ./git-remote-codecommit { };
+3 -3
pkgs/applications/version-management/git-and-tools/git-recent/default.nix
···
{stdenv, git, less, fetchFromGitHub, makeWrapper
-
# utillinuxMinimal is included because we need the column command
-
, utillinux
+
# util-linuxMinimal is included because we need the column command
+
, util-linux
}:
stdenv.mkDerivation rec {
···
mkdir -p $out/bin
cp git-recent $out/bin
wrapProgram $out/bin/git-recent \
-
--prefix PATH : "${stdenv.lib.makeBinPath [ git less utillinux ]}"
+
--prefix PATH : "${stdenv.lib.makeBinPath [ git less util-linux ]}"
'';
meta = with stdenv.lib; {
+2 -2
pkgs/applications/version-management/git-and-tools/hub/default.nix
···
-
{ stdenv, buildGoPackage, fetchFromGitHub, groff, installShellFiles, utillinux }:
+
{ stdenv, buildGoPackage, fetchFromGitHub, groff, installShellFiles, util-linux }:
buildGoPackage rec {
pname = "hub";
···
sha256 = "1qjab3dpia1jdlszz3xxix76lqrm4zbmqzd9ymld7h06awzsg2vh";
};
-
nativeBuildInputs = [ groff installShellFiles utillinux ];
+
nativeBuildInputs = [ groff installShellFiles util-linux ];
postPatch = ''
patchShebangs .
+3 -3
pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
···
-
{ stdenv, fetchFromGitHub, git, makeWrapper, openssl, coreutils, utillinux, gnugrep, gnused, gawk }:
+
{ stdenv, fetchFromGitHub, git, makeWrapper, openssl, coreutils, util-linux, gnugrep, gnused, gawk }:
stdenv.mkDerivation rec {
pname = "transcrypt";
···
sha256 = "1dkr69plk16wllk5bzlkchrzw63pk239dgbjhrb3mb61i065jdam";
};
-
buildInputs = [ makeWrapper git openssl coreutils utillinux gnugrep gnused gawk ];
+
buildInputs = [ makeWrapper git openssl coreutils util-linux gnugrep gnused gawk ];
patches = [ ./helper-scripts_depspathprefix.patch ];
···
install -m 644 -D contrib/zsh/_transcrypt $out/share/zsh/site-functions/_transcrypt
wrapProgram $out/bin/transcrypt \
-
--prefix PATH : "${stdenv.lib.makeBinPath [ git openssl coreutils utillinux gnugrep gnused gawk ]}"
+
--prefix PATH : "${stdenv.lib.makeBinPath [ git openssl coreutils util-linux gnugrep gnused gawk ]}"
cat > $out/bin/transcrypt-depspathprefix << EOF
#!${stdenv.shell}
+2 -2
pkgs/applications/video/vcs/default.nix
···
{ 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";
+2 -2
pkgs/applications/video/vdr/plugins.nix
···
{ 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 {
···
nativeBuildInputs = [
perl # for pod2man and pos2html
-
utillinux
+
util-linux
groff
];
+2 -2
pkgs/applications/virtualization/OVMF/default.nix
···
-
{ stdenv, lib, edk2, utillinux, nasm, iasl
+
{ stdenv, lib, edk2, util-linux, nasm, iasl
, csmSupport ? false, seabios ? null
, secureBoot ? false
}:
···
outputs = [ "out" "fd" ];
-
buildInputs = [ utillinux nasm iasl ];
+
buildInputs = [ util-linux nasm iasl ];
hardeningDisable = [ "format" "stackprotector" "pic" "fortify" ];
+2 -2
pkgs/applications/virtualization/containerd/default.nix
···
-
{ lib, fetchFromGitHub, buildGoPackage, btrfs-progs, go-md2man, installShellFiles, utillinux, nixosTests }:
+
{ lib, fetchFromGitHub, buildGoPackage, btrfs-progs, go-md2man, installShellFiles, util-linux, nixosTests }:
with lib;
···
goPackagePath = "github.com/containerd/containerd";
outputs = [ "out" "man" ];
-
nativeBuildInputs = [ go-md2man installShellFiles utillinux ];
+
nativeBuildInputs = [ go-md2man installShellFiles util-linux ];
buildInputs = [ btrfs-progs ];
+2 -2
pkgs/applications/virtualization/cri-o/wrapper.nix
···
, 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
}:
···
runc
crun
conmon
-
utillinux
+
util-linux
iptables
] ++ extraPackages);
+2 -2
pkgs/applications/virtualization/docker/default.nix
···
, 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
}:
···
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}
+2 -2
pkgs/applications/virtualization/podman/wrapper.nix
···
, 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
}:
···
conmon
slirp4netns
fuse-overlayfs
-
utillinux
+
util-linux
iptables
] ++ extraPackages);
+2 -2
pkgs/applications/virtualization/singularity/default.nix
···
{stdenv
, lib
, fetchurl
-
, utillinux
+
, util-linux
, gpgme
, openssl
, libuuid
···
goPackagePath = "github.com/sylabs/singularity";
buildInputs = [ gpgme openssl libuuid ];
-
nativeBuildInputs = [ utillinux which makeWrapper cryptsetup ];
+
nativeBuildInputs = [ util-linux which makeWrapper cryptsetup ];
propagatedBuildInputs = [ coreutils squashfsTools ];
postPatch = ''
+2 -2
pkgs/applications/virtualization/virt-manager/qt.nix
···
{ 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 {
···
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 ];
+4 -4
pkgs/applications/virtualization/xen/generic.nix
···
# 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
···
#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
];
···
--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
+2 -2
pkgs/build-support/docker/default.nix
···
storeDir ? builtins.storeDir,
substituteAll,
symlinkJoin,
-
utillinux,
+
util-linux,
vmTools,
writeReferencesToFile,
writeScript,
···
};
inherit fromImage fromImageName fromImageTag;
-
nativeBuildInputs = [ utillinux e2fsprogs jshon rsync jq ];
+
nativeBuildInputs = [ util-linux e2fsprogs jshon rsync jq ];
} ''
mkdir disk
mkfs /dev/${vmTools.hd}
+2 -2
pkgs/build-support/singularity-tools/default.nix
···
, bash
, vmTools
, gawk
-
, utillinux
+
, util-linux
, runtimeShell
, e2fsprogs }:
···
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;
+16 -16
pkgs/build-support/vm/default.nix
···
# 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
···
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
···
with pkgs; runInLinuxVM (
stdenv.mkDerivation {
name = "extract-file";
-
buildInputs = [ utillinux ];
+
buildInputs = [ util-linux ];
buildCommand = ''
ln -s ${kernel}/lib /lib
${kmod}/bin/modprobe loop
···
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
···
# 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.
···
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..."
···
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 \
···
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; };
···
# 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..."
···
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; };
+2 -2
pkgs/desktops/enlightenment/efl/default.nix
···
, python3Packages
, systemd
, udev
-
, utillinux
+
, util-linux
, wayland
, wayland-protocols
, writeText
···
mint-x-icons # Mint-X is a parent icon theme of Enlightenment-X
openjpeg
poppler
-
utillinux
+
util-linux
wayland
xorg.libXScrnSaver
xorg.libXcomposite
+2 -2
pkgs/desktops/plasma-5/discover.nix
···
{
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
···
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
+2 -2
pkgs/desktops/plasma-5/plasma-desktop/default.nix
···
boost, fontconfig, ibus, libXcursor, libXft, libcanberra_kde, libpulseaudio,
libxkbfile, xf86inputevdev, xf86inputsynaptics, xinput, xkeyboard_config,
-
xorgserver, utillinux,
+
xorgserver, util-linux,
qtdeclarative, qtquickcontrols, qtquickcontrols2, qtsvg, qtx11extras,
···
'';
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"
+1 -1
pkgs/development/compilers/elm/packages/node-composition.nix
···
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;
};
+2 -2
pkgs/development/compilers/osl/default.nix
···
{ 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; };
···
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
+3 -3
pkgs/development/haskell-modules/hackage-packages.nix
···
, 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 {
···
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
+2 -2
pkgs/development/libraries/bobcat/default.nix
···
{ stdenv, fetchFromGitLab, icmake
, libmilter, libX11, openssl, readline
-
, utillinux, yodl }:
+
, util-linux, yodl }:
stdenv.mkDerivation rec {
pname = "bobcat";
···
owner = "fbb-git";
};
-
buildInputs = [ libmilter libX11 openssl readline utillinux ];
+
buildInputs = [ libmilter libX11 openssl readline util-linux ];
nativeBuildInputs = [ icmake yodl ];
setSourceRoot = ''
+4 -4
pkgs/development/libraries/glib/default.nix
···
{ 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)
···
with stdenv.lib;
-
assert stdenv.isLinux -> utillinuxMinimal != null;
+
assert stdenv.isLinux -> util-linuxMinimal != null;
# TODO:
# * Make it build without python
···
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
]);
+2 -2
pkgs/development/libraries/gnutls/default.nix
···
{ 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
···
nativeBuildInputs = [ perl pkgconfig ]
++ lib.optionals (isDarwin && !withSecurity) [ autoconf automake ]
-
++ lib.optionals doCheck [ which nettools utillinux ];
+
++ lib.optionals doCheck [ which nettools util-linux ];
propagatedBuildInputs = [ nettle ];
+2 -2
pkgs/development/libraries/hyperscan/default.nix
···
{ 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
}:
···
cmake ragel python3
# Consider simply using busybox for these
# Need at least: rev, sed, cut, nm
-
coreutils gnused utillinux
+
coreutils gnused util-linux
];
cmakeFlags = [
+2 -2
pkgs/development/libraries/kpmcore/default.nix
···
{ stdenv, lib, fetchurl, extra-cmake-modules
, qtbase, kio
, libatasmart, parted
-
, utillinux }:
+
, util-linux }:
stdenv.mkDerivation rec {
pname = "kpmcore";
···
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 ];
+2 -2
pkgs/development/libraries/libblockdev/default.nix
···
{ 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
}:
···
];
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
];
+2 -2
pkgs/development/libraries/libndctl/default.nix
···
{ 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 {
···
];
buildInputs =
-
[ json_c kmod utillinux udev keyutils
+
[ json_c kmod util-linux udev keyutils
];
configureFlags =
+2 -2
pkgs/development/libraries/libseccomp/default.nix
···
-
{ stdenv, fetchurl, getopt, utillinux, gperf }:
+
{ stdenv, fetchurl, getopt, util-linux, gperf }:
stdenv.mkDerivation rec {
pname = "libseccomp";
···
patchShebangs .
'';
-
checkInputs = [ utillinux ];
+
checkInputs = [ util-linux ];
doCheck = false; # dependency cycle
# Hack to ensure that patchelf --shrink-rpath get rids of a $TMPDIR reference.
+2 -2
pkgs/development/libraries/libvirt/5.9.0.nix
···
{ 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
···
] ++ 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
+2 -2
pkgs/development/libraries/libvirt/default.nix
···
{ 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
···
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
+2 -2
pkgs/development/libraries/libxsmm/default.nix
···
{ stdenv, fetchFromGitHub, coreutils, gfortran, gnused
-
, python3, utillinux, which
+
, python3, util-linux, which
, enableStatic ? false
}:
···
gfortran
gnused
python3
-
utillinux
+
util-linux
which
];
+2 -2
pkgs/development/libraries/speechd/default.nix
···
, itstool
, libtool
, texinfo
-
, utillinux
+
, util-linux
, autoreconfHook
, glib
, dotconf
···
patches = [
(substituteAll {
src = ./fix-paths.patch;
-
inherit utillinux;
+
utillinux = util-linux;
})
];
+2 -2
pkgs/development/libraries/volume-key/default.nix
···
{ 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
}:
···
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}"
+1 -1
pkgs/development/misc/google-clasp/google-clasp.nix
···
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;
};
+2 -2
pkgs/development/mobile/abootimg/default.nix
···
-
{ stdenv, fetchFromGitHub, coreutils, cpio, findutils, gzip, makeWrapper, utillinux }:
+
{ stdenv, fetchFromGitHub, coreutils, cpio, findutils, gzip, makeWrapper, util-linux }:
let
version = "0.6";
···
sha256 = "1qgx9fxwhylgnixzkz2mzv2707f65qq7rar2rsqak536vhig1z9a";
};
-
nativeBuildInputs = [ makeWrapper utillinux ];
+
nativeBuildInputs = [ makeWrapper util-linux ];
postPatch = ''
cat <<EOF > version.h
+1 -1
pkgs/development/node-packages/composition.nix
···
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;
};
+4 -4
pkgs/development/node-packages/node-env.nix
···
# 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;
···
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;
···
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;
···
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 <<EOF
+3 -3
pkgs/development/python-modules/blivet/default.nix
···
{ stdenv, fetchFromGitHub, buildPythonPackage, pykickstart, pyparted, pyblock
-
, pyudev, six, libselinux, multipath-tools, lsof, utillinux
+
, pyudev, six, libselinux, multipath-tools, lsof, util-linux
}:
buildPythonPackage rec {
···
-e '/^def set_friendly_names/a \ return False' \
blivet/devicelibs/mpath.py
sed -i -e '/"wipefs"/ {
-
s|wipefs|${utillinux}/sbin/wipefs|
+
s|wipefs|${util-linux}/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/\1"|' blivet/util.py
+
sed -i -r -e 's|"(u?mount)"|"${util-linux}/bin/\1"|' blivet/util.py
'';
propagatedBuildInputs = [
+2 -2
pkgs/development/python-modules/coloredlogs/default.nix
···
, capturer
, pytest
, mock
-
, utillinux
+
, util-linux
}:
buildPythonPackage rec {
···
PATH=$PATH:$out/bin pytest . -k "not test_plain_text_output_format \
and not test_auto_install"
'';
-
checkInputs = [ pytest mock utillinux ];
+
checkInputs = [ pytest mock util-linux ];
propagatedBuildInputs = [ humanfriendly verboselogs capturer ];
+2 -2
pkgs/development/python-modules/git-annex-adapter/default.nix
···
{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, substituteAll
-
, python, utillinux, pygit2, gitMinimal, git-annex, cacert
+
, python, util-linux, pygit2, gitMinimal, git-annex, cacert
}:
buildPythonPackage rec {
···
checkInputs = [
gitMinimal
-
utillinux # `rev` is needed in tests/test_process.py
+
util-linux # `rev` is needed in tests/test_process.py
];
propagatedBuildInputs = [ pygit2 cacert ];
+1 -1
pkgs/development/python-modules/nuitka/default.nix
···
postPatch = ''
patchShebangs tests/run-tests
'' + stdenv.lib.optionalString stdenv.isLinux ''
-
substituteInPlace nuitka/plugins/standard/ImplicitImports.py --replace 'locateDLL("uuid")' '"${pkgs.utillinux.out}/lib/libuuid.so"'
+
substituteInPlace nuitka/plugins/standard/ImplicitImports.py --replace 'locateDLL("uuid")' '"${pkgs.util-linux.out}/lib/libuuid.so"'
'';
# We do not want any wrappers here.
+2 -2
pkgs/development/python-modules/pytorch/default.nix
···
cudaArchList ? null,
# Native build inputs
-
cmake, utillinux, linkFarm, symlinkJoin, which,
+
cmake, util-linux, linkFarm, symlinkJoin, which,
# Build inputs
numactl,
···
nativeBuildInputs = [
cmake
-
utillinux
+
util-linux
which
ninja
] ++ lib.optionals cudaSupport [ cudatoolkit_joined ];
+2 -2
pkgs/development/python-modules/supervise_api/default.nix
···
, supervise
, isPy3k
, whichcraft
-
, utillinux
+
, util-linux
}:
buildPythonPackage rec {
···
propagatedBuildInputs = lib.optional (!isPy3k) whichcraft;
-
checkInputs = [ utillinux ];
+
checkInputs = [ util-linux ];
meta = {
description = "An API for running processes safely and securely";
+2 -2
pkgs/development/python-modules/xlib/default.nix
···
, python
, mock
, nose
-
, utillinux
+
, util-linux
}:
buildPythonPackage rec {
···
${python.interpreter} runtests.py
'';
-
checkInputs = [ mock nose utillinux /* mcookie */ xorg.xauth xorg.xorgserver /* xvfb */ ];
+
checkInputs = [ mock nose util-linux /* mcookie */ xorg.xauth xorg.xorgserver /* xvfb */ ];
nativeBuildInputs = [ setuptools_scm ];
buildInputs = [ xorg.libX11 ];
propagatedBuildInputs = [ six ];
+2 -2
pkgs/development/r-modules/generic-builder.nix
···
-
{ stdenv, R, libcxx, xvfb_run, utillinux, Cocoa, Foundation, gettext, gfortran }:
+
{ stdenv, R, libcxx, xvfb_run, util-linux, Cocoa, Foundation, gettext, gfortran }:
{ name, buildInputs ? [], requireX ? false, ... } @ attrs:
stdenv.mkDerivation ({
buildInputs = buildInputs ++ [R gettext] ++
-
stdenv.lib.optionals requireX [utillinux xvfb_run] ++
+
stdenv.lib.optionals requireX [util-linux xvfb_run] ++
stdenv.lib.optionals stdenv.isDarwin [Cocoa Foundation gfortran];
NIX_CFLAGS_COMPILE =
+3 -3
pkgs/development/ruby-modules/gem-config/default.nix
···
{ lib, fetchurl, writeScript, ruby, kerberos, libxml2, libxslt, python, stdenv, which
, libiconv, postgresql, v8, clang, sqlite, zlib, imagemagick
-
, pkgconfig , ncurses, xapian, gpgme, utillinux, tzdata, icu, libffi
+
, pkgconfig , ncurses, xapian, gpgme, util-linux, tzdata, icu, libffi
, cmake, libssh2, openssl, libmysqlclient, darwin, git, perl, pcre, gecode_3, curl
, msgpack, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem
, cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx
···
gio2 = attrs: {
nativeBuildInputs = [ pkgconfig ];
-
buildInputs = [ gtk2 pcre gobject-introspection ] ++ lib.optionals stdenv.isLinux [ utillinux libselinux libsepol ];
+
buildInputs = [ gtk2 pcre gobject-introspection ] ++ lib.optionals stdenv.isLinux [ util-linux libselinux libsepol ];
};
gitlab-markup = attrs: { meta.priority = 1; };
···
nativeBuildInputs = [
binutils pkgconfig
] ++ lib.optionals stdenv.isLinux [
-
utillinux libselinux libsepol
+
util-linux libselinux libsepol
];
propagatedBuildInputs = [
atk
+2 -2
pkgs/development/tools/buildah/wrapper.nix
···
, 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
}:
···
conmon
slirp4netns
fuse-overlayfs
-
utillinux
+
util-linux
iptables
] ++ extraPackages);
+2 -2
pkgs/development/tools/git-quick-stats/default.nix
···
, git
, gnugrep
, ncurses
-
, utillinux
+
, util-linux
}:
stdenv.mkDerivation rec {
···
git
gnugrep
ncurses
-
utillinux
+
util-linux
];
in
''
+2 -2
pkgs/development/tools/halfempty/default.nix
···
-
{ lib, stdenv, fetchFromGitHub, pkgconfig, glib, utillinux, scowl }:
+
{ lib, stdenv, fetchFromGitHub, pkgconfig, glib, util-linux, scowl }:
stdenv.mkDerivation rec {
pname = "halfempty";
···
sha256 = "0838pw0ccjvlxmjygzrnppz1fx1a10vjzdgjbxgb4wgpqjr8v6vc";
};
-
nativeBuildInputs = [ pkgconfig utillinux ];
+
nativeBuildInputs = [ pkgconfig util-linux ];
buildInputs = [ glib ];
enableParallelBuilding = true;
+2 -2
pkgs/development/tools/misc/creduce/default.nix
···
, flex
, zlib
, perlPackages
-
, utillinux
+
, util-linux
}:
stdenv.mkDerivation rec {
···
# so let's make sure it knows where to find it:
postPatch = stdenv.lib.optionalString stdenv.isLinux ''
substituteInPlace creduce/creduce_utils.pm --replace \
-
lscpu ${utillinux}/bin/lscpu
+
lscpu ${util-linux}/bin/lscpu
'';
+2 -2
pkgs/development/tools/misc/usb-modeswitch/default.nix
···
{ stdenv, lib, fetchurl, pkgconfig, makeWrapper
-
, libusb1, tcl, utillinux, coreutils, bash }:
+
, libusb1, tcl, util-linux, coreutils, bash }:
stdenv.mkDerivation rec {
pname = "usb-modeswitch";
···
postFixup = ''
wrapProgram $out/bin/usb_modeswitch_dispatcher \
-
--set PATH ${lib.makeBinPath [ utillinux coreutils bash ]}
+
--set PATH ${lib.makeBinPath [ util-linux coreutils bash ]}
'';
buildInputs = [ libusb1 tcl ];
+2 -2
pkgs/development/tools/misc/yodl/default.nix
···
-
{ stdenv, fetchFromGitLab, perl, icmake, utillinux }:
+
{ stdenv, fetchFromGitLab, perl, icmake, util-linux }:
stdenv.mkDerivation rec {
pname = "yodl";
···
patchShebangs scripts/
substituteInPlace INSTALL.im --replace /usr $out
substituteInPlace macros/rawmacros/startdoc.pl --replace /usr/bin/perl ${perl}/bin/perl
-
substituteInPlace scripts/yodl2whatever.in --replace getopt ${utillinux}/bin/getopt
+
substituteInPlace scripts/yodl2whatever.in --replace getopt ${util-linux}/bin/getopt
'';
# Set TERM because icmbuild calls tput.
+1 -1
pkgs/development/web/newman/node-composition.nix
···
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;
};
+4 -4
pkgs/development/web/newman/node-env.nix
···
# 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;
···
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;
···
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;
···
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 <<EOF
+2 -2
pkgs/development/web/nodejs/nodejs.nix
···
-
{ stdenv, fetchurl, openssl, python, zlib, libuv, utillinux, http-parser
+
{ stdenv, fetchurl, openssl, python, zlib, libuv, util-linux, http-parser
, pkgconfig, which
# Updater dependencies
, writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts, nix, runtimeShell
···
buildInputs = optionals stdenv.isDarwin [ CoreServices ApplicationServices ]
++ [ zlib libuv openssl http-parser icu ];
-
nativeBuildInputs = [ which utillinux pkgconfig python ]
+
nativeBuildInputs = [ which util-linux pkgconfig python ]
++ optionals stdenv.isDarwin [ xcbuild ];
configureFlags = let
+1 -1
pkgs/development/web/remarkjs/nodepkgs.nix
···
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;
};
+2 -2
pkgs/games/unnethack/default.nix
···
-
{ stdenv, fetchFromGitHub, fetchpatch, utillinux, ncurses, flex, bison }:
+
{ stdenv, fetchFromGitHub, fetchpatch, util-linux, ncurses, flex, bison }:
stdenv.mkDerivation rec {
pname = "unnethack";
···
buildInputs = [ ncurses ];
-
nativeBuildInputs = [ utillinux flex bison ];
+
nativeBuildInputs = [ util-linux flex bison ];
configureFlags = [ "--enable-curses-graphics"
"--disable-tty-graphics"
+1 -1
pkgs/misc/base16-builder/node-packages.nix
···
inherit (pkgs) fetchurl fetchgit;
});
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;
};
+2 -2
pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix
···
-
{ stdenv, fetchurl, pkgsi686Linux, dpkg, makeWrapper, coreutils, gnused, gawk, file, cups, utillinux, xxd, runtimeShell
+
{ stdenv, fetchurl, pkgsi686Linux, dpkg, makeWrapper, coreutils, gnused, gawk, file, cups, util-linux, xxd, runtimeShell
, ghostscript, a2ps }:
# Why:
···
patchelf --set-interpreter ${pkgsi686Linux.stdenv.cc.libc.out}/lib/ld-linux.so.2 $out/usr/bin/brprintconf_mfcj6510dw
#stripping the hardcoded path.
-
${utillinux}/bin/hexdump -ve '1/1 "%.2X"' $out/usr/bin/brprintconf_mfcj6510dw | \
+
${util-linux}/bin/hexdump -ve '1/1 "%.2X"' $out/usr/bin/brprintconf_mfcj6510dw | \
sed 's.2F6F70742F62726F746865722F5072696E746572732F25732F696E662F6272257366756E63.62726d66636a36353130647766756e63000000000000000000000000000000000000000000.' | \
sed 's.2F6F70742F62726F746865722F5072696E746572732F25732F696E662F627225737263.62726D66636A3635313064777263000000000000000000000000000000000000000000.' | \
${xxd}/bin/xxd -r -p > $out/usr/bin/brprintconf_mfcj6510dw_patched
+2 -2
pkgs/misc/drivers/hplip/3.16.11.nix
···
, pkgconfig
, cups, libjpeg, libusb1, python2Packages, sane-backends, dbus, usbutils
, net-snmp, openssl, nettools
-
, bash, coreutils, utillinux
+
, bash, coreutils, util-linux
, qtSupport ? true
, withPlugin ? false
}:
···
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
'';
+2 -2
pkgs/misc/drivers/hplip/3.18.5.nix
···
, 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
···
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
'';
+2 -2
pkgs/misc/drivers/hplip/default.nix
···
, 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
···
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 ''
+2 -2
pkgs/misc/emulators/cdemu/libmirage.nix
···
{ 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";
···
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 ];
};
}
+2 -2
pkgs/misc/emulators/qmc2/default.nix
···
, minizip, zlib
, qtbase, qtsvg, qtmultimedia, qtwebkit, qttranslations, qtxmlpatterns
, rsync, SDL2, xwininfo
-
, utillinux
+
, util-linux
, xorg
}:
···
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=/"
+1 -1
pkgs/misc/emulators/wine/staging.nix
···
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";
+2 -2
pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix
···
# - <https://github.com/msteen/nixos-vsliveshare/blob/master/pkgs/vsliveshare/default.nix>
# - <https://github.com/NixOS/nixpkgs/issues/41189>
{ 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
}:
···
# General
gcc.cc.lib
-
utillinux # libuuid
+
util-linux # libuuid
];
in ((vscode-utils.override { stdenv = gccStdenv; }).buildVscodeMarketplaceExtension {
+2 -2
pkgs/os-specific/linux/displaylink/default.nix
···
-
{ stdenv, lib, unzip, utillinux,
+
{ stdenv, lib, unzip, util-linux,
libusb1, evdi, systemd, makeWrapper, requireFile, substituteAll }:
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";
+2 -2
pkgs/os-specific/linux/eudev/default.nix
···
-
{stdenv, fetchurl, pkgconfig, glib, gperf, utillinux, kmod}:
+
{stdenv, fetchurl, pkgconfig, glib, gperf, util-linux, kmod}:
let
s = # Generated upstream information
rec {
···
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
-
glib gperf utillinux kmod
+
glib gperf util-linux kmod
];
in
stdenv.mkDerivation {
+2 -2
pkgs/os-specific/linux/fuse/common.nix
···
{ version, sha256Hash }:
{ stdenv, fetchFromGitHub, fetchpatch
-
, fusePackages, utillinux, gettext
+
, fusePackages, util-linux, gettext
, meson, ninja, pkg-config
, autoreconfHook
, python3Packages, which
···
# $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)
+2 -2
pkgs/os-specific/linux/fuse/default.nix
···
-
{ callPackage, utillinux }:
+
{ callPackage, util-linux }:
let
mkFuse = args: callPackage (import ./common.nix args) {
-
inherit utillinux;
+
inherit util-linux;
};
in {
fuse_2 = mkFuse {
+1 -1
pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix
···
-
{ 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";
+1 -1
pkgs/os-specific/linux/kernel/manual-config.nix
···
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
+2 -2
pkgs/os-specific/linux/ldm/default.nix
···
-
{ stdenv, fetchgit, udev, utillinux, mountPath ? "/media/" }:
+
{ stdenv, fetchgit, udev, util-linux, mountPath ? "/media/" }:
assert mountPath != "";
···
sha256 = "0lxfypnbamfx6p9ar5k9wra20gvwn665l4pp2j4vsx4yi5q7rw2n";
};
-
buildInputs = [ udev utillinux ];
+
buildInputs = [ udev util-linux ];
postPatch = ''
substituteInPlace ldm.c \
+1 -1
pkgs/os-specific/linux/lvm2/default.nix
···
, fetchpatch
, fetchurl
, pkgconfig
-
, utillinux
+
, util-linux
, libuuid
, thin-provisioning-tools, libaio
, enableCmdlib ? false
+3 -3
pkgs/os-specific/linux/lxcfs/default.nix
···
{ config, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, fuse
-
, utillinux, makeWrapper
+
, util-linux, makeWrapper
, enableDebugBuild ? config.lxcfs.enableDebugBuild or false }:
with stdenv.lib;
···
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 = ''
+2 -2
pkgs/os-specific/linux/mcelog/default.nix
···
-
{ stdenv, fetchFromGitHub, utillinux }:
+
{ stdenv, fetchFromGitHub, util-linux }:
stdenv.mkDerivation rec {
pname = "mcelog";
···
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
'';
+2 -2
pkgs/os-specific/linux/mdadm/default.nix
···
-
{ stdenv, utillinux, coreutils, fetchurl, groff, system-sendmail }:
+
{ stdenv, util-linux, coreutils, fetchurl, groff, system-sendmail }:
stdenv.mkDerivation rec {
name = "mdadm-4.1";
···
-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
'';
+2 -2
pkgs/os-specific/linux/nfs-utils/default.nix
···
-
{ 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 {
+2 -2
pkgs/os-specific/linux/open-iscsi/default.nix
···
{ stdenv, fetchFromGitHub, automake, autoconf, libtool, gettext
-
, utillinux, openisns, openssl, kmod, perl, systemd, pkgconf
+
, util-linux, openisns, openssl, kmod, perl, systemd, pkgconf
}:
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";
+2 -2
pkgs/os-specific/linux/openrazer/driver.nix
···
, fetchFromGitHub
, kernel
, stdenv
-
, utillinux
+
, util-linux
}:
let
···
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'" ""
'';
+2 -2
pkgs/os-specific/linux/openvswitch/default.nix
···
-
{ stdenv, fetchurl, makeWrapper, pkgconfig, utillinux, which
+
{ stdenv, fetchurl, makeWrapper, pkgconfig, util-linux, which
, procps, libcap_ng, openssl, python3 , perl
, kernel ? null }:
···
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 = [
+2 -2
pkgs/os-specific/linux/openvswitch/lts.nix
···
-
{ 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 }:
···
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";
+3 -3
pkgs/os-specific/linux/pam_mount/default.nix
···
-
{ 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";
···
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;
+2 -2
pkgs/os-specific/linux/pktgen/default.nix
···
{ 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
}:
···
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 = ''
+2 -2
pkgs/os-specific/linux/pm-utils/default.nix
···
-
{ 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 ];
+4 -4
pkgs/os-specific/linux/pmount/default.nix
···
-
{ stdenv, fetchurl, intltool, ntfs3g, utillinux
+
{ stdenv, fetchurl, intltool, ntfs3g, util-linux
, mediaDir ? "/media/"
, lockDir ? "/var/lock/pmount"
, whiteList ? "/etc/pmount.allow"
···
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"
];
+2 -2
pkgs/os-specific/linux/prl-tools/default.nix
···
{ 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
}:
···
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
+8 -8
pkgs/os-specific/linux/systemd/default.nix
···
# Mandatory dependencies
, libcap
-
, utillinux
+
, util-linux
, kbd
, kmod
···
"-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.
···
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
+2 -2
pkgs/os-specific/linux/tomb/default.nix
···
{ stdenv, lib, fetchFromGitHub, makeWrapper
-
, gettext, zsh, pinentry, cryptsetup, gnupg, utillinux, e2fsprogs, sudo
+
, gettext, zsh, pinentry, cryptsetup, gnupg, util-linux, e2fsprogs, sudo
}:
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; {
+2 -2
pkgs/os-specific/linux/udisks/1-default.nix
···
{ 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";
···
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 =
+3 -3
pkgs/os-specific/linux/udisks/2-default.nix
···
{ 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
}:
···
(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";
···
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
];
})
+7 -7
pkgs/os-specific/linux/zfs/default.nix
···
{ stdenv, fetchFromGitHub, fetchpatch
-
, autoreconfHook, utillinux, nukeReferences, coreutils
+
, autoreconfHook, util-linux, nukeReferences, coreutils
, perl, buildPackages
, configFile ? "all"
···
# 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
···
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
···
'';
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
+2 -2
pkgs/servers/apcupsd/default.nix
···
-
{ stdenv, fetchurl, pkgconfig, systemd, utillinux, coreutils, wall, hostname, man
+
{ stdenv, fetchurl, pkgconfig, systemd, util-linux, coreutils, wall, hostname, man
, enableCgiScripts ? true, gd
}:
···
};
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)," \
+2 -2
pkgs/servers/asterisk/default.nix
···
{ 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
}:
···
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
+2 -2
pkgs/servers/computing/torque/default.nix
···
-
{ 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
}:
···
strictDeps = true;
nativeBuildInputs = [ autoreconfHook pkgconfig flex bison libxml2 ];
buildInputs = [
-
openssl groff libxml2 utillinux libtool
+
openssl groff libxml2 util-linux libtool
which boost
];
+2 -2
pkgs/servers/hylafaxplus/default.nix
···
, libtiff
, psmisc
, sharutils
-
, utillinux
+
, util-linux
, zlib
## optional packages (using `null` disables some functionality)
, jbigkit ? null
···
libtiff
psmisc # for `fuser` command
sharutils # for `uuencode` command
-
utillinux # for `agetty` command
+
util-linux # for `agetty` command
zlib
jbigkit # optional
lcms2 # optional
+1 -1
pkgs/servers/matrix-appservice-discord/node-composition.nix
···
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;
};
+1 -1
pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix
···
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;
};
+3 -3
pkgs/servers/search/elasticsearch/6.x.nix
···
, fetchurl
, makeWrapper
, jre_headless
-
, utillinux, gnugrep, coreutils
+
, util-linux, gnugrep, coreutils
, autoPatchelfHook
, zlib
}:
···
"ES_CLASSPATH=\"\$ES_CLASSPATH:$out/\$additional_classpath_directory/*\""
'';
-
buildInputs = [ makeWrapper jre_headless utillinux ]
+
buildInputs = [ makeWrapper jre_headless util-linux ]
++ optional enableUnfree zlib;
installPhase = ''
···
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}"
+3 -3
pkgs/servers/search/elasticsearch/7.x.nix
···
, fetchurl
, makeWrapper
, jre_headless
-
, utillinux, gnugrep, coreutils
+
, util-linux, gnugrep, coreutils
, autoPatchelfHook
, zlib
}:
···
"ES_CLASSPATH=\"\$ES_CLASSPATH:$out/\$additional_classpath_directory/*\""
'';
-
buildInputs = [ makeWrapper jre_headless utillinux ]
+
buildInputs = [ makeWrapper jre_headless util-linux ]
++ optional enableUnfree zlib;
installPhase = ''
···
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}"
+1 -1
pkgs/servers/web-apps/cryptpad/node-packages.nix
···
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;
};
+2 -2
pkgs/servers/xmpp/ejabberd/default.nix
···
{ 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
···
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";
+1 -1
pkgs/servers/zigbee2mqtt/node.nix
···
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;
};
+2 -2
pkgs/servers/zoneminder/default.nix
···
{ 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:
···
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
+2 -2
pkgs/shells/bash/4.4.nix
···
{ 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
···
"SHOBJ_LIBS=-lbash"
];
-
checkInputs = [ utillinux ];
+
checkInputs = [ util-linux ];
doCheck = false; # dependency cycle, needs to be interactive
postInstall = ''
+2 -2
pkgs/shells/bash/5.0.nix
···
{ stdenv, buildPackages
-
, fetchurl, binutils ? null, bison, utillinux
+
, fetchurl, binutils ? null, bison, util-linux
# patch for cygwin requires readline support
, interactive ? stdenv.isCygwin, readline80 ? null
···
"SHOBJ_LIBS=-lbash"
];
-
checkInputs = [ utillinux ];
+
checkInputs = [ util-linux ];
doCheck = false; # dependency cycle, needs to be interactive
postInstall = ''
+2 -2
pkgs/shells/fish/default.nix
···
, lib
, fetchurl
, coreutils
-
, utillinux
+
, util-linux
, which
, gnused
, gnugrep
···
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|" \
+2 -2
pkgs/tools/X11/xpra/default.nix
···
{ 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
···
--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 ]}
)
'';
+2 -2
pkgs/tools/archivers/fsarchiver/default.nix
···
{ 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";
···
buildInputs = [
zlib bzip2 lzma lzo lz4 zstd xz
-
libgcrypt e2fsprogs utillinux libgpgerror
+
libgcrypt e2fsprogs util-linux libgpgerror
];
meta = with stdenv.lib; {
+2 -2
pkgs/tools/backup/btrbk/default.nix
···
{ 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";
···
# 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 = ''
+2 -2
pkgs/tools/backup/duplicity/default.nix
···
, gnupg
, gnutar
, par2cmdline
-
, utillinux
+
, util-linux
, rsync
, backblaze-b2
, makeWrapper
···
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
+2 -2
pkgs/tools/backup/ori/default.nix
···
-
{ 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";
···
};
buildInputs = [
-
boost pkgconfig scons utillinux fuse libevent openssl zlib
+
boost pkgconfig scons util-linux fuse libevent openssl zlib
];
buildPhase = ''
+4 -4
pkgs/tools/bluetooth/blueberry/default.nix
···
, intltool
, pavucontrol
, python3Packages
-
, utillinux
+
, util-linux
, wrapGAppsHook
}:
···
cinnamon.xapps
gnome3.gnome-bluetooth
python3Packages.python
-
utillinux
+
util-linux
];
pythonPath = with python3Packages; [
···
--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
+3 -3
pkgs/tools/cd-dvd/bashburn/default.nix
···
-
{ stdenv, fetchurl, utillinux
+
{ stdenv, fetchurl, util-linux
, cdparanoia, cdrdao, dvdplusrwtools, flac, lame, mpg123, normalize
, vorbis-tools, xorriso }:
···
name = "${pname}-${version}.tar.gz";
};
-
nativeBuildInputs = [ utillinux ];
+
nativeBuildInputs = [ util-linux ];
postPatch = ''
for path in \
···
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
+4 -4
pkgs/tools/cd-dvd/unetbootin/default.nix
···
-
{ stdenv, fetchFromGitHub, makeWrapper, qt4, utillinux, coreutils, which, qmake4Hook
+
{ stdenv, fetchFromGitHub, makeWrapper, qt4, util-linux, coreutils, which, qmake4Hook
, p7zip, mtools, syslinux }:
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
+2 -2
pkgs/tools/compression/pigz/default.nix
···
-
{ stdenv, fetchurl, zlib, utillinux }:
+
{ stdenv, fetchurl, zlib, util-linux }:
let name = "pigz";
version = "2.4";
···
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" ];
+2 -2
pkgs/tools/filesystems/bcache-tools/default.nix
···
-
{ stdenv, fetchurl, pkgconfig, utillinux, bash }:
+
{ stdenv, fetchurl, pkgconfig, util-linux, bash }:
stdenv.mkDerivation rec {
pname = "bcache-tools";
···
};
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).
+4 -3
pkgs/tools/filesystems/bees/default.nix
···
-
{ stdenv, runCommand, fetchFromGitHub, bash, btrfs-progs, coreutils, python3Packages, utillinux }:
+
{ stdenv, runCommand, fetchFromGitHub, bash, btrfs-progs, coreutils, python3Packages, util-linux }:
let
···
buildInputs = [
btrfs-progs # for btrfs/ioctl.h
-
utillinux # for uuid.h
+
util-linux # for uuid.h
];
nativeBuildInputs = [
···
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"
+2 -2
pkgs/tools/filesystems/ceph/default.nix
···
, 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
, ...
}:
···
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 [
+3 -3
pkgs/tools/filesystems/fatresize/default.nix
···
-
{ stdenv, fetchFromGitHub, parted, utillinux, pkg-config }:
+
{ stdenv, fetchFromGitHub, parted, util-linux, pkg-config }:
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";
+5 -5
pkgs/tools/filesystems/glusterfs/default.nix
···
{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
···
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
···
openssh # ssh
rsync # rsync, e.g. for geo-replication
systemd # systemctl
-
utillinux # mount umount
+
util-linux # mount umount
which # which
xfsprogs # xfs_info
];
···
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
+3 -3
pkgs/tools/filesystems/nixpart/0.4/blivet.nix
···
# 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
}:
···
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
+3 -3
pkgs/tools/filesystems/nixpart/0.4/default.nix
···
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 {
···
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 {
···
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 {
+2 -2
pkgs/tools/filesystems/nixpart/0.4/lvm2.nix
···
-
{ stdenv, fetchurl, fetchpatch, pkgconfig, systemd, utillinux, coreutils }:
+
{ stdenv, fetchurl, fetchpatch, pkgconfig, systemd, util-linux, coreutils }:
let
v = "2.02.106";
···
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
+2 -2
pkgs/tools/filesystems/nixpart/0.4/parted.nix
···
{ stdenv, fetchurl, fetchpatch, lvm2, libuuid, gettext, readline
-
, utillinux, check, enableStatic ? false }:
+
, util-linux, check, enableStatic ? false }:
stdenv.mkDerivation rec {
name = "parted-3.1";
···
++ stdenv.lib.optional enableStatic "--enable-static";
doCheck = true;
-
checkInputs = [ check utillinux ];
+
checkInputs = [ check util-linux ];
meta = {
description = "Create, destroy, resize, check, and copy partitions";
+3 -3
pkgs/tools/filesystems/ntfs-3g/default.nix
···
-
{stdenv, fetchurl, utillinux, libuuid
+
{stdenv, fetchurl, util-linux, libuuid
, crypto ? false, libgcrypt, gnutls, pkgconfig}:
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 = [
+2 -2
pkgs/tools/misc/calamares/default.nix
···
{ 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
}:
···
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;
+2 -2
pkgs/tools/misc/cloud-utils/default.nix
···
{ stdenv, fetchurl, makeWrapper
-
, gawk, gnused, utillinux, file
+
, gawk, gnused, util-linux, file
, wget, python3, qemu-utils, euca2ools
, e2fsprogs, cdrkit
, gptfdisk }:
···
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
+2 -2
pkgs/tools/misc/debootstrap/default.nix
···
-
{ 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?
···
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}
+2 -2
pkgs/tools/misc/etcher/default.nix
···
, gcc-unwrapped
, dpkg
, polkit
-
, utillinux
+
, util-linux
, bash
, nodePackages
, makeWrapper
···
# 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
+2 -2
pkgs/tools/misc/gparted/default.nix
···
{ 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 {
···
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 ]}"
)
'';
+2 -2
pkgs/tools/misc/memtest86-efi/default.nix
···
{ stdenv
, lib
, fetchzip
-
, utillinux
+
, util-linux
, jq
, mtools
}:
···
};
nativeBuildInputs = [
-
utillinux
+
util-linux
jq
mtools
];
+2 -2
pkgs/tools/misc/ostree/default.nix
···
, automake
, libtool
, fuse
-
, utillinuxMinimal
+
, util-linuxMinimal
, libselinux
, libsodium
, libarchive
···
libarchive
bzip2
xz
-
utillinuxMinimal # for libmount
+
util-linuxMinimal # for libmount
# for installed tests
testPython
+2 -2
pkgs/tools/misc/parted/default.nix
···
, e2fsprogs
, perl
, python2
-
, utillinux
+
, util-linux
, check
, enableStatic ? false
}:
···
# 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";
+2 -2
pkgs/tools/misc/partition-manager/default.nix
···
{ mkDerivation, fetchurl, lib
, extra-cmake-modules, kdoctools, wrapGAppsHook, wrapQtAppsHook
, kconfig, kcrash, kinit, kpmcore
-
, eject, libatasmart , utillinux, qtbase
+
, eject, libatasmart , util-linux, qtbase
}:
let
···
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; {
+2 -2
pkgs/tools/misc/profile-sync-daemon/default.nix
···
-
{ stdenv, fetchurl, utillinux, coreutils}:
+
{ stdenv, fetchurl, util-linux, coreutils}:
stdenv.mkDerivation rec {
version = "6.42";
···
# $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 "
'';
+3 -3
pkgs/tools/misc/rmlint/default.nix
···
, python3
, scons
, sphinx
-
, utillinux
+
, util-linux
, wrapGAppsHook
, withGui ? false }:
···
sha256 = "15xfkcw1bkfyf3z8kl23k3rlv702m0h7ghqxvhniynvlwbgh6j2x";
};
-
CFLAGS="-I${stdenv.lib.getDev utillinux}/include";
+
CFLAGS="-I${stdenv.lib.getDev util-linux}/include";
nativeBuildInputs = [
pkgconfig
···
glib
json-glib
libelf
-
utillinux
+
util-linux
] ++ stdenv.lib.optionals withGui [
cairo
gobject-introspection
+2 -2
pkgs/tools/misc/rpm-ostree/default.nix
···
, json_c
, zchunk
, libmodulemd
-
, utillinux
+
, util-linux
, sqlite
, cppunit
}:
···
json_c
zchunk
libmodulemd
-
utillinux # for smartcols.pc
+
util-linux # for smartcols.pc
sqlite
cppunit
];
+2 -2
pkgs/tools/misc/snapper/default.nix
···
{ 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";
···
];
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;
+2 -2
pkgs/tools/misc/tlp/default.nix
···
, shellcheck
, smartmontools
, systemd
-
, utillinux
+
, util-linux
, x86_energy_perf_policy
# RDW only works with NetworkManager, and thus is optional with default off
, enableRDW ? false
···
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
);
+2 -2
pkgs/tools/misc/woeusb/default.nix
···
{ 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 {
···
# 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;
+2 -2
pkgs/tools/misc/xfstests/default.nix
···
{ 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";
···
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 "$@"
'';
+2 -2
pkgs/tools/misc/xvfb-run/default.nix
···
{ 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";
···
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; {
+1 -1
pkgs/tools/networking/airfield/node.nix
···
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;
};
+2 -2
pkgs/tools/networking/bud/default.nix
···
-
{ stdenv, lib, fetchgit, python, gyp, utillinux }:
+
{ stdenv, lib, fetchgit, python, gyp, util-linux }:
stdenv.mkDerivation {
pname = "bud";
···
buildInputs = [
python gyp
-
] ++ lib.optional stdenv.isLinux utillinux;
+
] ++ lib.optional stdenv.isLinux util-linux;
buildPhase = ''
python ./gyp_bud -f make
+2 -2
pkgs/tools/networking/cjdns/default.nix
···
-
{ stdenv, fetchFromGitHub, nodejs, which, python27, utillinux, nixosTests }:
+
{ stdenv, fetchFromGitHub, nodejs, which, python27, util-linux, nixosTests }:
stdenv.mkDerivation rec {
pname = "cjdns";
···
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 =
+2 -2
pkgs/tools/networking/openvpn/default.nix
···
, pam
, useSystemd ? stdenv.isLinux
, systemd ? null
-
, utillinux ? null
+
, util-linux ? null
, pkcs11Support ? false
, pkcs11helper ? null
}:
···
'' + 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;
+3 -3
pkgs/tools/networking/openvpn/openvpn_learnaddress.nix
···
-
{ stdenv, fetchgit, makeWrapper, coreutils, gawk, utillinux }:
+
{ stdenv, fetchgit, makeWrapper, coreutils, gawk, util-linux }:
stdenv.mkDerivation {
name = "openvpn-learnaddress-19b03c3";
···
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 = {
+2 -2
pkgs/tools/networking/openvpn/update-systemd-resolved.nix
···
{ lib, stdenv, fetchFromGitHub
, makeWrapper
-
, iproute, systemd, coreutils, utillinux }:
+
, iproute, systemd, coreutils, util-linux }:
stdenv.mkDerivation rec {
pname = "update-systemd-resolved";
···
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; {
+3 -3
pkgs/tools/networking/shorewall/default.nix
···
, perlPackages
, stdenv
, tree
-
, utillinux
+
, util-linux
}:
let
PATH = stdenv.lib.concatStringsSep ":"
···
"${iptables}/bin"
"${ipset}/bin"
"${ebtables}/bin"
-
"${utillinux}/bin"
+
"${util-linux}/bin"
"${gnugrep}/bin"
"${gnused}/bin"
];
···
ipset
iptables
ebtables
-
utillinux
+
util-linux
gnugrep
gnused
perl
+1 -1
pkgs/tools/networking/tgt/default.nix
···
{ 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 {
+1 -1
pkgs/tools/package-management/nixui/nixui.nix
···
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;
};
+3 -3
pkgs/tools/security/ecryptfs/default.nix
···
-
{ 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 {
···
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 \
+2 -2
pkgs/tools/security/pass/rofi-pass.nix
···
-
{ stdenv, fetchFromGitHub, pass, rofi, coreutils, utillinux, xdotool, gnugrep
+
{ stdenv, fetchFromGitHub, pass, rofi, coreutils, util-linux, xdotool, gnugrep
, libnotify, pwgen, findutils, gawk, gnused, xclip, makeWrapper
}:
···
(pass.withExtensions (ext: [ ext.pass-otp ]))
pwgen
rofi
-
utillinux
+
util-linux
xclip
xdotool
];
+2 -2
pkgs/tools/security/scrypt/default.nix
···
-
{ stdenv, fetchurl, openssl, utillinux, getconf }:
+
{ stdenv, fetchurl, openssl, util-linux, getconf }:
stdenv.mkDerivation rec {
pname = "scrypt";
···
doCheck = true;
checkTarget = "test";
-
checkInputs = [ utillinux ];
+
checkInputs = [ util-linux ];
meta = with stdenv.lib; {
description = "Encryption utility";
+2 -2
pkgs/tools/system/facter/default.nix
···
-
{ 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";
···
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;
+2 -2
pkgs/tools/system/inxi/default.nix
···
{ 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
···
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
+2 -2
pkgs/tools/system/rofi-systemd/default.nix
···
-
{ stdenv, fetchFromGitHub, rofi, systemd, coreutils, utillinux, gawk, makeWrapper
+
{ stdenv, fetchFromGitHub, rofi, systemd, coreutils, util-linux, gawk, makeWrapper
}:
stdenv.mkDerivation rec {
···
wrapperPath = with stdenv.lib; makeBinPath [
rofi
coreutils
-
utillinux
+
util-linux
gawk
systemd
];
+2 -2
pkgs/tools/virtualization/alpine-make-vm-image/default.nix
···
{ stdenv, lib, fetchFromGitHub, makeWrapper
, apk-tools, coreutils, e2fsprogs, findutils, gnugrep, gnused, kmod, qemu-utils
-
, utillinux
+
, util-linux
}:
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
]}
'';
+4 -4
pkgs/tools/virtualization/google-compute-engine/default.nix
···
, bash
, bashInteractive
, systemd
-
, utillinux
+
, util-linux
, boto
, setuptools
, distro
···
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 = ''
+2 -2
pkgs/tools/virtualization/nixos-container/default.nix
···
-
{ substituteAll, perlPackages, shadow, utillinux }:
+
{ substituteAll, perlPackages, shadow, util-linux }:
substituteAll {
name = "nixos-container";
···
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
+2 -1
pkgs/top-level/aliases.nix
···
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";
···
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";
+15 -15
pkgs/top-level/all-packages.nix
···
mstflint = callPackage ../tools/misc/mstflint { };
mcelog = callPackage ../os-specific/linux/mcelog {
-
utillinux = utillinuxMinimal;
+
util-linux = util-linuxMinimal;
};
sqlint = callPackage ../development/tools/sqlint { };
···
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;
···
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 {
···
libossp_uuid = callPackage ../development/libraries/libossp-uuid { };
libuuid = if stdenv.isLinux
-
then utillinuxMinimal
+
then util-linuxMinimal
else null;
light = callPackage ../os-specific/linux/light { };
···
fusePackages = dontRecurseIntoAttrs (callPackage ../os-specific/linux/fuse {
-
utillinux = utillinuxMinimal;
+
util-linux = util-linuxMinimal;
});
fuse = lowPrio fusePackages.fuse_2;
fuse3 = fusePackages.fuse_3;
···
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;
···
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 { };
···
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 { };
+2 -2
pkgs/top-level/release-small.nix
···
udev = linux;
unzip = all;
usbutils = linux;
-
utillinux = linux;
-
utillinuxMinimal = linux;
+
util-linux = linux;
+
util-linuxMinimal = linux;
w3m = all;
webkitgtk = linux;
wget = all;
+16 -16
pkgs/top-level/unix-tools.nix
···
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
···
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 = {
···
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 = {
···
darwin = pkgs.darwin.network_cmds;
};
script = {
-
linux = pkgs.utillinux;
+
linux = pkgs.util-linux;
darwin = pkgs.darwin.shell_cmds;
};
sysctl = {
···
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;
···
darwin = pkgs.callPackage ../os-specific/linux/procps-ng {};
};
write = {
-
linux = pkgs.utillinux;
+
linux = pkgs.util-linux;
darwin = pkgs.darwin.basic_cmds;
};
xxd = {
···
# 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 ];
};