diff options
author | Graham Christensen <graham@grahamc.com> | 2020-11-24 10:29:28 -0500 |
---|---|---|
committer | Graham Christensen <graham@grahamc.com> | 2020-11-24 12:42:06 -0500 |
commit | bc49a0815ae860010b4d593b02f00ab6f07d50ea (patch) | |
tree | 1435af86f0f2172632621a400f27a44599751f17 /pkgs/applications | |
parent | 79086e5d55e037b994c839c2894a3667ae72547b (diff) |
utillinux: rename to util-linux
Diffstat (limited to 'pkgs/applications')
57 files changed, 118 insertions, 118 deletions
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/ |