From bc49a0815ae860010b4d593b02f00ab6f07d50ea Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Tue, 24 Nov 2020 10:29:28 -0500 Subject: utillinux: rename to util-linux --- pkgs/applications/audio/clerk/default.nix | 4 +-- pkgs/applications/audio/strawberry/default.nix | 4 +-- pkgs/applications/audio/whipper/default.nix | 4 +-- pkgs/applications/blockchains/bitcoin-abc.nix | 4 +-- pkgs/applications/blockchains/bitcoin-classic.nix | 4 +-- pkgs/applications/blockchains/bitcoin-knots.nix | 4 +-- .../applications/blockchains/bitcoin-unlimited.nix | 4 +-- pkgs/applications/blockchains/bitcoin.nix | 4 +-- pkgs/applications/blockchains/dashpay.nix | 4 +-- pkgs/applications/blockchains/dogecoin.nix | 4 +-- pkgs/applications/blockchains/exodus/default.nix | 4 +-- pkgs/applications/blockchains/litecoin.nix | 4 +-- pkgs/applications/blockchains/pivx.nix | 4 +-- pkgs/applications/blockchains/zcash/default.nix | 4 +-- pkgs/applications/graphics/comical/default.nix | 4 +-- pkgs/applications/misc/clight/clightd.nix | 4 +-- pkgs/applications/misc/clipmenu/default.nix | 4 +-- pkgs/applications/misc/corectrl/default.nix | 4 +-- pkgs/applications/misc/imag/default.nix | 4 +-- pkgs/applications/misc/lutris/fhsenv.nix | 2 +- pkgs/applications/misc/multibootusb/default.nix | 4 +-- .../applications/misc/todoist-electron/default.nix | 4 +-- pkgs/applications/misc/udevil/default.nix | 8 +++--- pkgs/applications/misc/vifm/default.nix | 4 +-- .../networking/browsers/chromium/common.nix | 4 +-- .../networking/browsers/google-chrome/default.nix | 4 +-- .../browsers/ungoogled-chromium/common.nix | 4 +-- .../networking/cluster/k3s/default.nix | 4 +-- .../networking/cluster/openshift/default.nix | 2 +- .../cluster/spacegun/node-composition.nix | 2 +- pkgs/applications/networking/firehol/default.nix | 4 +-- .../matrix-recorder/composition.nix | 2 +- .../matrix-recorder/node-env.nix | 8 +++--- .../telegram/tdesktop/default.nix | 4 +-- .../instant-messengers/zoom-us/default.nix | 4 +-- .../networking/remote/x2goserver/default.nix | 4 +-- pkgs/applications/networking/testssl/default.nix | 4 +-- pkgs/applications/office/libreoffice/default.nix | 4 +-- pkgs/applications/office/softmaker/generic.nix | 4 +-- pkgs/applications/science/math/calc/default.nix | 4 +-- .../terminal-emulators/roxterm/default.nix | 4 +-- .../commitizen/node-composition.nix | 2 +- .../version-management/commitizen/node-env.nix | 8 +++--- .../version-management/git-and-tools/default.nix | 2 +- .../git-and-tools/git-recent/default.nix | 6 ++-- .../git-and-tools/hub/default.nix | 4 +-- .../git-and-tools/transcrypt/default.nix | 6 ++-- pkgs/applications/video/vcs/default.nix | 4 +-- pkgs/applications/video/vdr/plugins.nix | 4 +-- pkgs/applications/virtualization/OVMF/default.nix | 4 +-- .../virtualization/containerd/default.nix | 4 +-- pkgs/applications/virtualization/cri-o/wrapper.nix | 4 +-- .../applications/virtualization/docker/default.nix | 4 +-- .../applications/virtualization/podman/wrapper.nix | 4 +-- .../virtualization/singularity/default.nix | 4 +-- .../virtualization/virt-manager/qt.nix | 4 +-- pkgs/applications/virtualization/xen/generic.nix | 8 +++--- pkgs/build-support/docker/default.nix | 4 +-- pkgs/build-support/singularity-tools/default.nix | 4 +-- pkgs/build-support/vm/default.nix | 32 +++++++++++----------- pkgs/desktops/enlightenment/efl/default.nix | 4 +-- pkgs/desktops/plasma-5/discover.nix | 4 +-- pkgs/desktops/plasma-5/plasma-desktop/default.nix | 4 +-- .../compilers/elm/packages/node-composition.nix | 2 +- pkgs/development/compilers/osl/default.nix | 4 +-- .../haskell-modules/hackage-packages.nix | 6 ++-- pkgs/development/libraries/bobcat/default.nix | 4 +-- pkgs/development/libraries/glib/default.nix | 8 +++--- pkgs/development/libraries/gnutls/default.nix | 4 +-- pkgs/development/libraries/hyperscan/default.nix | 4 +-- pkgs/development/libraries/kpmcore/default.nix | 4 +-- pkgs/development/libraries/libblockdev/default.nix | 4 +-- pkgs/development/libraries/libndctl/default.nix | 4 +-- pkgs/development/libraries/libseccomp/default.nix | 4 +-- pkgs/development/libraries/libvirt/5.9.0.nix | 4 +-- pkgs/development/libraries/libvirt/default.nix | 4 +-- pkgs/development/libraries/libxsmm/default.nix | 4 +-- pkgs/development/libraries/speechd/default.nix | 4 +-- pkgs/development/libraries/volume-key/default.nix | 4 +-- .../development/misc/google-clasp/google-clasp.nix | 2 +- pkgs/development/mobile/abootimg/default.nix | 4 +-- pkgs/development/node-packages/composition.nix | 2 +- pkgs/development/node-packages/node-env.nix | 8 +++--- pkgs/development/python-modules/blivet/default.nix | 6 ++-- .../python-modules/coloredlogs/default.nix | 4 +-- .../python-modules/git-annex-adapter/default.nix | 4 +-- pkgs/development/python-modules/nuitka/default.nix | 2 +- .../development/python-modules/pytorch/default.nix | 4 +-- .../python-modules/supervise_api/default.nix | 4 +-- pkgs/development/python-modules/xlib/default.nix | 4 +-- pkgs/development/r-modules/generic-builder.nix | 4 +-- .../ruby-modules/gem-config/default.nix | 6 ++-- pkgs/development/tools/buildah/wrapper.nix | 4 +-- pkgs/development/tools/git-quick-stats/default.nix | 4 +-- pkgs/development/tools/halfempty/default.nix | 4 +-- pkgs/development/tools/misc/creduce/default.nix | 4 +-- .../tools/misc/usb-modeswitch/default.nix | 4 +-- pkgs/development/tools/misc/yodl/default.nix | 4 +-- pkgs/development/web/newman/node-composition.nix | 2 +- pkgs/development/web/newman/node-env.nix | 8 +++--- pkgs/development/web/nodejs/nodejs.nix | 4 +-- pkgs/development/web/remarkjs/nodepkgs.nix | 2 +- pkgs/games/unnethack/default.nix | 4 +-- pkgs/misc/base16-builder/node-packages.nix | 2 +- pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix | 4 +-- pkgs/misc/drivers/hplip/3.16.11.nix | 4 +-- pkgs/misc/drivers/hplip/3.18.5.nix | 4 +-- pkgs/misc/drivers/hplip/default.nix | 4 +-- pkgs/misc/emulators/cdemu/libmirage.nix | 4 +-- pkgs/misc/emulators/qmc2/default.nix | 4 +-- pkgs/misc/emulators/wine/staging.nix | 2 +- .../ms-vsliveshare-vsliveshare/default.nix | 4 +-- pkgs/os-specific/linux/displaylink/default.nix | 4 +-- pkgs/os-specific/linux/eudev/default.nix | 4 +-- pkgs/os-specific/linux/fuse/common.nix | 4 +-- pkgs/os-specific/linux/fuse/default.nix | 4 +-- .../linux/kernel/linux-hardkernel-4.14.nix | 2 +- pkgs/os-specific/linux/kernel/manual-config.nix | 2 +- pkgs/os-specific/linux/ldm/default.nix | 4 +-- pkgs/os-specific/linux/lvm2/default.nix | 2 +- pkgs/os-specific/linux/lxcfs/default.nix | 6 ++-- pkgs/os-specific/linux/mcelog/default.nix | 4 +-- pkgs/os-specific/linux/mdadm/default.nix | 4 +-- pkgs/os-specific/linux/nfs-utils/default.nix | 4 +-- pkgs/os-specific/linux/open-iscsi/default.nix | 4 +-- pkgs/os-specific/linux/openrazer/driver.nix | 4 +-- pkgs/os-specific/linux/openvswitch/default.nix | 4 +-- pkgs/os-specific/linux/openvswitch/lts.nix | 4 +-- pkgs/os-specific/linux/pam_mount/default.nix | 6 ++-- pkgs/os-specific/linux/pktgen/default.nix | 4 +-- pkgs/os-specific/linux/pm-utils/default.nix | 4 +-- pkgs/os-specific/linux/pmount/default.nix | 8 +++--- pkgs/os-specific/linux/prl-tools/default.nix | 4 +-- pkgs/os-specific/linux/systemd/default.nix | 16 +++++------ pkgs/os-specific/linux/tomb/default.nix | 4 +-- pkgs/os-specific/linux/udisks/1-default.nix | 4 +-- pkgs/os-specific/linux/udisks/2-default.nix | 6 ++-- pkgs/os-specific/linux/zfs/default.nix | 14 +++++----- pkgs/servers/apcupsd/default.nix | 4 +-- pkgs/servers/asterisk/default.nix | 4 +-- pkgs/servers/computing/torque/default.nix | 4 +-- pkgs/servers/hylafaxplus/default.nix | 4 +-- .../matrix-appservice-discord/node-composition.nix | 2 +- .../matrix-appservice-slack/node-composition.nix | 2 +- pkgs/servers/search/elasticsearch/6.x.nix | 6 ++-- pkgs/servers/search/elasticsearch/7.x.nix | 6 ++-- pkgs/servers/web-apps/cryptpad/node-packages.nix | 2 +- pkgs/servers/xmpp/ejabberd/default.nix | 4 +-- pkgs/servers/zigbee2mqtt/node.nix | 2 +- pkgs/servers/zoneminder/default.nix | 4 +-- pkgs/shells/bash/4.4.nix | 4 +-- pkgs/shells/bash/5.0.nix | 4 +-- pkgs/shells/fish/default.nix | 4 +-- pkgs/tools/X11/xpra/default.nix | 4 +-- pkgs/tools/archivers/fsarchiver/default.nix | 4 +-- pkgs/tools/backup/btrbk/default.nix | 4 +-- pkgs/tools/backup/duplicity/default.nix | 4 +-- pkgs/tools/backup/ori/default.nix | 4 +-- pkgs/tools/bluetooth/blueberry/default.nix | 8 +++--- pkgs/tools/cd-dvd/bashburn/default.nix | 6 ++-- pkgs/tools/cd-dvd/unetbootin/default.nix | 8 +++--- pkgs/tools/compression/pigz/default.nix | 4 +-- pkgs/tools/filesystems/bcache-tools/default.nix | 4 +-- pkgs/tools/filesystems/bees/default.nix | 7 +++-- pkgs/tools/filesystems/ceph/default.nix | 4 +-- pkgs/tools/filesystems/fatresize/default.nix | 6 ++-- pkgs/tools/filesystems/glusterfs/default.nix | 10 +++---- pkgs/tools/filesystems/nixpart/0.4/blivet.nix | 6 ++-- pkgs/tools/filesystems/nixpart/0.4/default.nix | 6 ++-- pkgs/tools/filesystems/nixpart/0.4/lvm2.nix | 4 +-- pkgs/tools/filesystems/nixpart/0.4/parted.nix | 4 +-- pkgs/tools/filesystems/ntfs-3g/default.nix | 6 ++-- pkgs/tools/misc/calamares/default.nix | 4 +-- pkgs/tools/misc/cloud-utils/default.nix | 4 +-- pkgs/tools/misc/debootstrap/default.nix | 4 +-- pkgs/tools/misc/etcher/default.nix | 4 +-- pkgs/tools/misc/gparted/default.nix | 4 +-- pkgs/tools/misc/memtest86-efi/default.nix | 4 +-- pkgs/tools/misc/ostree/default.nix | 4 +-- pkgs/tools/misc/parted/default.nix | 4 +-- pkgs/tools/misc/partition-manager/default.nix | 4 +-- pkgs/tools/misc/profile-sync-daemon/default.nix | 4 +-- pkgs/tools/misc/rmlint/default.nix | 6 ++-- pkgs/tools/misc/rpm-ostree/default.nix | 4 +-- pkgs/tools/misc/snapper/default.nix | 4 +-- pkgs/tools/misc/tlp/default.nix | 4 +-- pkgs/tools/misc/woeusb/default.nix | 4 +-- pkgs/tools/misc/xfstests/default.nix | 4 +-- pkgs/tools/misc/xvfb-run/default.nix | 4 +-- pkgs/tools/networking/airfield/node.nix | 2 +- pkgs/tools/networking/bud/default.nix | 4 +-- pkgs/tools/networking/cjdns/default.nix | 4 +-- pkgs/tools/networking/openvpn/default.nix | 4 +-- .../networking/openvpn/openvpn_learnaddress.nix | 6 ++-- .../networking/openvpn/update-systemd-resolved.nix | 4 +-- pkgs/tools/networking/shorewall/default.nix | 6 ++-- pkgs/tools/networking/tgt/default.nix | 2 +- pkgs/tools/package-management/nixui/nixui.nix | 2 +- pkgs/tools/security/ecryptfs/default.nix | 6 ++-- pkgs/tools/security/pass/rofi-pass.nix | 4 +-- pkgs/tools/security/scrypt/default.nix | 4 +-- pkgs/tools/system/facter/default.nix | 4 +-- pkgs/tools/system/inxi/default.nix | 4 +-- pkgs/tools/system/rofi-systemd/default.nix | 4 +-- .../alpine-make-vm-image/default.nix | 4 +-- .../google-compute-engine/default.nix | 8 +++--- .../virtualization/nixos-container/default.nix | 4 +-- pkgs/top-level/aliases.nix | 3 +- pkgs/top-level/all-packages.nix | 30 ++++++++++---------- pkgs/top-level/release-small.nix | 4 +-- pkgs/top-level/unix-tools.nix | 32 +++++++++++----------- 211 files changed, 496 insertions(+), 494 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/audio/clerk/default.nix b/pkgs/applications/audio/clerk/default.nix index 3c78295db674..912662b7726c 100644 --- a/pkgs/applications/audio/clerk/default.nix +++ b/pkgs/applications/audio/clerk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, makeWrapper, rofi, mpc_cli, perl, -utillinux, pythonPackages, libnotify }: +util-linux, pythonPackages, libnotify }: stdenv.mkDerivation { name = "clerk-2016-10-14"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { 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; { diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index 712a3e37a476..c2f1a0db701c 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -23,7 +23,7 @@ , libselinux ? null , libsepol ? null , p11-kit ? null -, utillinux ? null +, util-linux ? null , qtbase , qtx11extras , qttools @@ -67,7 +67,7 @@ mkDerivation rec { libselinux libsepol p11-kit - utillinux + util-linux ] ++ lib.optionals withGstreamer (with gst_all_1; [ gstreamer diff --git a/pkgs/applications/audio/whipper/default.nix b/pkgs/applications/audio/whipper/default.nix index 5cbc9a07b6c7..3ff1368c9432 100644 --- a/pkgs/applications/audio/whipper/default.nix +++ b/pkgs/applications/audio/whipper/default.nix @@ -1,5 +1,5 @@ { 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"; @@ -37,7 +37,7 @@ python3.pkgs.buildPythonApplication rec { ]; 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 = '' diff --git a/pkgs/applications/blockchains/bitcoin-abc.nix b/pkgs/applications/blockchains/bitcoin-abc.nix index 1596ed2d3572..81825d3d5b02 100644 --- a/pkgs/applications/blockchains/bitcoin-abc.nix +++ b/pkgs/applications/blockchains/bitcoin-abc.nix @@ -1,5 +1,5 @@ { 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; @@ -20,7 +20,7 @@ mkDerivation rec { 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) [ diff --git a/pkgs/applications/blockchains/bitcoin-classic.nix b/pkgs/applications/blockchains/bitcoin-classic.nix index 01c1264567ce..417262f6f4d0 100644 --- a/pkgs/applications/blockchains/bitcoin-classic.nix +++ b/pkgs/applications/blockchains/bitcoin-classic.nix @@ -1,5 +1,5 @@ { 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; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { 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" ] diff --git a/pkgs/applications/blockchains/bitcoin-knots.nix b/pkgs/applications/blockchains/bitcoin-knots.nix index 384ac880fe14..dd0132df4d94 100644 --- a/pkgs/applications/blockchains/bitcoin-knots.nix +++ b/pkgs/applications/blockchains/bitcoin-knots.nix @@ -9,7 +9,7 @@ , miniupnpc , libevent , protobuf -, utillinux +, util-linux }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ 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" diff --git a/pkgs/applications/blockchains/bitcoin-unlimited.nix b/pkgs/applications/blockchains/bitcoin-unlimited.nix index f8988af683d1..8a2b9e370f51 100644 --- a/pkgs/applications/blockchains/bitcoin-unlimited.nix +++ b/pkgs/applications/blockchains/bitcoin-unlimited.nix @@ -1,5 +1,5 @@ { 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 }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { 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 ]; diff --git a/pkgs/applications/blockchains/bitcoin.nix b/pkgs/applications/blockchains/bitcoin.nix index 09dc59a051ad..80e935f2b1a8 100644 --- a/pkgs/applications/blockchains/bitcoin.nix +++ b/pkgs/applications/blockchains/bitcoin.nix @@ -11,7 +11,7 @@ , qtbase ? null , qttools ? null , wrapQtAppsHook ? null -, utillinux +, util-linux , python3 , qrencode , libevent @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ++ 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 '' diff --git a/pkgs/applications/blockchains/dashpay.nix b/pkgs/applications/blockchains/dashpay.nix index 7bdf93b2dacc..b55dd3b5b78d 100644 --- a/pkgs/applications/blockchains/dashpay.nix +++ b/pkgs/applications/blockchains/dashpay.nix @@ -1,7 +1,7 @@ { 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 }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { 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" ] diff --git a/pkgs/applications/blockchains/dogecoin.nix b/pkgs/applications/blockchains/dogecoin.nix index 27a1f6132f05..527b307042c3 100644 --- a/pkgs/applications/blockchains/dogecoin.nix +++ b/pkgs/applications/blockchains/dogecoin.nix @@ -1,7 +1,7 @@ { stdenv , fetchFromGitHub , pkgconfig, autoreconfHook , db5, openssl, boost, zlib, miniupnpc, libevent -, protobuf, utillinux, qt4, qrencode +, protobuf, util-linux, qt4, qrencode , withGui }: with stdenv.lib; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; - buildInputs = [ openssl db5 openssl utillinux + buildInputs = [ openssl db5 openssl util-linux protobuf boost zlib miniupnpc libevent ] ++ optionals withGui [ qt4 qrencode ]; diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index 5630cb20d4de..ec5727a05be9 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/pkgs/applications/blockchains/exodus/default.nix @@ -1,5 +1,5 @@ { 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 { @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { xorg.libXrender xorg.libXtst xorg_sys_opengl - utillinux + util-linux xorg.libXrandr xorg.libXScrnSaver alsaLib diff --git a/pkgs/applications/blockchains/litecoin.nix b/pkgs/applications/blockchains/litecoin.nix index fa352652dbf9..85adbec718f3 100644 --- a/pkgs/applications/blockchains/litecoin.nix +++ b/pkgs/applications/blockchains/litecoin.nix @@ -1,7 +1,7 @@ { 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 @@ -24,7 +24,7 @@ mkDerivation rec { 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 ]; diff --git a/pkgs/applications/blockchains/pivx.nix b/pkgs/applications/blockchains/pivx.nix index 5a59bb4b7de2..6d6f881ae65f 100644 --- a/pkgs/applications/blockchains/pivx.nix +++ b/pkgs/applications/blockchains/pivx.nix @@ -1,7 +1,7 @@ { 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 @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; 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" ] diff --git a/pkgs/applications/blockchains/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix index e2c57d514cda..9cccbd7b7e46 100644 --- a/pkgs/applications/blockchains/zcash/default.nix +++ b/pkgs/applications/blockchains/zcash/default.nix @@ -1,5 +1,5 @@ { 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 @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { 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" ]; diff --git a/pkgs/applications/graphics/comical/default.nix b/pkgs/applications/graphics/comical/default.nix index 8e6e151aff6a..800709de054a 100644 --- a/pkgs/applications/graphics/comical/default.nix +++ b/pkgs/applications/graphics/comical/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, wxGTK, utillinux, zlib }: +{stdenv, fetchurl, wxGTK, util-linux, zlib }: stdenv.mkDerivation rec { name = "comical-0.8"; @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { 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 ]; diff --git a/pkgs/applications/misc/clight/clightd.nix b/pkgs/applications/misc/clight/clightd.nix index c06d00ebb52e..e1f019ffa455 100644 --- a/pkgs/applications/misc/clight/clightd.nix +++ b/pkgs/applications/misc/clight/clightd.nix @@ -1,7 +1,7 @@ { 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 @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { pcre libXdmcp - utillinux + util-linux libpthreadstubs ] ++ optional enableDdc ddcutil ++ optional enableDpms libXext diff --git a/pkgs/applications/misc/clipmenu/default.nix b/pkgs/applications/misc/clipmenu/default.nix index 54c2ab48f656..3227792d6a2f 100644 --- a/pkgs/applications/misc/clipmenu/default.nix +++ b/pkgs/applications/misc/clipmenu/default.nix @@ -1,6 +1,6 @@ -{ 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"; diff --git a/pkgs/applications/misc/corectrl/default.nix b/pkgs/applications/misc/corectrl/default.nix index cee390d064d0..090a63a32e4f 100644 --- a/pkgs/applications/misc/corectrl/default.nix +++ b/pkgs/applications/misc/corectrl/default.nix @@ -7,7 +7,7 @@ , libdrm , mesa-demos , procps -, utillinux +, util-linux , vulkan-tools , qtbase , qtcharts @@ -40,7 +40,7 @@ stdenv.mkDerivation rec{ libdrm mesa-demos procps - utillinux + util-linux vulkan-tools qtbase qtcharts diff --git a/pkgs/applications/misc/imag/default.nix b/pkgs/applications/misc/imag/default.nix index f00433a658f7..f3d4e156d6cd 100644 --- a/pkgs/applications/misc/imag/default.nix +++ b/pkgs/applications/misc/imag/default.nix @@ -7,7 +7,7 @@ , installShellFiles , Security , gitMinimal -, utillinuxMinimal +, util-linuxMinimal }: rustPlatform.buildRustPackage rec { @@ -24,7 +24,7 @@ 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"; diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix index 2b656775ab5c..d7eabae0e8e5 100644 --- a/pkgs/applications/misc/lutris/fhsenv.nix +++ b/pkgs/applications/misc/lutris/fhsenv.nix @@ -103,7 +103,7 @@ in buildFHSUserEnv { # WINE cups lcms2 mpg123 cairo unixODBC samba4 sane-backends openldap - ocl-icd utillinux libkrb5 + ocl-icd util-linux libkrb5 # Proton libselinux diff --git a/pkgs/applications/misc/multibootusb/default.nix b/pkgs/applications/misc/multibootusb/default.nix index 8f90c7a581d0..c1c7b5a2706e 100644 --- a/pkgs/applications/misc/multibootusb/default.nix +++ b/pkgs/applications/misc/multibootusb/default.nix @@ -1,6 +1,6 @@ { 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 @@ -30,7 +30,7 @@ python36Packages.buildPythonApplication rec { gnugrep which parted - utillinux + util-linux qemu p7zip gnused diff --git a/pkgs/applications/misc/todoist-electron/default.nix b/pkgs/applications/misc/todoist-electron/default.nix index e1d578edb0f5..6e59395f411e 100644 --- a/pkgs/applications/misc/todoist-electron/default.nix +++ b/pkgs/applications/misc/todoist-electron/default.nix @@ -1,6 +1,6 @@ { 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"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { 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 diff --git a/pkgs/applications/misc/udevil/default.nix b/pkgs/applications/misc/udevil/default.nix index dbf721888df6..8e01f73f9675 100644 --- a/pkgs/applications/misc/udevil/default.nix +++ b/pkgs/applications/misc/udevil/default.nix @@ -1,4 +1,4 @@ -{ 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 { @@ -13,9 +13,9 @@ stdenv.mkDerivation { 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 ''; diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/misc/vifm/default.nix index b014543e8ceb..2c388e58fe11 100644 --- a/pkgs/applications/misc/vifm/default.nix +++ b/pkgs/applications/misc/vifm/default.nix @@ -1,7 +1,7 @@ { 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 @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig makeWrapper ]; - buildInputs = [ ncurses libX11 utillinux file which groff ]; + buildInputs = [ ncurses libX11 util-linux file which groff ]; postFixup = let path = lib.makeBinPath diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 7e453d6e0540..f167ab105d34 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -9,7 +9,7 @@ , python2Packages, perl, pkgconfig , nspr, systemd, kerberos -, utillinux, alsaLib +, util-linux, alsaLib , bison, gperf , glib, gtk3, dbus-glib , glibc @@ -134,7 +134,7 @@ let buildInputs = defaultDependencies ++ [ nspr nss systemd - utillinux alsaLib + util-linux alsaLib bison gperf kerberos glib gtk3 dbus-glib libXScrnSaver libXcursor libXtst libGLU libGL diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 727090a4c5c3..f2e10f323305 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -22,7 +22,7 @@ # 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 @@ -59,7 +59,7 @@ let 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 diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix index 2b8dc83da508..2accb1a7ab21 100644 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix @@ -9,7 +9,7 @@ , python2Packages, perl, pkgconfig , nspr, systemd, kerberos -, utillinux, alsaLib +, util-linux, alsaLib , bison, gperf , glib, gtk3, dbus-glib , glibc @@ -141,7 +141,7 @@ let buildInputs = defaultDependencies ++ [ nspr nss systemd - utillinux alsaLib + util-linux alsaLib bison gperf kerberos glib gtk3 dbus-glib libXScrnSaver libXcursor libXtst libGLU libGL diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 8fa288f04014..55d51a656d9c 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -13,7 +13,7 @@ , libseccomp , pkgconfig , ethtool -, utillinux +, util-linux , ipset , fetchFromGitHub , fetchurl @@ -234,7 +234,7 @@ stdenv.mkDerivation rec { iproute bridge-utils ethtool - utillinux + util-linux ipset conntrack-tools ]; diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index b547434d8da1..34d362a4623b 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -1,4 +1,4 @@ -{ 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" diff --git a/pkgs/applications/networking/cluster/spacegun/node-composition.nix b/pkgs/applications/networking/cluster/spacegun/node-composition.nix index 47cdb6942cec..712f62e8d4fd 100644 --- a/pkgs/applications/networking/cluster/spacegun/node-composition.nix +++ b/pkgs/applications/networking/cluster/spacegun/node-composition.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; + inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile; inherit nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/pkgs/applications/networking/firehol/default.nix b/pkgs/applications/networking/firehol/default.nix index 16b2b7454bf5..de523b14ba64 100644 --- a/pkgs/applications/networking/firehol/default.nix +++ b/pkgs/applications/networking/firehol/default.nix @@ -1,6 +1,6 @@ { 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 @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { 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"; diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix b/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix index e03bdd9909e8..92ddfe342982 100644 --- a/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix +++ b/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix @@ -6,7 +6,7 @@ let nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; + inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile; inherit nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix b/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix index 670556bf271a..ff5ca0d99b19 100644 --- a/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix +++ b/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix @@ -1,6 +1,6 @@ # This file originates from node2nix -{stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}: +{stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}: let python = if nodejs ? python then nodejs.python else python2; @@ -396,7 +396,7 @@ let stdenv.mkDerivation ({ name = "node_${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] - ++ stdenv.lib.optional (stdenv.isLinux) utillinux + ++ stdenv.lib.optional (stdenv.isLinux) util-linux ++ stdenv.lib.optional (stdenv.isDarwin) libtool ++ buildInputs; @@ -468,7 +468,7 @@ let name = "node-dependencies-${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] - ++ stdenv.lib.optional (stdenv.isLinux) utillinux + ++ stdenv.lib.optional (stdenv.isLinux) util-linux ++ stdenv.lib.optional (stdenv.isDarwin) libtool ++ buildInputs; @@ -514,7 +514,7 @@ let stdenv.mkDerivation { name = "node-shell-${name}-${version}"; - buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs; + buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) util-linux ++ buildInputs; buildCommand = '' mkdir -p $out/bin cat > $out/bin/shell < $out/bin/shell < $out/bin/transcrypt-depspathprefix << EOF #!${stdenv.shell} diff --git a/pkgs/applications/video/vcs/default.nix b/pkgs/applications/video/vcs/default.nix index 0cbdeaaf6ff8..0280cfb3f1f4 100644 --- a/pkgs/applications/video/vcs/default.nix +++ b/pkgs/applications/video/vcs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper -, coreutils, ffmpeg, gawk, gnugrep, gnused, imagemagick, mplayer, utillinux +, coreutils, ffmpeg, gawk, gnugrep, gnused, imagemagick, mplayer, util-linux , dejavu_fonts }: with stdenv.lib; let version = "1.13.4"; - runtimeDeps = [ coreutils ffmpeg gawk gnugrep gnused imagemagick mplayer utillinux ]; + runtimeDeps = [ coreutils ffmpeg gawk gnugrep gnused imagemagick mplayer util-linux ]; in stdenv.mkDerivation { pname = "vcs"; diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index 30cd93178c25..e72de8e61f20 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchgit, vdr, alsaLib, fetchFromGitHub , libvdpau, libxcb, xcbutilwm, graphicsmagick, libav, pcre, xorgserver, ffmpeg_3 -, libiconv, boost, libgcrypt, perl, utillinux, groff, libva, xorg, ncurses +, libiconv, boost, libgcrypt, perl, util-linux, groff, libva, xorg, ncurses , callPackage }: let mkPlugin = name: stdenv.mkDerivation { @@ -146,7 +146,7 @@ in { nativeBuildInputs = [ perl # for pod2man and pos2html - utillinux + util-linux groff ]; diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index 94d0ae94dbde..6301182771fb 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, edk2, utillinux, nasm, iasl +{ stdenv, lib, edk2, util-linux, nasm, iasl , csmSupport ? false, seabios ? null , secureBoot ? false }: @@ -24,7 +24,7 @@ edk2.mkDerivation projectDscPath { outputs = [ "out" "fd" ]; - buildInputs = [ utillinux nasm iasl ]; + buildInputs = [ util-linux nasm iasl ]; hardeningDisable = [ "format" "stackprotector" "pic" "fortify" ]; diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index f3bcefcf1739..c01586ce5c83 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildGoPackage, btrfs-progs, go-md2man, installShellFiles, utillinux, nixosTests }: +{ lib, fetchFromGitHub, buildGoPackage, btrfs-progs, go-md2man, installShellFiles, util-linux, nixosTests }: with lib; @@ -18,7 +18,7 @@ buildGoPackage rec { goPackagePath = "github.com/containerd/containerd"; outputs = [ "out" "man" ]; - nativeBuildInputs = [ go-md2man installShellFiles utillinux ]; + nativeBuildInputs = [ go-md2man installShellFiles util-linux ]; buildInputs = [ btrfs-progs ]; diff --git a/pkgs/applications/virtualization/cri-o/wrapper.nix b/pkgs/applications/virtualization/cri-o/wrapper.nix index 6d72623d86cb..5aca291a6018 100644 --- a/pkgs/applications/virtualization/cri-o/wrapper.nix +++ b/pkgs/applications/virtualization/cri-o/wrapper.nix @@ -7,7 +7,7 @@ , runc # Default container runtime , crun # Container runtime (default with cgroups v2 for podman/buildah) , conmon # Container runtime monitor -, utillinux # nsenter +, util-linux # nsenter , cni-plugins # not added to path , iptables }: @@ -19,7 +19,7 @@ let runc crun conmon - utillinux + util-linux iptables ] ++ extraPackages); diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index d3200bba928c..5df0ae39a251 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -2,7 +2,7 @@ , makeWrapper, installShellFiles, pkgconfig , go-md2man, go, containerd, runc, docker-proxy, tini, libtool , sqlite, iproute, lvm2, systemd -, btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs, git +, btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git , procps, libseccomp , nixosTests }: @@ -140,7 +140,7 @@ rec { outputs = ["out" "man"]; - extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps utillinux git ]); + extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps util-linux git ]); installPhase = '' cd ./go/src/${goPackagePath} diff --git a/pkgs/applications/virtualization/podman/wrapper.nix b/pkgs/applications/virtualization/podman/wrapper.nix index d97d182496a4..863888227b37 100644 --- a/pkgs/applications/virtualization/podman/wrapper.nix +++ b/pkgs/applications/virtualization/podman/wrapper.nix @@ -9,7 +9,7 @@ , conmon # Container runtime monitor , slirp4netns # User-mode networking for unprivileged namespaces , fuse-overlayfs # CoW for images, much faster than default vfs -, utillinux # nsenter +, util-linux # nsenter , cni-plugins # not added to path , iptables }: @@ -23,7 +23,7 @@ let conmon slirp4netns fuse-overlayfs - utillinux + util-linux iptables ] ++ extraPackages); diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index 8d04b871e49b..21c978e1b0e3 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -1,7 +1,7 @@ {stdenv , lib , fetchurl -, utillinux +, util-linux , gpgme , openssl , libuuid @@ -27,7 +27,7 @@ buildGoPackage rec { goPackagePath = "github.com/sylabs/singularity"; buildInputs = [ gpgme openssl libuuid ]; - nativeBuildInputs = [ utillinux which makeWrapper cryptsetup ]; + nativeBuildInputs = [ util-linux which makeWrapper cryptsetup ]; propagatedBuildInputs = [ coreutils squashfsTools ]; postPatch = '' diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix index 45d1146f4300..1d2a32c54e3a 100644 --- a/pkgs/applications/virtualization/virt-manager/qt.nix +++ b/pkgs/applications/virtualization/virt-manager/qt.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, fetchFromGitHub, fetchpatch, cmake, pkgconfig , qtbase, qtmultimedia, qtsvg, qttools, krdc , libvncserver, libvirt, pcre, pixman, qtermwidget, spice-gtk, spice-protocol -, libselinux, libsepol, utillinux +, libselinux, libsepol, util-linux }: mkDerivation rec { @@ -32,7 +32,7 @@ mkDerivation rec { buildInputs = [ qtbase qtmultimedia qtsvg krdc libvirt libvncserver pcre pixman qtermwidget spice-gtk spice-protocol - libselinux libsepol utillinux + libselinux libsepol util-linux ]; nativeBuildInputs = [ cmake pkgconfig qttools ]; diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index 854debc458a3..53f556e3f0d6 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -14,7 +14,7 @@ config: # Scripts , coreutils, gawk, gnused, gnugrep, diffutils, multipath-tools , iproute, inetutils, iptables, bridge-utils, openvswitch, nbd, drbd -, lvm2, utillinux, procps, systemd +, lvm2, util-linux, procps, systemd # Documentation # python2Packages.markdown @@ -28,7 +28,7 @@ let #TODO: fix paths instead scriptEnvPath = concatMapStringsSep ":" (x: "${x}/bin") [ which perl - coreutils gawk gnused gnugrep diffutils utillinux multipath-tools + coreutils gawk gnused gnugrep diffutils util-linux multipath-tools iproute inetutils iptables bridge-utils openvswitch nbd drbd ]; @@ -146,8 +146,8 @@ stdenv.mkDerivation (rec { --replace /usr/sbin/lvs ${lvm2}/bin/lvs substituteInPlace tools/misc/xenpvnetboot \ - --replace /usr/sbin/mount ${utillinux}/bin/mount \ - --replace /usr/sbin/umount ${utillinux}/bin/umount + --replace /usr/sbin/mount ${util-linux}/bin/mount \ + --replace /usr/sbin/umount ${util-linux}/bin/umount substituteInPlace tools/xenmon/xenmon.py \ --replace /usr/bin/pkill ${procps}/bin/pkill diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 4da26ba7cfda..db1062e1b5d8 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -24,7 +24,7 @@ storeDir ? builtins.storeDir, substituteAll, symlinkJoin, - utillinux, + util-linux, vmTools, writeReferencesToFile, writeScript, @@ -204,7 +204,7 @@ rec { }; inherit fromImage fromImageName fromImageTag; - nativeBuildInputs = [ utillinux e2fsprogs jshon rsync jq ]; + nativeBuildInputs = [ util-linux e2fsprogs jshon rsync jq ]; } '' mkdir disk mkfs /dev/${vmTools.hd} diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix index d937ec626682..4a54498d117c 100644 --- a/pkgs/build-support/singularity-tools/default.nix +++ b/pkgs/build-support/singularity-tools/default.nix @@ -7,7 +7,7 @@ , bash , vmTools , gawk -, utillinux +, util-linux , runtimeShell , e2fsprogs }: @@ -47,7 +47,7 @@ rec { runScriptFile = shellScript "run-script.sh" runScript; result = vmTools.runInLinuxVM ( runCommand "singularity-image-${name}.img" { - buildInputs = [ singularity e2fsprogs utillinux gawk ]; + buildInputs = [ singularity e2fsprogs util-linux gawk ]; layerClosure = writeReferencesToFile layer; preVM = vmTools.createEmptyImage { size = diskSize; diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 909cdc6da044..2f18e96e4ce2 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -151,7 +151,7 @@ rec { # Set the system time from the hardware clock. Works around an # apparent KVM > 1.5.2 bug. - ${pkgs.utillinux}/bin/hwclock -s + ${pkgs.util-linux}/bin/hwclock -s export NIX_STORE=${storeDir} export NIX_BUILD_TOP=/tmp @@ -270,7 +270,7 @@ rec { defaultCreateRootFS = '' mkdir /mnt $