diff options
| author | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-15 16:19:50 +0700 |
|---|---|---|
| committer | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-15 17:12:36 +0700 |
| commit | 8c5d37129fc5097d9fb52e95fb07de75392d1c3c (patch) | |
| tree | 40cfd341b87811008151e9ecf053cf7449574b98 /pkgs/tools/misc | |
| parent | 94f36839357387fd711d17d762d88c69767f265b (diff) | |
| download | nixpkgs-8c5d37129fc5097d9fb52e95fb07de75392d1c3c.tar nixpkgs-8c5d37129fc5097d9fb52e95fb07de75392d1c3c.tar.gz nixpkgs-8c5d37129fc5097d9fb52e95fb07de75392d1c3c.tar.bz2 nixpkgs-8c5d37129fc5097d9fb52e95fb07de75392d1c3c.tar.lz nixpkgs-8c5d37129fc5097d9fb52e95fb07de75392d1c3c.tar.xz nixpkgs-8c5d37129fc5097d9fb52e95fb07de75392d1c3c.tar.zst nixpkgs-8c5d37129fc5097d9fb52e95fb07de75392d1c3c.zip | |
pkgs/tools: stdenv.lib -> lib
Diffstat (limited to 'pkgs/tools/misc')
211 files changed, 547 insertions, 547 deletions
diff --git a/pkgs/tools/misc/0x0/default.nix b/pkgs/tools/misc/0x0/default.nix index 1fc081d71ab..e0f84329b89 100644 --- a/pkgs/tools/misc/0x0/default.nix +++ b/pkgs/tools/misc/0x0/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { patchShebangs $out/bin/0x0 wrapProgram $out/bin/0x0 \ - --prefix PATH : '${stdenv.lib.makeBinPath [ curl xsel ]}' + --prefix PATH : '${lib.makeBinPath [ curl xsel ]}' ''; meta = with lib; { diff --git a/pkgs/tools/misc/abduco/default.nix b/pkgs/tools/misc/abduco/default.nix index a0868344d4c..dbba2193b14 100644 --- a/pkgs/tools/misc/abduco/default.nix +++ b/pkgs/tools/misc/abduco/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, writeText, conf ? null }: +{ lib, stdenv, fetchFromGitHub, writeText, conf ? null }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { name = "abduco-2018-05-16"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { configFile = optionalString (conf!=null) (writeText "config.def.h" conf); preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; - CFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE"; + CFLAGS = lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE"; meta = { homepage = "http://brain-dump.org/projects/abduco"; diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/tools/misc/aescrypt/default.nix index 05ee0145636..2a8b8b0b024 100644 --- a/pkgs/tools/misc/aescrypt/default.nix +++ b/pkgs/tools/misc/aescrypt/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1iziymcbpc64d44djgqfifpblsly4sr5bxsp5g29jgxz552kjlah"; }; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-liconv"; + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-liconv"; preBuild = '' substituteInPlace src/Makefile --replace "CC=gcc" "CC?=gcc" @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { homepage = "https://www.aescrypt.com/"; license = licenses.gpl2; maintainers = with maintainers; [ lovek323 qknight ]; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; hydraPlatforms = with platforms; unix; }; } diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix index 2ee81460b28..369f7dd219f 100644 --- a/pkgs/tools/misc/aptly/default.nix +++ b/pkgs/tools/misc/aptly/default.nix @@ -34,7 +34,7 @@ buildGoPackage { postInstall = '' installShellCompletion --bash ${aptlyCompletionSrc}/aptly wrapProgram "$out/bin/aptly" \ - --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg bzip2 xz graphviz ]}" + --prefix PATH ":" "${lib.makeBinPath [ gnupg bzip2 xz graphviz ]}" ''; meta = with lib; { diff --git a/pkgs/tools/misc/aws-mturk-clt/default.nix b/pkgs/tools/misc/aws-mturk-clt/default.nix index c5f4b0f5670..7e60d498842 100644 --- a/pkgs/tools/misc/aws-mturk-clt/default.nix +++ b/pkgs/tools/misc/aws-mturk-clt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre }: +{ lib, stdenv, fetchurl, jre }: stdenv.mkDerivation rec { name = "aws-mturk-clt-1.3.0"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://requester.mturk.com/developer"; description = "Command line tools for interacting with the Amazon Mechanical Turk"; - license = stdenv.lib.licenses.amazonsl; + license = lib.licenses.amazonsl; longDescription = '' diff --git a/pkgs/tools/misc/azure-vhd-utils/default.nix b/pkgs/tools/misc/azure-vhd-utils/default.nix index cb38f2705b1..f8a17790ba1 100644 --- a/pkgs/tools/misc/azure-vhd-utils/default.nix +++ b/pkgs/tools/misc/azure-vhd-utils/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { pname = "azure-vhd-utils"; - version = "20160614-${stdenv.lib.strings.substring 0 7 rev}"; + version = "20160614-${lib.strings.substring 0 7 rev}"; rev = "070db2d701a462ca2edcf89d677ed3cac309d8e8"; goPackagePath = "github.com/Microsoft/azure-vhd-utils"; diff --git a/pkgs/tools/misc/bat-extras/default.nix b/pkgs/tools/misc/bat-extras/default.nix index c52cae4eac0..7d3f1dc0a36 100644 --- a/pkgs/tools/misc/bat-extras/default.nix +++ b/pkgs/tools/misc/bat-extras/default.nix @@ -116,9 +116,9 @@ let runHook preInstall mkdir -p $out/bin cp -p bin/${name} $out/bin/${name} - '' + stdenv.lib.optionalString (dependencies != []) '' + '' + lib.optionalString (dependencies != []) '' wrapProgram $out/bin/${name} \ - --prefix PATH : ${stdenv.lib.makeBinPath dependencies} + --prefix PATH : ${lib.makeBinPath dependencies} '' + '' runHook postInstall ''; @@ -130,7 +130,7 @@ let }; optionalDep = cond: dep: assert cond -> dep != null; - stdenv.lib.optional cond dep; + lib.optional cond dep; in { batdiff = script "batdiff" ([ less coreutils gitMinimal ] ++ optionalDep withDelta delta); diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index ac043ca7fea..d6e1e9e5d77 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config installShellFiles makeWrapper ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security libiconv ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ]; postInstall = '' installManPage $releaseDir/build/bat-*/out/assets/manual/bat.1 @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { # expected with certain flag combinations. postFixup = '' wrapProgram "$out/bin/bat" \ - --prefix PATH : "${stdenv.lib.makeBinPath [ less ]}" + --prefix PATH : "${lib.makeBinPath [ less ]}" ''; passthru.tests = { inherit (nixosTests) bat; }; diff --git a/pkgs/tools/misc/bc/default.nix b/pkgs/tools/misc/bc/default.nix index d065732a299..96c2d00ffa8 100644 --- a/pkgs/tools/misc/bc/default.nix +++ b/pkgs/tools/misc/bc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, buildPackages +{ lib, stdenv, autoreconfHook, buildPackages , fetchurl, flex, readline, ed, texinfo }: @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "GNU software calculator"; homepage = "https://www.gnu.org/software/bc/"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl3; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/misc/bfr/default.nix b/pkgs/tools/misc/bfr/default.nix index 2b84412f3b2..80ec398ef8c 100644 --- a/pkgs/tools/misc/bfr/default.nix +++ b/pkgs/tools/misc/bfr/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A general-purpose command-line pipe buffer"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/misc/blink1-tool/default.nix b/pkgs/tools/misc/blink1-tool/default.nix index 5bf38f1b0e7..76fadcb7c15 100644 --- a/pkgs/tools/misc/blink1-tool/default.nix +++ b/pkgs/tools/misc/blink1-tool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libusb1, pkgconfig, ... }: +{ lib, stdenv, fetchurl, libusb1, pkgconfig, ... }: stdenv.mkDerivation rec { pname = "blink1"; @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { meta = { description = "Command line client for the blink(1) notification light"; homepage = "https://blink1.thingm.com/"; - license = stdenv.lib.licenses.cc-by-sa-30; - maintainers = [ stdenv.lib.maintainers.cransom ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.cc-by-sa-30; + maintainers = [ lib.maintainers.cransom ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/bogofilter/default.nix b/pkgs/tools/misc/bogofilter/default.nix index 1924968f2d3..30a17bf188a 100644 --- a/pkgs/tools/misc/bogofilter/default.nix +++ b/pkgs/tools/misc/bogofilter/default.nix @@ -1,4 +1,4 @@ -{fetchurl, stdenv, flex, db}: +{fetchurl, lib, stdenv, flex, db}: stdenv.mkDerivation rec { name = "bogofilter-1.2.4"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { classifications and corrections. It is based on a Bayesian filter. ''; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/tools/misc/brltty/default.nix index 1320f28ede2..244e945bb20 100644 --- a/pkgs/tools/misc/brltty/default.nix +++ b/pkgs/tools/misc/brltty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, python3, bluez +{ lib, stdenv, fetchurl, pkgconfig, python3, bluez , alsaSupport ? stdenv.isLinux, alsaLib ? null , systemdSupport ? stdenv.isLinux, systemd ? null }: @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig python3.pkgs.cython ]; buildInputs = [ bluez ] - ++ stdenv.lib.optional alsaSupport alsaLib - ++ stdenv.lib.optional systemdSupport systemd; + ++ lib.optional alsaSupport alsaLib + ++ lib.optional systemdSupport systemd; meta = { description = "Access software for a blind person using a braille display"; @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { Some speech capability has also been incorporated. ''; homepage = "http://www.brltty.com/"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.bramd ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.bramd ]; + platforms = lib.platforms.all; }; makeFlags = [ "PYTHON_PREFIX=$(out)" ]; diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index afda7dd7abc..bdb1fe37586 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security zlib diff --git a/pkgs/tools/misc/capture/default.nix b/pkgs/tools/misc/capture/default.nix index f6762af11aa..d0e6c167349 100644 --- a/pkgs/tools/misc/capture/default.nix +++ b/pkgs/tools/misc/capture/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { patchShebangs $out/bin/capture wrapProgram $out/bin/capture \ - --prefix PATH : '${stdenv.lib.makeBinPath [ slop ffmpeg_3 ]}' + --prefix PATH : '${lib.makeBinPath [ slop ffmpeg_3 ]}' ''; meta = with lib; { diff --git a/pkgs/tools/misc/catimg/default.nix b/pkgs/tools/misc/catimg/default.nix index 30845759a28..3f94a559e61 100644 --- a/pkgs/tools/misc/catimg/default.nix +++ b/pkgs/tools/misc/catimg/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake } : +{ lib, stdenv, fetchFromGitHub, cmake } : -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "catimg"; diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix index 8097744692b..262fd853d10 100644 --- a/pkgs/tools/misc/chafa/default.nix +++ b/pkgs/tools/misc/chafa/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { docbook_xsl ]; - buildInputs = [ glib imagemagick ] ++ stdenv.lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices ]; + buildInputs = [ glib imagemagick ] ++ lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices ]; patches = [ ./xmlcatalog_patch.patch ]; diff --git a/pkgs/tools/misc/cht.sh/default.nix b/pkgs/tools/misc/cht.sh/default.nix index 12730d26223..3f2218ac871 100644 --- a/pkgs/tools/misc/cht.sh/default.nix +++ b/pkgs/tools/misc/cht.sh/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { cp share/zsh.txt $out/share/zsh/site-functions/_cht wrapProgram "$out/bin/cht.sh" \ - --prefix PATH : "${stdenv.lib.makeBinPath [ curl rlwrap ncurses xsel ]}" + --prefix PATH : "${lib.makeBinPath [ curl rlwrap ncurses xsel ]}" ''; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix index 2b9cbfe1030..f518c1b8e3f 100644 --- a/pkgs/tools/misc/cloc/default.nix +++ b/pkgs/tools/misc/cloc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, perlPackages }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, perlPackages }: stdenv.mkDerivation rec { pname = "cloc"; @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { meta = { description = "A program that counts lines of source code"; homepage = "https://github.com/AlDanial/cloc"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ rycee ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ rycee ]; }; } diff --git a/pkgs/tools/misc/cloud-utils/default.nix b/pkgs/tools/misc/cloud-utils/default.nix index 290bb92faa1..b10259f24fc 100644 --- a/pkgs/tools/misc/cloud-utils/default.nix +++ b/pkgs/tools/misc/cloud-utils/default.nix @@ -37,11 +37,11 @@ in stdenv.mkDerivation rec { moveToOutput bin/vcs-run $guest for i in $out/bin/*; do - wrapProgram $i --prefix PATH : "${stdenv.lib.makeBinPath binDeps}:$out/bin" + wrapProgram $i --prefix PATH : "${lib.makeBinPath binDeps}:$out/bin" done for i in $guest/bin/*; do - wrapProgram $i --prefix PATH : "${stdenv.lib.makeBinPath guestDeps}:$guest/bin" + wrapProgram $i --prefix PATH : "${lib.makeBinPath guestDeps}:$guest/bin" ln -s $i $out/bin done ''; diff --git a/pkgs/tools/misc/contacts/default.nix b/pkgs/tools/misc/contacts/default.nix index 40b8289e68b..7b652f36a19 100644 --- a/pkgs/tools/misc/contacts/default.nix +++ b/pkgs/tools/misc/contacts/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { homepage = "http://www.gnufoo.org/contacts/contacts.html"; license = licenses.gpl2; maintainers = with maintainers; [ jwiegley ]; - platforms = stdenv.lib.platforms.darwin; - hydraPlatforms = stdenv.lib.platforms.darwin; + platforms = lib.platforms.darwin; + hydraPlatforms = lib.platforms.darwin; }; } diff --git a/pkgs/tools/misc/coreboot-utils/default.nix b/pkgs/tools/misc/coreboot-utils/default.nix index 84a5d3b3255..c05d50cdbc1 100644 --- a/pkgs/tools/misc/coreboot-utils/default.nix +++ b/pkgs/tools/misc/coreboot-utils/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, zlib, pciutils, coreutils, acpica-tools, iasl, makeWrapper, gnugrep, gnused, file, buildEnv }: +{ lib, stdenv, fetchurl, zlib, pciutils, coreutils, acpica-tools, iasl, makeWrapper, gnugrep, gnused, file, buildEnv }: let version = "4.13"; - commonMeta = with stdenv.lib; { + commonMeta = with lib; { description = "Various coreboot-related tools"; homepage = "https://www.coreboot.org"; license = licenses.gpl2; @@ -91,14 +91,14 @@ let installPhase = "install -Dm755 acpidump-all $out/bin/acpidump-all"; postFixup = let binPath = [ coreutils acpica-tools iasl gnugrep gnused file ]; - in "wrapProgram $out/bin/acpidump-all --set PATH ${stdenv.lib.makeBinPath binPath}"; + in "wrapProgram $out/bin/acpidump-all --set PATH ${lib.makeBinPath binPath}"; }; }; in utils // { coreboot-utils = (buildEnv { name = "coreboot-utils-${version}"; - paths = stdenv.lib.attrValues utils; + paths = lib.attrValues utils; postBuild = "rm -rf $out/sbin"; }) // { inherit version; diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 1a0c9b2e10c..4a4a9343c6a 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -154,6 +154,6 @@ stdenv.mkDerivation (rec { } // optionalAttrs stdenv.hostPlatform.isMusl { # Work around a bogus warning in conjunction with musl. NIX_CFLAGS_COMPILE = "-Wno-error"; -} // stdenv.lib.optionalAttrs stdenv.hostPlatform.isAndroid { +} // lib.optionalAttrs stdenv.hostPlatform.isAndroid { NIX_CFLAGS_COMPILE = "-D__USE_FORTIFY_LEVEL=0"; }) diff --git a/pkgs/tools/misc/cpuminer-multi/default.nix b/pkgs/tools/misc/cpuminer-multi/default.nix index d99662d8ff3..a23675fe911 100644 --- a/pkgs/tools/misc/cpuminer-multi/default.nix +++ b/pkgs/tools/misc/cpuminer-multi/default.nix @@ -6,7 +6,7 @@ let date = "20160316"; in stdenv.mkDerivation { - name = "cpuminer-multi-${date}-${stdenv.lib.strings.substring 0 7 rev}"; + name = "cpuminer-multi-${date}-${lib.strings.substring 0 7 rev}"; src = fetchFromGitHub { owner = "hyc"; diff --git a/pkgs/tools/misc/cunit/default.nix b/pkgs/tools/misc/cunit/default.nix index 305084b900d..0322f3b708f 100644 --- a/pkgs/tools/misc/cunit/default.nix +++ b/pkgs/tools/misc/cunit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, autoreconfHook}: +{ lib, stdenv, fetchurl, autoconf, automake, libtool, autoreconfHook}: stdenv.mkDerivation rec { pname = "CUnit"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { homepage = "http://cunit.sourceforge.net/"; - license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.lgpl2; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/dasht/default.nix b/pkgs/tools/misc/dasht/default.nix index 7c2ff354836..4ab9cfdd0e0 100644 --- a/pkgs/tools/misc/dasht/default.nix +++ b/pkgs/tools/misc/dasht/default.nix @@ -58,8 +58,8 @@ stdenv.mkDerivation rec { meta = { description = "Search API docs offline, in terminal or browser"; homepage = "https://sunaku.github.io/dasht/man"; - license = stdenv.lib.licenses.isc; - platforms = stdenv.lib.platforms.unix; #cannot test other - maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; + license = lib.licenses.isc; + platforms = lib.platforms.unix; #cannot test other + maintainers = with lib.maintainers; [ matthiasbeyer ]; }; } diff --git a/pkgs/tools/misc/dbacl/default.nix b/pkgs/tools/misc/dbacl/default.nix index a6bc0111ad4..d8510975915 100644 --- a/pkgs/tools/misc/dbacl/default.nix +++ b/pkgs/tools/misc/dbacl/default.nix @@ -1,4 +1,4 @@ -{fetchurl, stdenv}: +{fetchurl, lib, stdenv}: stdenv.mkDerivation rec { name = "dbacl-1.14"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { homepage = "http://dbacl.sourceforge.net/"; longDescription = "a digramic Bayesian classifier for text recognition."; maintainers = []; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/ddate/default.nix b/pkgs/tools/misc/ddate/default.nix index 024572eaa7a..4de50693b74 100644 --- a/pkgs/tools/misc/ddate/default.nix +++ b/pkgs/tools/misc/ddate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "ddate"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/bo0ts/ddate"; description = "Discordian version of the date program"; license = licenses.publicDomain; diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix index c57f0570d1e..4e3733533a8 100644 --- a/pkgs/tools/misc/ddccontrol/default.nix +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -60,6 +60,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ddccontrol/ddccontrol"; license = licenses.gpl2; platforms = [ "i686-linux" "x86_64-linux" ]; - maintainers = [ stdenv.lib.maintainers.pakhfn ]; + maintainers = [ lib.maintainers.pakhfn ]; }; } diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index f0e6a8ec405..ea60887ebfa 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -2,7 +2,7 @@ , gnugrep, gnutar, gnused, gzip, makeWrapper }: # USAGE like this: debootstrap sid /tmp/target-chroot-directory # There is also cdebootstrap now. Is that easier to maintain? -let binPath = stdenv.lib.makeBinPath [ +let binPath = lib.makeBinPath [ coreutils dpkg gawk diff --git a/pkgs/tools/misc/desktop-file-utils/default.nix b/pkgs/tools/misc/desktop-file-utils/default.nix index 045e199e3ae..93e711a4a86 100644 --- a/pkgs/tools/misc/desktop-file-utils/default.nix +++ b/pkgs/tools/misc/desktop-file-utils/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, glib, libintl }: +{ lib, stdenv, fetchurl, pkgconfig, glib, libintl }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "desktop-file-utils"; diff --git a/pkgs/tools/misc/ding-libs/default.nix b/pkgs/tools/misc/ding-libs/default.nix index deb70d082d9..653f150fecf 100644 --- a/pkgs/tools/misc/ding-libs/default.nix +++ b/pkgs/tools/misc/ding-libs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, check }: +{ lib, stdenv, fetchurl, check }: stdenv.mkDerivation rec { pname = "ding-libs"; @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { meta = { description = "'D is not GLib' utility libraries"; homepage = "https://fedorahosted.org/sssd/"; - platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [ e-user ]; - license = [ stdenv.lib.licenses.gpl3 stdenv.lib.licenses.lgpl3 ]; + platforms = with lib.platforms; linux; + maintainers = with lib.maintainers; [ e-user ]; + license = [ lib.licenses.gpl3 stdenv.lib.licenses.lgpl3 ]; }; } diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index c3317ec0b30..ee068450344 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { # we have no bash at the moment for windows BASH_PATH = - stdenv.lib.optionalString (!stdenv.hostPlatform.isWindows) + lib.optionalString (!stdenv.hostPlatform.isWindows) "${bash}/bin/bash"; # replace the build phase to use the GNUMakefile instead diff --git a/pkgs/tools/misc/diskus/default.nix b/pkgs/tools/misc/diskus/default.nix index bf61a844196..ff5ade2e67a 100644 --- a/pkgs/tools/misc/diskus/default.nix +++ b/pkgs/tools/misc/diskus/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "087w58q5kd3r23a9qnhqgvq4vhv69b5a6a7n3kh09g5cjszy8s05"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; cargoSha256 = "0bivmjn7h4lfp5azbc6q0xiqq3fk68jdd4kwrwgbxiljg4xd2qy8"; diff --git a/pkgs/tools/misc/disper/default.nix b/pkgs/tools/misc/disper/default.nix index 6ba446d7bc0..5caa5eaf539 100644 --- a/pkgs/tools/misc/disper/default.nix +++ b/pkgs/tools/misc/disper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python, xorg, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, python, xorg, makeWrapper }: stdenv.mkDerivation rec { pname = "disper"; @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/disper \ - --prefix "LD_LIBRARY_PATH" : "${stdenv.lib.makeLibraryPath [ xorg.libXrandr xorg.libX11 ]}" + --prefix "LD_LIBRARY_PATH" : "${lib.makeLibraryPath [ xorg.libXrandr xorg.libX11 ]}" ''; meta = { description = "On-the-fly display switch utility"; homepage = "http://willem.engen.nl/projects/disper/"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.gpl3; + platforms = lib.platforms.unix; + license = lib.licenses.gpl3; }; } diff --git a/pkgs/tools/misc/dmg2img/default.nix b/pkgs/tools/misc/dmg2img/default.nix index b132079a28e..a3f023e2ad5 100644 --- a/pkgs/tools/misc/dmg2img/default.nix +++ b/pkgs/tools/misc/dmg2img/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, bzip2, openssl, fetchpatch }: +{ lib, stdenv, fetchurl, zlib, bzip2, openssl, fetchpatch }: stdenv.mkDerivation rec { name = "dmg2img-1.6.7"; @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { ''; meta = { - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; description = "An Apple's compressed dmg to standard (hfsplus) image disk file convert tool"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }; } diff --git a/pkgs/tools/misc/dtach/default.nix b/pkgs/tools/misc/dtach/default.nix index 9973eddc7ef..f036ba9ea3e 100644 --- a/pkgs/tools/misc/dtach/default.nix +++ b/pkgs/tools/misc/dtach/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "dtach"; @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { themselves. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; maintainers = [ ]; }; } diff --git a/pkgs/tools/misc/duc/default.nix b/pkgs/tools/misc/duc/default.nix index f24f62cb5f4..4879e186b5a 100644 --- a/pkgs/tools/misc/duc/default.nix +++ b/pkgs/tools/misc/duc/default.nix @@ -19,10 +19,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ tokyocabinet ncurses ] ++ - stdenv.lib.optionals enableCairo [ cairo pango ]; + lib.optionals enableCairo [ cairo pango ]; configureFlags = - stdenv.lib.optionals (!enableCairo) [ "--disable-x11" "--disable-cairo" ]; + lib.optionals (!enableCairo) [ "--disable-x11" "--disable-cairo" ]; meta = with lib; { homepage = "http://duc.zevv.nl/"; diff --git a/pkgs/tools/misc/dvtm/dvtm.nix b/pkgs/tools/misc/dvtm/dvtm.nix index d8bb54cb4cb..9a42655b737 100644 --- a/pkgs/tools/misc/dvtm/dvtm.nix +++ b/pkgs/tools/misc/dvtm/dvtm.nix @@ -3,9 +3,9 @@ stdenv.mkDerivation { inherit name src patches; - CFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE"; + CFLAGS = lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE"; - postPatch = stdenv.lib.optionalString (customConfig != null) '' + postPatch = lib.optionalString (customConfig != null) '' cp ${builtins.toFile "config.h" customConfig} ./config.h ''; diff --git a/pkgs/tools/misc/edid-decode/default.nix b/pkgs/tools/misc/edid-decode/default.nix index c755f73b118..99a21e28b07 100644 --- a/pkgs/tools/misc/edid-decode/default.nix +++ b/pkgs/tools/misc/edid-decode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit }: +{ lib, stdenv, fetchgit }: let version = "2018-12-06"; in stdenv.mkDerivation { @@ -19,9 +19,9 @@ in stdenv.mkDerivation { meta = { description = "EDID decoder and conformance tester"; homepage = "https://cgit.freedesktop.org/xorg/app/edid-decode/"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.chiiruno ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.chiiruno ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/misc/edid-generator/default.nix b/pkgs/tools/misc/edid-generator/default.nix index 49b6277faef..89ac21db5f5 100644 --- a/pkgs/tools/misc/edid-generator/default.nix +++ b/pkgs/tools/misc/edid-generator/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , dos2unix , edid-decode @@ -25,7 +25,7 @@ in stdenv.mkDerivation { patchShebangs modeline2edid ''; - configurePhase = (stdenv.lib.concatMapStringsSep "\n" (m: "echo \"${m}\" | ./modeline2edid -") modelines); + configurePhase = (lib.concatMapStringsSep "\n" (m: "echo \"${m}\" | ./modeline2edid -") modelines); installPhase = '' install -Dm 444 *.bin -t "$out/lib/firmware/edid" @@ -34,8 +34,8 @@ in stdenv.mkDerivation { meta = { description = "Hackerswork to generate an EDID blob from given Xorg Modelines"; homepage = "https://github.com/akatrevorjay/edid-generator"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.flokli ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.flokli ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/misc/emv/default.nix b/pkgs/tools/misc/emv/default.nix index 76ea8ceba0d..1dbb5199f75 100644 --- a/pkgs/tools/misc/emv/default.nix +++ b/pkgs/tools/misc/emv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { pname = "emv"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.i0i0.de/toolchest/emv"; description = "Editor Move: Rename files with your favourite text editor"; - license = stdenv.lib.licenses.publicDomain; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.publicDomain; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/ent/default.nix b/pkgs/tools/misc/ent/default.nix index 0fa265c2db6..05dcd36c40c 100644 --- a/pkgs/tools/misc/ent/default.nix +++ b/pkgs/tools/misc/ent/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ unzip ]; - buildFlags = stdenv.lib.optional stdenv.cc.isClang "CC=clang"; + buildFlags = lib.optional stdenv.cc.isClang "CC=clang"; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/misc/envchain/default.nix b/pkgs/tools/misc/envchain/default.nix index 54ae0155b31..938beff3353 100644 --- a/pkgs/tools/misc/envchain/default.nix +++ b/pkgs/tools/misc/envchain/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsecret readline ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libedit ncurses Security ]; + ++ lib.optionals stdenv.isDarwin [ libedit ncurses Security ]; makeFlags = [ "DESTDIR=$(out)" ]; diff --git a/pkgs/tools/misc/envdir-go/default.nix b/pkgs/tools/misc/envdir-go/default.nix index 957f5941cb6..7ec763f16c6 100644 --- a/pkgs/tools/misc/envdir-go/default.nix +++ b/pkgs/tools/misc/envdir-go/default.nix @@ -1,5 +1,5 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { version = "1.0.0"; @@ -16,12 +16,12 @@ buildGoPackage rec { preBuild = '' # TODO: is there a way to get the commit ref so we can set main.buildCommit? - buildFlagsArray+=("-ldflags" "-X main.buildDate=1970-01-01T00:00:00+0000 -X main.buildVersion=${version}") + buildFlagsArray+=("-ldflags" "-X main.buildDate=1970-01-01T00:00:00+0000 -X main.buildVersion=${version}") ''; meta = { description = "A go rewrite of envdir"; homepage = "https://github.com/d10n/envdir"; - maintainers = with stdenv.lib.maintainers; [ edude03 ]; + maintainers = with lib.maintainers; [ edude03 ]; }; } diff --git a/pkgs/tools/misc/eot-utilities/default.nix b/pkgs/tools/misc/eot-utilities/default.nix index 546ad8d3d7d..53aa696a4fd 100644 --- a/pkgs/tools/misc/eot-utilities/default.nix +++ b/pkgs/tools/misc/eot-utilities/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig }: +{lib, stdenv, fetchurl, pkgconfig }: stdenv.mkDerivation rec { pname = "eot_utilities"; @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.w3.org/Tools/eot-utils/"; description = "Create Embedded Open Type from OpenType or TrueType font"; - license = stdenv.lib.licenses.w3c; - maintainers = with stdenv.lib.maintainers; [ leenaars ]; - platforms = with stdenv.lib.platforms; unix; + license = lib.licenses.w3c; + maintainers = with lib.maintainers; [ leenaars ]; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/tools/misc/etcher/default.nix b/pkgs/tools/misc/etcher/default.nix index 8e5c5d918cc..0f68137066e 100644 --- a/pkgs/tools/misc/etcher/default.nix +++ b/pkgs/tools/misc/etcher/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { postFixup = '' makeWrapper ${electron}/bin/electron $out/bin/${pname} \ --add-flags $out/share/${pname}/resources/app.asar \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ gcc-unwrapped.lib ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gcc-unwrapped.lib ]}" ''; meta = with lib; { diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index 44c821f542d..890edc5d0ca 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -28,7 +28,7 @@ buildRustPackage rec { nativeBuildInputs = [ cmake pkgconfig perl installShellFiles ]; buildInputs = [ zlib ] - ++ stdenv.lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ] ; diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index 2c5548abd83..6e8bb7fd96c 100644 --- a/pkgs/tools/misc/expect/default.nix +++ b/pkgs/tools/misc/expect/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { wrapProgram $i \ --prefix PATH : "${tcl}/bin" \ --prefix TCLLIBPATH ' ' $out/lib/* \ - ${stdenv.lib.optionalString stdenv.isDarwin "--prefix DYLD_LIBRARY_PATH : $out/lib/expect${version}"} + ${lib.optionalString stdenv.isDarwin "--prefix DYLD_LIBRARY_PATH : $out/lib/expect${version}"} done ''; diff --git a/pkgs/tools/misc/fasd/default.nix b/pkgs/tools/misc/fasd/default.nix index 6c2cbd25744..a3cdc388cdf 100644 --- a/pkgs/tools/misc/fasd/default.nix +++ b/pkgs/tools/misc/fasd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub } : +{ lib, stdenv, fetchFromGitHub } : stdenv.mkDerivation rec { pname = "fasd"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/clvv/${pname}"; description = "Quick command-line access to files and directories for POSIX shells"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; longDescription = '' Fasd is a command-line productivity booster. @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { command line. ''; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix index f3f7afd30f6..743d930fdf8 100644 --- a/pkgs/tools/misc/ffsend/default.nix +++ b/pkgs/tools/misc/ffsend/default.nix @@ -32,7 +32,7 @@ buildRustPackage rec { if stdenv.isDarwin then (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices Security AppKit ]) else [ openssl ]; - preBuild = stdenv.lib.optionalString (x11Support && usesX11) ( + preBuild = lib.optionalString (x11Support && usesX11) ( if preferXsel && xsel != null then '' export XSEL_PATH="${xsel}/bin/xsel" '' else '' diff --git a/pkgs/tools/misc/figlet/default.nix b/pkgs/tools/misc/figlet/default.nix index 90fb0981fbd..01ff40b2b74 100644 --- a/pkgs/tools/misc/figlet/default.nix +++ b/pkgs/tools/misc/figlet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch }: +{ lib, stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation { name = "figlet-2.2.5"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { description = "Program for making large letters out of ordinary text"; homepage = "http://www.figlet.org/"; - license = stdenv.lib.licenses.afl21; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.afl21; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index 6867038c645..4a9dc7ee774 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { ./webassembly-format-fix.patch ]; - nativeBuildInputs = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file; + nativeBuildInputs = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file; buildInputs = [ zlib ] - ++ stdenv.lib.optional stdenv.hostPlatform.isWindows libgnurx; + ++ lib.optional stdenv.hostPlatform.isWindows libgnurx; doCheck = true; - makeFlags = stdenv.lib.optional stdenv.hostPlatform.isWindows "FILE_COMPILE=file"; + makeFlags = lib.optional stdenv.hostPlatform.isWindows "FILE_COMPILE=file"; meta = with lib; { homepage = "https://darwinsys.com/file"; diff --git a/pkgs/tools/misc/fileschanged/default.nix b/pkgs/tools/misc/fileschanged/default.nix index 056943e96d7..2c64c4c1edc 100644 --- a/pkgs/tools/misc/fileschanged/default.nix +++ b/pkgs/tools/misc/fileschanged/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gamin }: +{ lib, stdenv, fetchurl, gamin }: stdenv.mkDerivation rec { name = "fileschanged-0.6.9"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.nongnu.org/fileschanged/"; description = "A command-line utility that reports when files have been altered"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; longDescription = '' This utility is a client to FAM (File Alteration Monitor) servers @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { standard-output or executes a given command. ''; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index 6e07125ab72..18881ef181d 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , coreutils }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { patches = [ ./no-install-statedir.patch ] # fix gnulib tests on 32-bit ARM. Included on findutils master. # https://lists.gnu.org/r/bug-gnulib/2020-08/msg00225.html - ++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./fix-gnulib-tests-arm.patch; + ++ lib.optional stdenv.hostPlatform.isAarch32 ./fix-gnulib-tests-arm.patch; buildInputs = [ coreutils ]; # bin/updatedb script needs to call sort @@ -64,8 +64,8 @@ stdenv.mkDerivation rec { * xargs - build and execute command lines from standard input. ''; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; }; } diff --git a/pkgs/tools/misc/fondu/default.nix b/pkgs/tools/misc/fondu/default.nix index 772ae236764..092d33b2e81 100644 --- a/pkgs/tools/misc/fondu/default.nix +++ b/pkgs/tools/misc/fondu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { version = "060102"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "fortify" ]; meta = { - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.gpl3; + platforms = lib.platforms.unix; + license = lib.licenses.gpl3; }; } diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index 8da5c871652..0e1671071bd 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -76,8 +76,8 @@ stdenv.mkDerivation rec { meta = { description = "A font editor"; homepage = "http://fontforge.github.io"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.erictapen ]; + platforms = lib.platforms.all; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.erictapen ]; }; } diff --git a/pkgs/tools/misc/fpp/default.nix b/pkgs/tools/misc/fpp/default.nix index b00f2198dbc..6c2abbf6c64 100644 --- a/pkgs/tools/misc/fpp/default.nix +++ b/pkgs/tools/misc/fpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3 }: +{ lib, stdenv, fetchFromGitHub, python3 }: stdenv.mkDerivation rec { pname = "fpp"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "CLI program that accepts piped input and presents files for selection"; homepage = "https://facebook.github.io/PathPicker/"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.bsd3; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/misc/fx_cast/default.nix b/pkgs/tools/misc/fx_cast/default.nix index 581ef0aa838..4fcb5a65573 100644 --- a/pkgs/tools/misc/fx_cast/default.nix +++ b/pkgs/tools/misc/fx_cast/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { # See now-cli/default.nix dontStrip = true; preFixup = let - libPath = stdenv.lib.makeLibraryPath [stdenv.cc.cc stdenv.cc.libc]; + libPath = lib.makeLibraryPath [stdenv.cc.cc stdenv.cc.libc]; bin = "$out/bin/${pname}"; in '' diff --git a/pkgs/tools/misc/gams/default.nix b/pkgs/tools/misc/gams/default.nix index 0723735228a..f91acbf264a 100644 --- a/pkgs/tools/misc/gams/default.nix +++ b/pkgs/tools/misc/gams/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, file, licenseFile ? null, optgamsFile ? null}: +{ lib, stdenv, fetchurl, unzip, file, licenseFile ? null, optgamsFile ? null}: assert licenseFile != null; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp -a * "$out/share/gams" cp ${licenseFile} $out/share/gams/gamslice.txt - '' + stdenv.lib.optionalString (optgamsFile != null) '' + '' + lib.optionalString (optgamsFile != null) '' cp ${optgamsFile} $out/share/gams/optgams.def ln -s $out/share/gams/optgams.def $out/bin/optgams.def ''; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib;{ + meta = with lib;{ description = "General Algebraic Modeling System"; longDescription = '' The General Algebraic Modeling System is a high-level modeling system for mathematical optimization. diff --git a/pkgs/tools/misc/gawp/default.nix b/pkgs/tools/misc/gawp/default.nix index 2856dd48559..d518ba88fb6 100644 --- a/pkgs/tools/misc/gawp/default.nix +++ b/pkgs/tools/misc/gawp/default.nix @@ -1,10 +1,10 @@ -{ stdenv, buildGoPackage, fetchgit }: +{ lib, stdenv, buildGoPackage, fetchgit }: with builtins; buildGoPackage rec { pname = "gawp"; - version = "20160121-${stdenv.lib.strings.substring 0 7 rev}"; + version = "20160121-${lib.strings.substring 0 7 rev}"; rev = "5db2d8faa220e8d6eaf8677354bd197bf621ff7f"; goPackagePath = "github.com/martingallagher/gawp"; @@ -20,6 +20,6 @@ buildGoPackage rec { meta = { homepage = "https://github.com/martingallagher/gawp"; description = "A simple, configurable, file watching, job execution tool"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }; } diff --git a/pkgs/tools/misc/gbdfed/default.nix b/pkgs/tools/misc/gbdfed/default.nix index e5dc243ede1..5856a73781e 100644 --- a/pkgs/tools/misc/gbdfed/default.nix +++ b/pkgs/tools/misc/gbdfed/default.nix @@ -1,4 +1,4 @@ - { stdenv, fetchurl, pkgconfig, freetype, gtk }: + { lib, stdenv, fetchurl, pkgconfig, freetype, gtk }: stdenv.mkDerivation rec { version = "1.6"; @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { description = "Bitmap Font Editor"; longDescription = '' gbdfed lets you interactively create new bitmap font files or modify existing ones. - It allows editing multiple fonts and multiple glyphs, + It allows editing multiple fonts and multiple glyphs, it allows cut and paste operations between fonts and glyphs and editing font properties. - The editor works natively with BDF fonts. + The editor works natively with BDF fonts. ''; homepage = "http://sofia.nmsu.edu/~mleisher/Software/gbdfed/"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.linquize ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.linquize ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix index 1e1c06a3a02..d6b0c84b61f 100644 --- a/pkgs/tools/misc/geekbench/default.nix +++ b/pkgs/tools/misc/geekbench/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { for f in geekbench5 geekbench_x86_64 ; do patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) $out/bin/$f - wrapProgram $out/bin/$f --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$out/lib/" + wrapProgram $out/bin/$f --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$out/lib/" done ''; diff --git a/pkgs/tools/misc/getopt/default.nix b/pkgs/tools/misc/getopt/default.nix index f94d6eeff4e..c3b94465aea 100644 --- a/pkgs/tools/misc/getopt/default.nix +++ b/pkgs/tools/misc/getopt/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { pname = "getopt"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ]; meta = { - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; homepage = "http://frodo.looijaard.name/project/getopt"; description = "Parses command-line arguments from shell scripts"; }; diff --git a/pkgs/tools/misc/gibo/default.nix b/pkgs/tools/misc/gibo/default.nix index 1357ab5196d..70d0eb19ca8 100644 --- a/pkgs/tools/misc/gibo/default.nix +++ b/pkgs/tools/misc/gibo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, coreutils, findutils, git }: +{ lib, stdenv, fetchFromGitHub, coreutils, findutils, git }: stdenv.mkDerivation rec { pname = "gibo"; @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/simonwhitaker/gibo"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; description = "A shell script for easily accessing gitignore boilerplates"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/gnokii/default.nix b/pkgs/tools/misc/gnokii/default.nix index 25c31666191..13f2691e69f 100644 --- a/pkgs/tools/misc/gnokii/default.nix +++ b/pkgs/tools/misc/gnokii/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, perl, gettext, libusb-compat-0_1, pkgconfig, bluez +{ lib, stdenv, fetchurl, intltool, perl, gettext, libusb-compat-0_1, pkgconfig, bluez , readline, pcsclite, libical, gtk2, glib, libXpm }: stdenv.mkDerivation rec { @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { meta = { description = "Cellphone tool"; homepage = "http://www.gnokii.org"; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ lib.maintainers.raskin ]; + platforms = lib.platforms.linux; broken = true; # 2018-04-10 }; } diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index d14ef9d526a..f54a61566e9 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, ncurses, glib, libmaxminddb, fetchpatch }: +{ lib, stdenv, fetchurl, pkgconfig, ncurses, glib, libmaxminddb, fetchpatch }: stdenv.mkDerivation rec { version = "1.4"; @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { meta = { description = "Real-time web log analyzer and interactive viewer that runs in a terminal in *nix systems"; homepage = "https://goaccess.io"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ ederoyd46 ]; + license = lib.licenses.mit; + platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin; + maintainers = with lib.maintainers; [ ederoyd46 ]; }; } diff --git a/pkgs/tools/misc/gosu/default.nix b/pkgs/tools/misc/gosu/default.nix index bd53529a5d2..7bc7eab3456 100644 --- a/pkgs/tools/misc/gosu/default.nix +++ b/pkgs/tools/misc/gosu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchgit }: +{ lib, stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "gosu"; @@ -18,7 +18,7 @@ buildGoPackage rec { meta = { description= "Tool that avoids TTY and signal-forwarding behavior of sudo and su"; homepage = "https://github.com/tianon/gosu"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index b8d227df5e0..849db12cfa7 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - --prefix PATH : "${stdenv.lib.makeBinPath [ gpart hdparm util-linux procps coreutils gnused gnugrep ]}" + --prefix PATH : "${lib.makeBinPath [ gpart hdparm util-linux procps coreutils gnused gnugrep ]}" ) ''; diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix index 5a9b692b1b8..0355fe58f48 100644 --- a/pkgs/tools/misc/graylog/plugins.nix +++ b/pkgs/tools/misc/graylog/plugins.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, fetchurl, unzip, graylog }: +{ pkgs, lib, stdenv, fetchurl, unzip, graylog }: with pkgs.lib; @@ -77,7 +77,7 @@ in { meta = { homepage = "https://docs.graylog.org/en/3.3/pages/integrations.html#enterprise"; description = "Integrations are tools that help Graylog work with external systems (unfree enterprise integrations)"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; }; }; filter-messagesize = glPlugin rec { diff --git a/pkgs/tools/misc/grex/default.nix b/pkgs/tools/misc/grex/default.nix index 31306fd7aa4..fca9cecc01c 100644 --- a/pkgs/tools/misc/grex/default.nix +++ b/pkgs/tools/misc/grex/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1viph7ki6f2akc5mpbgycacndmxnv088ybfji2bfdbi5jnpyavvs"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; doInstallCheck = true; installCheckPhase = '' diff --git a/pkgs/tools/misc/gringo/default.nix b/pkgs/tools/misc/gringo/default.nix index 9df59b1c127..ae161af488d 100644 --- a/pkgs/tools/misc/gringo/default.nix +++ b/pkgs/tools/misc/gringo/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { ./gringo-4.5.4-to_string.patch ]; - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace ./SConstruct \ --replace \ "env['CXX'] = 'g++'" \ diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 207396fb089..d3761f34cda 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -7,7 +7,7 @@ , xenSupport ? false }: -with stdenv.lib; +with lib; let pcSystems = { i686-linux.target = "i386"; diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index a7233d5c4b1..6d747bf8c6e 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { # grub-install isn't smart enough. ./symlink.patch ] - ++ (stdenv.lib.optional buggyBiosCDSupport ./buggybios.patch) + ++ (lib.optional buggyBiosCDSupport ./buggybios.patch) ++ map fetchurl (import ./grub1.patches.nix) ; diff --git a/pkgs/tools/misc/grub/pvgrub_image/default.nix b/pkgs/tools/misc/grub/pvgrub_image/default.nix index ec5d0ff1295..d6aba812405 100644 --- a/pkgs/tools/misc/grub/pvgrub_image/default.nix +++ b/pkgs/tools/misc/grub/pvgrub_image/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, grub2_xen }: -with stdenv.lib; +with lib; let efiSystemsBuild = { i686-linux.target = "i386"; diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix index 7a2454cd7b5..b0a8c9e1033 100644 --- a/pkgs/tools/misc/grub/trusted.nix +++ b/pkgs/tools/misc/grub/trusted.nix @@ -3,7 +3,7 @@ , for_HP_laptop ? false }: -with stdenv.lib; +with lib; let pcSystems = { i686-linux.target = "i386"; diff --git a/pkgs/tools/misc/gsmartcontrol/default.nix b/pkgs/tools/misc/gsmartcontrol/default.nix index 2e85448bde8..b86c3cc75e3 100644 --- a/pkgs/tools/misc/gsmartcontrol/default.nix +++ b/pkgs/tools/misc/gsmartcontrol/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, smartmontools, autoreconfHook, gettext, gtkmm3, pkgconfig, wrapGAppsHook, pcre-cpp, gnome3 }: +{ fetchurl, lib, stdenv, smartmontools, autoreconfHook, gettext, gtkmm3, pkgconfig, wrapGAppsHook, pcre-cpp, gnome3 }: stdenv.mkDerivation rec { version="1.1.3"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - --prefix PATH : "${stdenv.lib.makeBinPath [ smartmontools ]}" + --prefix PATH : "${lib.makeBinPath [ smartmontools ]}" ) ''; @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { as well as run various tests on it. ''; homepage = "https://gsmartcontrol.sourceforge.io/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [qknight]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [qknight]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/misc/hdf4/default.nix b/pkgs/tools/misc/hdf4/default.nix index caf7ceb49ee..d127bc25c3c 100644 --- a/pkgs/tools/misc/hdf4/default.nix +++ b/pkgs/tools/misc/hdf4/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; @@ -52,16 +52,16 @@ stdenv.mkDerivation rec { libjpeg szip zlib - ] ++ stdenv.lib.optionals uselibtirpc [ + ] ++ lib.optionals uselibtirpc [ libtirpc ]; - preConfigure = stdenv.lib.optionalString uselibtirpc '' + preConfigure = lib.optionalString uselibtirpc '' # Make tirpc discovery work with CMAKE_PREFIX_PATH substituteInPlace config/cmake/FindXDR.cmake \ --replace 'find_path(XDR_INCLUDE_DIR NAMES rpc/types.h PATHS "/usr/include" "/usr/include/tirpc")' \ 'find_path(XDR_INCLUDE_DIR NAMES rpc/types.h PATH_SUFFIXES include/tirpc)' - '' + stdenv.lib.optionalString (szip != null) '' + '' + lib.optionalString (szip != null) '' export SZIP_INSTALL=${szip} ''; @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { "-DHDF4_ENABLE_Z_LIB_SUPPORT=ON" "-DHDF4_BUILD_FORTRAN=OFF" "-DJPEG_DIR=${libjpeg}" - ] ++ stdenv.lib.optionals (szip != null) [ + ] ++ lib.optionals (szip != null) [ "-DHDF4_ENABLE_SZIP_ENCODING=ON" "-DHDF4_ENABLE_SZIP_SUPPORT=ON" ]; @@ -84,11 +84,11 @@ stdenv.mkDerivation rec { preCheck = '' export LD_LIBRARY_PATH=$(pwd)/bin - '' + stdenv.lib.optionalString (stdenv.isDarwin) '' + '' + lib.optionalString (stdenv.isDarwin) '' export DYLD_LIBRARY_PATH=$(pwd)/bin ''; - excludedTests = stdenv.lib.optionals stdenv.isDarwin [ + excludedTests = lib.optionals stdenv.isDarwin [ "MFHDF_TEST-hdftest" "MFHDF_TEST-hdftest-shared" "HDP-dumpsds-18" @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { ]; checkPhase = let excludedTestsRegex = if (excludedTests != []) - then "(" + (stdenv.lib.concatStringsSep "|" excludedTests) + ")" + then "(" + (lib.concatStringsSep "|" excludedTests) + ")" else ""; in '' runHook preCheck ctest -E "${excludedTestsRegex}" --output-on-failure diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 891fadac12a..0a5032074c1 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , removeReferencesTo , cpp ? false @@ -13,7 +13,7 @@ # (--enable-unsupported could be used to force the build) assert !cpp || mpi == null; -let inherit (stdenv.lib) optional optionals; in +let inherit (lib) optional optionals; in stdenv.mkDerivation rec { version = "1.10.6"; @@ -67,8 +67,8 @@ stdenv.mkDerivation rec { applications to evolve in their use of HDF5. The HDF5 Technology suite includes tools and applications for managing, manipulating, viewing, and analyzing data in the HDF5 format. ''; - license = stdenv.lib.licenses.bsd3; # Lawrence Berkeley National Labs BSD 3-Clause variant + license = lib.licenses.bsd3; # Lawrence Berkeley National Labs BSD 3-Clause variant homepage = "https://www.hdfgroup.org/HDF5/"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/hdfjava/default.nix b/pkgs/tools/misc/hdfjava/default.nix index 7ee84399831..70a2f091116 100644 --- a/pkgs/tools/misc/hdfjava/default.nix +++ b/pkgs/tools/misc/hdfjava/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, javac }: +{ lib, stdenv, fetchurl, cmake, javac }: stdenv.mkDerivation rec { pname = "hdf-java"; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = { description = "A Java package that implements HDF4 and HDF5 data objects in an object-oriented form"; - license = stdenv.lib.licenses.free; # BSD-like + license = lib.licenses.free; # BSD-like homepage = "https://support.hdfgroup.org/products/java/index.html"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/hdfview/default.nix b/pkgs/tools/misc/hdfview/default.nix index 0125bfa7369..dc13bb52791 100644 --- a/pkgs/tools/misc/hdfview/default.nix +++ b/pkgs/tools/misc/hdfview/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ant, javac, hdf_java }: +{ lib, stdenv, fetchurl, ant, javac, hdf_java }: stdenv.mkDerivation rec { pname = "hdfview"; @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { meta = { description = "A visual tool for browsing and editing HDF4 and HDF5 files"; - license = stdenv.lib.licenses.free; # BSD-like + license = lib.licenses.free; # BSD-like homepage = "https://support.hdfgroup.org/products/java/index.html"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/heimdall/default.nix b/pkgs/tools/misc/heimdall/default.nix index bbc07141e1a..41b6adb7bfa 100644 --- a/pkgs/tools/misc/heimdall/default.nix +++ b/pkgs/tools/misc/heimdall/default.nix @@ -16,7 +16,7 @@ mkDerivation { buildInputs = [ zlib libusb1 - ] ++ stdenv.lib.optional enableGUI qtbase; + ] ++ lib.optional enableGUI qtbase; nativeBuildInputs = [ cmake ]; cmakeFlags = [ @@ -27,7 +27,7 @@ mkDerivation { preConfigure = '' # Give ownership of the Galaxy S USB device to the logged in user. substituteInPlace heimdall/60-heimdall.rules --replace 'MODE="0666"' 'TAG+="uaccess"' - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace libpit/CMakeLists.txt --replace "-std=gnu++11" "" ''; diff --git a/pkgs/tools/misc/hexd/default.nix b/pkgs/tools/misc/hexd/default.nix index 0c0c56c5271..467e85128b8 100644 --- a/pkgs/tools/misc/hexd/default.nix +++ b/pkgs/tools/misc/hexd/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "hexd"; diff --git a/pkgs/tools/misc/hhpc/default.nix b/pkgs/tools/misc/hhpc/default.nix index 78e45aa4cd0..a4ba369665e 100644 --- a/pkgs/tools/misc/hhpc/default.nix +++ b/pkgs/tools/misc/hhpc/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { description = "Hides the mouse pointer in X11"; maintainers = with maintainers; [ nico202 ]; platforms = platforms.unix; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }; } diff --git a/pkgs/tools/misc/hyperfine/default.nix b/pkgs/tools/misc/hyperfine/default.nix index fe39230a214..39999677b11 100644 --- a/pkgs/tools/misc/hyperfine/default.nix +++ b/pkgs/tools/misc/hyperfine/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "12qdllhydd29xh20l5gir6qpj4a1nkzp8ics344rcwj8wsj7g5zw"; nativeBuildInputs = [ installShellFiles ]; - buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.isDarwin Security; postInstall = '' installManPage doc/hyperfine.1 diff --git a/pkgs/tools/misc/i3cat/default.nix b/pkgs/tools/misc/i3cat/default.nix index bc934c424f3..d75b878ae6d 100644 --- a/pkgs/tools/misc/i3cat/default.nix +++ b/pkgs/tools/misc/i3cat/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchgit }: +{ lib, stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "i3cat"; - version = "20150321-${stdenv.lib.strings.substring 0 7 rev}"; + version = "20150321-${lib.strings.substring 0 7 rev}"; rev = "b9ba886a7c769994ccd8d4627978ef4b51fcf576"; goPackagePath = "github.com/vincent-petithory/i3cat"; diff --git a/pkgs/tools/misc/i3minator/default.nix b/pkgs/tools/misc/i3minator/default.nix index f749ea677bc..d58efd7a0d4 100644 --- a/pkgs/tools/misc/i3minator/default.nix +++ b/pkgs/tools/misc/i3minator/default.nix @@ -26,9 +26,9 @@ pythonPackages.buildPythonApplication rec { project is inspired by tmuxinator and uses i3-py. ''; homepage = "https://github.com/carlesso/i3minator"; - license = stdenv.lib.licenses.wtfpl; + license = lib.licenses.wtfpl; maintainers = with maintainers; [ domenkozar ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/idevicerestore/default.nix b/pkgs/tools/misc/idevicerestore/default.nix index 5072d2d9b98..605b7bfc3ce 100644 --- a/pkgs/tools/misc/idevicerestore/default.nix +++ b/pkgs/tools/misc/idevicerestore/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { # Not listing other dependencies specified in # https://github.com/libimobiledevice/idevicerestore/blob/8a882038b2b1e022fbd19eaf8bea51006a373c06/README#L20 # because they are inherited `libimobiledevice`. - ] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; + ] ++ lib.optionals stdenv.isDarwin [ IOKit ]; meta = with lib; { homepage = "https://github.com/libimobiledevice/idevicerestore"; diff --git a/pkgs/tools/misc/idutils/default.nix b/pkgs/tools/misc/idutils/default.nix index 9afb9279134..ac64fe9e8bc 100644 --- a/pkgs/tools/misc/idutils/default.nix +++ b/pkgs/tools/misc/idutils/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, emacs }: +{ fetchurl, lib, stdenv, emacs }: stdenv.mkDerivation rec { name = "idutils-4.6"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sed -i '/gets is a security hole/d' lib/stdio.in.h ''; - buildInputs = stdenv.lib.optional stdenv.isLinux emacs; + buildInputs = lib.optional stdenv.isLinux emacs; doCheck = !stdenv.isDarwin; @@ -46,10 +46,10 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.gnu.org/software/idutils/"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; broken = true; }; } diff --git a/pkgs/tools/misc/intermodal/default.nix b/pkgs/tools/misc/intermodal/default.nix index ca1c58d465a..2b187b65760 100644 --- a/pkgs/tools/misc/intermodal/default.nix +++ b/pkgs/tools/misc/intermodal/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0kf5afarfwcl47b40pwnslfvxmxllmb995vc5ls2lpz4cx0jwahn"; # include_hidden test tries to use `chflags` on darwin - checkFlagsArray = stdenv.lib.optionals stdenv.isDarwin [ "--skip=subcommand::torrent::create::tests::include_hidden" ]; + checkFlagsArray = lib.optionals stdenv.isDarwin [ "--skip=subcommand::torrent::create::tests::include_hidden" ]; meta = with lib; { description = "User-friendly and featureful command-line BitTorrent metainfo utility"; diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index beb6f0e708b..641e86c22c4 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; + meta = with lib; { description = "Network boot firmware"; homepage = "https://ipxe.org/"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/ised/default.nix b/pkgs/tools/misc/ised/default.nix index 3529324b30a..9032a2d2451 100644 --- a/pkgs/tools/misc/ised/default.nix +++ b/pkgs/tools/misc/ised/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "ised"; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { meta = { description = "A numeric sequence editor"; - maintainers = with stdenv.lib.maintainers; [ raskin ]; - platforms = with stdenv.lib.platforms; linux; - license = stdenv.lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ raskin ]; + platforms = with lib.platforms; linux; + license = lib.licenses.gpl3Plus; }; } diff --git a/pkgs/tools/misc/ix/default.nix b/pkgs/tools/misc/ix/default.nix index bf298090f3f..ed47e477854 100644 --- a/pkgs/tools/misc/ix/default.nix +++ b/pkgs/tools/misc/ix/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { ''; postFixup = '' - wrapProgram $out/bin/ix --prefix PATH : "${stdenv.lib.makeBinPath [ curl ]}" + wrapProgram $out/bin/ix --prefix PATH : "${lib.makeBinPath [ curl ]}" ''; meta = with lib; { diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix index c55c0879e5d..4f13d0a17af 100644 --- a/pkgs/tools/misc/jdupes/default.nix +++ b/pkgs/tools/misc/jdupes/default.nix @@ -19,10 +19,10 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" - ] ++ stdenv.lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ "ENABLE_DEDUPE=1" "STATIC_DEDUPE_H=1" - ] ++ stdenv.lib.optionals stdenv.cc.isGNU [ + ] ++ lib.optionals stdenv.cc.isGNU [ "HARDEN=1" ]; diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix index a65d408fa6b..49b3ffbb7dd 100644 --- a/pkgs/tools/misc/keychain/default.nix +++ b/pkgs/tools/misc/keychain/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, coreutils, openssh, gnupg +{ lib, stdenv, fetchFromGitHub, makeWrapper, coreutils, openssh, gnupg , perl, procps, gnugrep, gawk, findutils, gnused }: stdenv.mkDerivation rec { @@ -32,23 +32,23 @@ stdenv.mkDerivation rec { meta = { description = "Keychain management tool"; homepage = "https://www.funtoo.org/Keychain"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; # other platforms are untested (AFAIK) platforms = - with stdenv.lib; + with lib; platforms.linux ++ platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ sigma ]; + maintainers = with lib.maintainers; [ sigma ]; longDescription = '' - Keychain helps you to manage SSH and GPG keys in a convenient and secure - manner. It acts as a frontend to ssh-agent and ssh-add, but allows you - to easily have one long running ssh-agent process per system, rather - than the norm of one ssh-agent per login session. + Keychain helps you to manage SSH and GPG keys in a convenient and secure + manner. It acts as a frontend to ssh-agent and ssh-add, but allows you + to easily have one long running ssh-agent process per system, rather + than the norm of one ssh-agent per login session. - This dramatically reduces the number of times you need to enter your - passphrase. With keychain, you only need to enter a passphrase once - every time your local machine is rebooted. Keychain also makes it easy - for remote cron jobs to securely "hook in" to a long-running ssh-agent - process, allowing your scripts to take advantage of key-based logins. + This dramatically reduces the number of times you need to enter your + passphrase. With keychain, you only need to enter a passphrase once + every time your local machine is rebooted. Keychain also makes it easy + for remote cron jobs to securely "hook in" to a long-running ssh-agent + process, allowing your scripts to take advantage of key-based logins. ''; }; } diff --git a/pkgs/tools/misc/kisslicer/default.nix b/pkgs/tools/misc/kisslicer/default.nix index bd112e4b876..fb69610e4ef 100644 --- a/pkgs/tools/misc/kisslicer/default.nix +++ b/pkgs/tools/misc/kisslicer/default.nix @@ -7,7 +7,7 @@ let - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ libGLU libGL stdenv.cc.cc libX11 diff --git a/pkgs/tools/misc/kodi-cli/default.nix b/pkgs/tools/misc/kodi-cli/default.nix index 517e195040f..56795e7c93f 100644 --- a/pkgs/tools/misc/kodi-cli/default.nix +++ b/pkgs/tools/misc/kodi-cli/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "kodi-cli"; version = "1.1.1"; - + src = fetchFromGitHub { owner = "nawar"; repo = pname; @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cp -a kodi-cli $out/bin - wrapProgram $out/bin/kodi-cli --prefix PATH : ${stdenv.lib.makeBinPath [ curl bash ]} + wrapProgram $out/bin/kodi-cli --prefix PATH : ${lib.makeBinPath [ curl bash ]} cp -a playlist_to_kodi $out/bin - wrapProgram $out/bin/playlist_to_kodi --prefix PATH : ${stdenv.lib.makeBinPath [ curl bash gnome3.zenity jq youtube-dl ]} + wrapProgram $out/bin/playlist_to_kodi --prefix PATH : ${lib.makeBinPath [ curl bash gnome3.zenity jq youtube-dl ]} ''; - + meta = with lib; { homepage = "https://github.com/nawar/kodi-cli"; description = "Kodi/XBMC bash script to send Kodi commands using JSON RPC. It also allows sending YouTube videos to Kodi"; diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix index 976e87ba2d8..d33cdbacb15 100644 --- a/pkgs/tools/misc/lbdb/default.nix +++ b/pkgs/tools/misc/lbdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, perl, perlPackages, finger_bsd, makeWrapper +{ lib, stdenv, fetchurl, fetchpatch, perl, perlPackages, finger_bsd, makeWrapper , abook ? null , gnupg ? null , goobook ? null @@ -9,7 +9,7 @@ let version = "0.48.1"; in -with stdenv.lib; +with lib; with perlPackages; stdenv.mkDerivation { pname = "lbdb"; diff --git a/pkgs/tools/misc/ldapvi/default.nix b/pkgs/tools/misc/ldapvi/default.nix index 9c062cf418d..6e7fcfa62b6 100644 --- a/pkgs/tools/misc/ldapvi/default.nix +++ b/pkgs/tools/misc/ldapvi/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation { homepage = "http://www.lichteblau.com/ldapvi/"; license = licenses.gpl2; maintainers = with maintainers; [ domenkozar ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix index 5fa4b339b1e..157fc6607b0 100644 --- a/pkgs/tools/misc/less/default.nix +++ b/pkgs/tools/misc/less/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; configureFlags = [ "--sysconfdir=/etc" ] # Look for ‘sysless’ in /etc. - ++ stdenv.lib.optional lessSecure [ "--with-secure" ]; + ++ lib.optional lessSecure [ "--with-secure" ]; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/misc/lockfile-progs/default.nix b/pkgs/tools/misc/lockfile-progs/default.nix index e30b36919b7..68c2fb781f8 100644 --- a/pkgs/tools/misc/lockfile-progs/default.nix +++ b/pkgs/tools/misc/lockfile-progs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, liblockfile }: +{ lib, stdenv, fetchurl, liblockfile }: stdenv.mkDerivation rec { _name = "lockfile-progs"; @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { meta = { description = "Programs for locking and unlocking files and mailboxes"; homepage = "http://packages.debian.org/sid/lockfile-progs"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; - platforms = stdenv.lib.platforms.all; + maintainers = [ lib.maintainers.bluescreen303 ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/misc/logstash/6.x.nix b/pkgs/tools/misc/logstash/6.x.nix index 6735b5fd096..97ee5b2ed3f 100644 --- a/pkgs/tools/misc/logstash/6.x.nix +++ b/pkgs/tools/misc/logstash/6.x.nix @@ -6,7 +6,7 @@ , jre }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { version = elk6Version; diff --git a/pkgs/tools/misc/logstash/7.x.nix b/pkgs/tools/misc/logstash/7.x.nix index df661988877..0817a7ab087 100644 --- a/pkgs/tools/misc/logstash/7.x.nix +++ b/pkgs/tools/misc/logstash/7.x.nix @@ -6,7 +6,7 @@ , jre }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { version = elk7Version; diff --git a/pkgs/tools/misc/logstash/contrib.nix b/pkgs/tools/misc/logstash/contrib.nix index d4fb6532ef5..d4c88dc32ed 100644 --- a/pkgs/tools/misc/logstash/contrib.nix +++ b/pkgs/tools/misc/logstash/contrib.nix @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Community-maintained logstash plugins"; homepage = "https://github.com/elasticsearch/logstash-contrib"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; maintainers = with maintainers; [ cstrahan ]; }; } diff --git a/pkgs/tools/misc/lorri/default.nix b/pkgs/tools/misc/lorri/default.nix index d191a82853f..951cb8b5caa 100644 --- a/pkgs/tools/misc/lorri/default.nix +++ b/pkgs/tools/misc/lorri/default.nix @@ -47,7 +47,7 @@ in (rustPlatform.buildRustPackage rec { nativeBuildInputs = with pkgs; [ rustPackages.rustfmt ]; buildInputs = - stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; + lib.optionals stdenv.isDarwin [ CoreServices Security ]; # copy the docs to the $man and $doc outputs postInstall = '' diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index 2816392e18c..5f2c7a751bd 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { "--with-systemdtmpfilesdir=${placeholder "out"}/lib/tmpfiles.d" "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" "--with-pager=less" - ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin [ + ] ++ lib.optional stdenv.hostPlatform.isDarwin [ "ac_cv_func__set_invalid_parameter_handler=no" "ac_cv_func_posix_fadvise=no" "ac_cv_func_mempcpy=no" @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { done ''; - postFixup = stdenv.lib.optionalString (buildPackages.groff != groff) '' + postFixup = lib.optionalString (buildPackages.groff != groff) '' # Check to make sure none of the outputs depend on build-time-only groff: for outName in $outputs; do out=''${!outName} @@ -76,6 +76,6 @@ stdenv.mkDerivation rec { homepage = "http://man-db.nongnu.org"; description = "An implementation of the standard Unix documentation system accessed using the man command"; license = licenses.gpl2; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/mbuffer/default.nix b/pkgs/tools/misc/mbuffer/default.nix index 4007a3f7738..6fdd4a69ebc 100644 --- a/pkgs/tools/misc/mbuffer/default.nix +++ b/pkgs/tools/misc/mbuffer/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, - openssl, +{ lib, stdenv, fetchurl, + openssl, } : stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # objdump binary during cross-building for foreign platforms. # The correct objdump is exposed via the environment variable # $OBJDUMP, which should be used in such cases. - preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' substituteInPlace configure --replace "OBJDUMP=$ac_cv_path_OBJDUMP" 'OBJDUMP=''${OBJDUMP}' ''; doCheck = true; @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.maier-komor.de/mbuffer.html"; description = "A tool for buffering data streams with a large set of unique features"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ tokudan ]; - platforms = stdenv.lib.platforms.linux; # Maybe other non-darwin Unix + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ tokudan ]; + platforms = lib.platforms.linux; # Maybe other non-darwin Unix }; } diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index 8dd6bd0195b..153c0d59389 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { slang unzip zip - ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ]; + ] ++ lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ]; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/mcrypt/default.nix b/pkgs/tools/misc/mcrypt/default.nix index b2237ce0483..8349e0fd4d7 100644 --- a/pkgs/tools/misc/mcrypt/default.nix +++ b/pkgs/tools/misc/mcrypt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libmcrypt, libmhash }: +{ lib, stdenv, fetchurl, libmcrypt, libmhash }: stdenv.mkDerivation rec { version = "2.6.8"; @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { ever-wider range of algorithms and modes. ''; homepage = "http://mcrypt.sourceforge.net"; - license = stdenv.lib.licenses.gpl3Only; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.qknight ]; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.qknight ]; }; } diff --git a/pkgs/tools/misc/megacli/default.nix b/pkgs/tools/misc/megacli/default.nix index e202cc7ae46..7cf1e14dc18 100644 --- a/pkgs/tools/misc/megacli/default.nix +++ b/pkgs/tools/misc/megacli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rpmextract, ncurses5, patchelf, fetchurl, unzip }: +{ lib, stdenv, rpmextract, ncurses5, patchelf, fetchurl, unzip }: stdenv.mkDerivation rec { pname = "megacli"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [rpmextract ncurses5 unzip]; libPath = - stdenv.lib.makeLibraryPath + lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc ncurses5 ]; buildCommand = '' @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "CLI program for LSI MegaRAID cards, which also works with some Dell PERC RAID cards"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/tools/misc/memtest86+/default.nix b/pkgs/tools/misc/memtest86+/default.nix index 57cf5bb97e2..0db6f9f7287 100644 --- a/pkgs/tools/misc/memtest86+/default.nix +++ b/pkgs/tools/misc/memtest86+/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit }: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation { pname = "memtest86+"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.memtest.org/"; description = "A tool to detect memory errors"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/tools/misc/minicom/default.nix b/pkgs/tools/misc/minicom/default.nix index b52d2d26baa..15df26d5cc6 100644 --- a/pkgs/tools/misc/minicom/default.nix +++ b/pkgs/tools/misc/minicom/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "0j95727xni4r122dalp09963gvc1nqa18l1d4wzz8746kw5s2rrb"; }; - buildInputs = [ ncurses ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; + buildInputs = [ ncurses ] ++ lib.optional stdenv.isDarwin libiconv; nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation { postInstall = '' for f in $out/bin/*minicom ; do wrapProgram $f \ - --prefix PATH : ${stdenv.lib.makeBinPath [ lrzsz ]}:$out/bin + --prefix PATH : ${lib.makeBinPath [ lrzsz ]}:$out/bin done ''; diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix index aa549f5691a..7fb66e22e98 100644 --- a/pkgs/tools/misc/miniserve/default.nix +++ b/pkgs/tools/misc/miniserve/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0s1gdngpf6gxz2lyapblxxmc6aydg2i9kmrfvngkbmqh4as1a2vl"; nativeBuildInputs = [ pkg-config zlib ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; meta = with lib; { description = "For when you really just want to serve some files over HTTP right now!"; diff --git a/pkgs/tools/misc/mktorrent/default.nix b/pkgs/tools/misc/mktorrent/default.nix index 485c3403cff..194a0c62721 100644 --- a/pkgs/tools/misc/mktorrent/default.nix +++ b/pkgs/tools/misc/mktorrent/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, openssl}: +{lib, stdenv, fetchFromGitHub, openssl}: stdenv.mkDerivation rec { pname = "mktorrent"; @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { }; makeFlags = [ "USE_PTHREADS=1" "USE_OPENSSL=1" "USE_LONG_OPTIONS=1" ] - ++ stdenv.lib.optional stdenv.isi686 "USE_LARGE_FILES=1" - ++ stdenv.lib.optional stdenv.isLinux "CFLAGS=-lgcc_s"; + ++ lib.optional stdenv.isi686 "USE_LARGE_FILES=1" + ++ lib.optional stdenv.isLinux "CFLAGS=-lgcc_s"; installFlags = [ "PREFIX=${placeholder "out"}" ]; @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://mktorrent.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; description = "Command line utility to create BitTorrent metainfo files"; - maintainers = with stdenv.lib.maintainers; [Profpatsch]; + maintainers = with lib.maintainers; [Profpatsch]; }; } diff --git a/pkgs/tools/misc/mlocate/default.nix b/pkgs/tools/misc/mlocate/default.nix index d28828f2a4f..12d9f5622cc 100644 --- a/pkgs/tools/misc/mlocate/default.nix +++ b/pkgs/tools/misc/mlocate/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, config }: let - dbfile = stdenv.lib.attrByPath [ "locate" "dbfile" ] "/var/cache/locatedb" config; + dbfile = lib.attrByPath [ "locate" "dbfile" ] "/var/cache/locatedb" config; in stdenv.mkDerivation rec { pname = "mlocate"; version = "0.26"; diff --git a/pkgs/tools/misc/mmv/default.nix b/pkgs/tools/misc/mmv/default.nix index 48c3b393262..ed45c268203 100644 --- a/pkgs/tools/misc/mmv/default.nix +++ b/pkgs/tools/misc/mmv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "mmv"; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://linux.maruhn.com/sec/mmv.html"; description = "Utility for wildcard renaming, copying, etc"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix index 3774a77f5a4..26056364b77 100644 --- a/pkgs/tools/misc/mongodb-compass/default.nix +++ b/pkgs/tools/misc/mongodb-compass/default.nix @@ -5,7 +5,7 @@ let version = "1.23.0"; - rpath = stdenv.lib.makeLibraryPath [ + rpath = lib.makeLibraryPath [ alsaLib at-spi2-atk at-spi2-core diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix index c3e9a0dc2ff..d497505d9b7 100644 --- a/pkgs/tools/misc/mongodb-tools/default.nix +++ b/pkgs/tools/misc/mongodb-tools/default.nix @@ -44,7 +44,7 @@ in buildGoPackage { # move vendored codes so nixpkgs go builder could find it runHook preBuild - ${stdenv.lib.concatMapStrings (t: '' + ${lib.concatMapStrings (t: '' go build -o "$out/bin/${t}" -tags ssl -ldflags "-s -w" $goPackagePath/${t}/main '') tools} diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix index 92402797d11..5d39cb00b95 100644 --- a/pkgs/tools/misc/moreutils/default.nix +++ b/pkgs/tools/misc/moreutils/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchgit, libxml2, libxslt, docbook-xsl, docbook_xml_dtd_44, perlPackages, makeWrapper, darwin }: +{ lib, stdenv, fetchgit, libxml2, libxslt, docbook-xsl, docbook_xml_dtd_44, perlPackages, makeWrapper, darwin }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "moreutils"; version = "0.63"; diff --git a/pkgs/tools/misc/mrtg/default.nix b/pkgs/tools/misc/mrtg/default.nix index 047cd87308f..e8ebde4ad4d 100644 --- a/pkgs/tools/misc/mrtg/default.nix +++ b/pkgs/tools/misc/mrtg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, gd, rrdtool }: +{ lib, stdenv, fetchurl, perl, gd, rrdtool }: stdenv.mkDerivation rec { @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { meta = { description = "The Multi Router Traffic Grapher"; homepage = "https://oss.oetiker.ch/mrtg/"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.robberer ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.robberer ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/multitail/default.nix b/pkgs/tools/misc/multitail/default.nix index eef53769f06..3304d3c1912 100644 --- a/pkgs/tools/misc/multitail/default.nix +++ b/pkgs/tools/misc/multitail/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, pkg-config }: +{ lib, stdenv, fetchurl, ncurses, pkg-config }: stdenv.mkDerivation rec { version = "6.5.0"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; - makeFlags = stdenv.lib.optionals stdenv.isDarwin [ "-f" "makefile.macosx" ]; + makeFlags = lib.optionals stdenv.isDarwin [ "-f" "makefile.macosx" ]; installPhase = '' mkdir -p $out/bin @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.vanheusden.com/multitail/"; description = "tail on Steroids"; - maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ matthiasbeyer ]; + platforms = lib.platforms.unix; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/misc/multitime/default.nix b/pkgs/tools/misc/multitime/default.nix index a46ee2b7c9c..015f50fa57f 100644 --- a/pkgs/tools/misc/multitime/default.nix +++ b/pkgs/tools/misc/multitime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "multitime"; @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { performance. ''; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; homepage = "https://tratt.net/laurie/src/multitime/"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/mysql2pgsql/default.nix b/pkgs/tools/misc/mysql2pgsql/default.nix index e3f05e1a761..f0556b69f23 100644 --- a/pkgs/tools/misc/mysql2pgsql/default.nix +++ b/pkgs/tools/misc/mysql2pgsql/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl }: +{ lib, stdenv, fetchurl, perl }: # The homepage says this script is mature.. stdenv.mkDerivation { @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "Convert MySQL dump files to PostgreSQL-loadable files"; homepage = "https://pgfoundry.org/projects/mysql2pgsql/"; - license = stdenv.lib.licenses.bsdOriginal; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.bsdOriginal; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/nbench/default.nix b/pkgs/tools/misc/nbench/default.nix index adca412daf8..dc9dcb1e5be 100644 --- a/pkgs/tools/misc/nbench/default.nix +++ b/pkgs/tools/misc/nbench/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { homepage = "https://www.math.utah.edu/~mayer/linux/bmark.html"; description = "A synthetic computing benchmark program"; platforms = platforms.linux; - maintainers = with stdenv.lib.maintainers; [ bennofs ]; + maintainers = with lib.maintainers; [ bennofs ]; }; } diff --git a/pkgs/tools/misc/ocz-ssd-guru/default.nix b/pkgs/tools/misc/ocz-ssd-guru/default.nix index 00926663a6c..c5ac32af3be 100644 --- a/pkgs/tools/misc/ocz-ssd-guru/default.nix +++ b/pkgs/tools/misc/ocz-ssd-guru/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, xorg, freetype, fontconfig, libGLU, libGL, glibc, makeWrapper }: +{ fetchurl, lib, stdenv, xorg, freetype, fontconfig, libGLU, libGL, glibc, makeWrapper }: let system = if stdenv.hostPlatform.system == "x86_64-linux" then "linux64" else "linux32"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ xorg.libX11 xorg.libxcb freetype @@ -45,9 +45,9 @@ stdenv.mkDerivation rec { meta = { homepage = "http://ocz.com/ssd-guru"; description = "SSD Management Tool for OCZ disks"; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ jagajaga ]; + license = lib.licenses.unfree; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ jagajaga ]; }; } diff --git a/pkgs/tools/misc/opencorsairlink/default.nix b/pkgs/tools/misc/opencorsairlink/default.nix index 62772021bac..345df9cfbf4 100644 --- a/pkgs/tools/misc/opencorsairlink/default.nix +++ b/pkgs/tools/misc/opencorsairlink/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/audiohacked/OpenCorsairLink"; license = licenses.gpl2; platforms = platforms.all; - maintainers = [ stdenv.lib.maintainers.expipiplus1 ]; + maintainers = [ lib.maintainers.expipiplus1 ]; }; } diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix index bbfecd58686..d1fd243467d 100644 --- a/pkgs/tools/misc/opentsdb/default.nix +++ b/pkgs/tools/misc/opentsdb/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "Time series database with millisecond precision"; homepage = "http://opentsdb.net"; license = licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/tools/misc/os-prober/default.nix b/pkgs/tools/misc/os-prober/default.nix index 4914572f156..f991b1bc26d 100644 --- a/pkgs/tools/misc/os-prober/default.nix +++ b/pkgs/tools/misc/os-prober/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { done; for file in $out/bin/*; do wrapProgram $file \ - --suffix PATH : ${stdenv.lib.makeBinPath [ grub2 udev coreutils cryptsetup libuuid ntfs3g lvm2 dmraid ]} \ + --suffix PATH : ${lib.makeBinPath [ grub2 udev coreutils cryptsetup libuuid ntfs3g lvm2 dmraid ]} \ --run "[ -d /var/lib/os-prober ] || mkdir /var/lib/os-prober" done; ''; diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix index 184ebc19bf2..b3f4971a55a 100644 --- a/pkgs/tools/misc/osm2pgsql/default.nix +++ b/pkgs/tools/misc/osm2pgsql/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ expat proj bzip2 zlib boost postgresql libosmium protozero ] - ++ stdenv.lib.optional withLuaJIT luajit - ++ stdenv.lib.optional (!withLuaJIT) lua; + ++ lib.optional withLuaJIT luajit + ++ lib.optional (!withLuaJIT) lua; cmakeFlags = [ "-DEXTERNAL_LIBOSMIUM=ON" "-DEXTERNAL_PROTOZERO=ON" ] - ++ stdenv.lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON"; + ++ lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON"; NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"; diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index c1716fef5db..dc013cfe197 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -119,7 +119,7 @@ in stdenv.mkDerivation rec { ''; postFixup = let - typelibPath = stdenv.lib.makeSearchPath "/lib/girepository-1.0" [ + typelibPath = lib.makeSearchPath "/lib/girepository-1.0" [ (placeholder "out") gobject-introspection ]; diff --git a/pkgs/tools/misc/otfcc/default.nix b/pkgs/tools/misc/otfcc/default.nix index c4a9c5a278e..a363b875895 100644 --- a/pkgs/tools/misc/otfcc/default.nix +++ b/pkgs/tools/misc/otfcc/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ./move-makefiles.patch ]; - buildFlags = stdenv.lib.optional stdenv.isAarch64 [ "config=release_arm" ]; + buildFlags = lib.optional stdenv.isAarch64 [ "config=release_arm" ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/misc/pal/default.nix b/pkgs/tools/misc/pal/default.nix index c285dc2463b..6be42f576a4 100644 --- a/pkgs/tools/misc/pal/default.nix +++ b/pkgs/tools/misc/pal/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, glib, gettext, readline, pkgconfig }: +{lib, stdenv, fetchurl, glib, gettext, readline, pkgconfig }: stdenv.mkDerivation rec { name = "pal-0.4.3"; @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://palcal.sourceforge.net/"; description = "Command-line calendar program that can keep track of events"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 9cc4926443b..720b73f3fe2 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/parallel \ - --prefix PATH : "${stdenv.lib.makeBinPath [ procps perl ]}" + --prefix PATH : "${lib.makeBinPath [ procps perl ]}" ''; doCheck = true; diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index 2b21b2f1427..7c7a611b97c 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , lvm2 @@ -29,16 +29,16 @@ stdenv.mkDerivation rec { ''; buildInputs = [ libuuid ] - ++ stdenv.lib.optional (readline != null) readline - ++ stdenv.lib.optional (gettext != null) gettext - ++ stdenv.lib.optional (lvm2 != null) lvm2; + ++ lib.optional (readline != null) readline + ++ lib.optional (gettext != null) gettext + ++ lib.optional (lvm2 != null) lvm2; configureFlags = (if (readline != null) then [ "--with-readline" ] else [ "--without-readline" ]) - ++ stdenv.lib.optional (lvm2 == null) "--disable-device-mapper" - ++ stdenv.lib.optional enableStatic "--enable-static"; + ++ lib.optional (lvm2 == null) "--disable-device-mapper" + ++ lib.optional enableStatic "--enable-static"; # Tests were previously failing due to Hydra running builds as uid 0. # That should hopefully be fixed now. @@ -59,13 +59,13 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.gnu.org/software/parted/"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; maintainers = [ # Add your name here! ]; # GNU Parted requires libuuid, which is part of util-linux-ng. - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/pazi/default.nix b/pkgs/tools/misc/pazi/default.nix index 0375b8e1484..81590e1dd45 100644 --- a/pkgs/tools/misc/pazi/default.nix +++ b/pkgs/tools/misc/pazi/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0z8x70mwg0mvz6iap92gil37d4kpg5dizlyfx3zk7984ynycgap8"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; cargoSha256 = "0sja0q9i0b1zb3a0a6z561yg9lqykylwr3iwin4r6cmi7j2sw5j6"; diff --git a/pkgs/tools/misc/pb_cli/default.nix b/pkgs/tools/misc/pb_cli/default.nix index 9d33f088af0..eacbc0d6bd2 100644 --- a/pkgs/tools/misc/pb_cli/default.nix +++ b/pkgs/tools/misc/pb_cli/default.nix @@ -18,16 +18,16 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; - liveDeps = [ jq curl ] ++ stdenv.lib.optional screenshots maim - ++ stdenv.lib.optional video capture - ++ stdenv.lib.optional clipboard xclip; + liveDeps = [ jq curl ] ++ lib.optional screenshots maim + ++ lib.optional video capture + ++ lib.optional clipboard xclip; installPhase = '' install -Dm755 src/pb.sh $out/bin/pb patchShebangs $out/bin/pb wrapProgram $out/bin/pb \ - --prefix PATH : '${stdenv.lib.makeBinPath liveDeps}' + --prefix PATH : '${lib.makeBinPath liveDeps}' ''; meta = with lib; { diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/pkgs/tools/misc/phoronix-test-suite/default.nix index 8cb8d67c733..b3e78b350c4 100644 --- a/pkgs/tools/misc/phoronix-test-suite/default.nix +++ b/pkgs/tools/misc/phoronix-test-suite/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ./install-sh $out wrapProgram $out/bin/phoronix-test-suite \ --set PHP_BIN ${php}/bin/php \ - --prefix PATH : ${stdenv.lib.makeBinPath [ gnumake gcc ]} + --prefix PATH : ${lib.makeBinPath [ gnumake gcc ]} ''; passthru.tests = { diff --git a/pkgs/tools/misc/picocom/default.nix b/pkgs/tools/misc/picocom/default.nix index 47126bac304..e9ec3c38994 100644 --- a/pkgs/tools/misc/picocom/default.nix +++ b/pkgs/tools/misc/picocom/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = stdenv.lib.optional stdenv.isDarwin IOKit; + buildInputs = lib.optional stdenv.isDarwin IOKit; installPhase = '' install -Dm555 -t $out/bin picocom diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix index fe16406256f..96027677fa8 100644 --- a/pkgs/tools/misc/pipelight/default.nix +++ b/pkgs/tools/misc/pipelight/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, cabextract, curl, gnupg, libX11, libGLU, libGL, wine-staging }: +{ lib, stdenv, fetchurl, bash, cabextract, curl, gnupg, libX11, libGLU, libGL, wine-staging }: let wine_custom = wine-staging; @@ -53,9 +53,9 @@ in stdenv.mkDerivation rec { meta = { homepage = "http://pipelight.net/"; - license = with stdenv.lib.licenses; [ mpl11 gpl2 lgpl21 ]; + license = with lib.licenses; [ mpl11 gpl2 lgpl21 ]; description = "A wrapper for using Windows plugins in Linux browsers"; - maintainers = with stdenv.lib.maintainers; [ skeidel ]; + maintainers = with lib.maintainers; [ skeidel ]; platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/tools/misc/pixd/default.nix b/pkgs/tools/misc/pixd/default.nix index a2dc84ed6a9..8152849d9b5 100644 --- a/pkgs/tools/misc/pixd/default.nix +++ b/pkgs/tools/misc/pixd/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "pixd"; diff --git a/pkgs/tools/misc/pk2cmd/default.nix b/pkgs/tools/misc/pk2cmd/default.nix index 8c7e5b8bcf2..7ffbd8ded1c 100644 --- a/pkgs/tools/misc/pk2cmd/default.nix +++ b/pkgs/tools/misc/pk2cmd/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libusb-compat-0_1, makeWrapper}: +{lib, stdenv, fetchurl, libusb-compat-0_1, makeWrapper}: stdenv.mkDerivation { name = "pk2cmd-1.20"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { homepage = "https://www.microchip.com/pickit2"; - license = stdenv.lib.licenses.unfree; #MicroChip-PK2 + license = lib.licenses.unfree; #MicroChip-PK2 description = "Microchip PIC programming software for the PICKit2 programmer"; }; } diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix index 662710388d3..d9c208510fc 100644 --- a/pkgs/tools/misc/plowshare/default.nix +++ b/pkgs/tools/misc/plowshare/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, curl, recode, spidermonkey_38 }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, curl, recode, spidermonkey_38 }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { make PREFIX="$out" install for fn in plow{del,down,list,mod,probe,up}; do - wrapProgram "$out/bin/$fn" --prefix PATH : "${stdenv.lib.makeBinPath [ curl recode spidermonkey_38 ]}" + wrapProgram "$out/bin/$fn" --prefix PATH : "${lib.makeBinPath [ curl recode spidermonkey_38 ]}" done ''; @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { description = '' A command-line download/upload tool for popular file sharing websites ''; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ aforemny jfrankenau ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ aforemny jfrankenau ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/ponysay/default.nix b/pkgs/tools/misc/ponysay/default.nix index 3fc3efa0eda..b94ca6cfea3 100644 --- a/pkgs/tools/misc/ponysay/default.nix +++ b/pkgs/tools/misc/ponysay/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3, texinfo, makeWrapper }: +{ lib, stdenv, fetchurl, python3, texinfo, makeWrapper }: stdenv.mkDerivation { name = "ponysay-3.0.3"; @@ -27,8 +27,8 @@ stdenv.mkDerivation { meta = { description = "Cowsay reimplemention for ponies"; homepage = "https://github.com/erkin/ponysay"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ bodil ]; - platforms = with stdenv.lib.platforms; unix; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ bodil ]; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/tools/misc/profile-cleaner/default.nix b/pkgs/tools/misc/profile-cleaner/default.nix index b8a747d4222..c8a2b338817 100644 --- a/pkgs/tools/misc/profile-cleaner/default.nix +++ b/pkgs/tools/misc/profile-cleaner/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, parallel, sqlite, bc, file }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, parallel, sqlite, bc, file }: stdenv.mkDerivation rec { version = "2.41"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installPhase = '' PREFIX=\"\" DESTDIR=$out make install wrapProgram $out/bin/profile-cleaner \ - --prefix PATH : "${stdenv.lib.makeBinPath [ parallel sqlite bc file ]}" + --prefix PATH : "${lib.makeBinPath [ parallel sqlite bc file ]}" ''; meta = { @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { some email clients and newsreaders too. ''; homepage = "https://github.com/graysky2/profile-cleaner"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.devhell ]; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.devhell ]; }; } diff --git a/pkgs/tools/misc/proxytunnel/default.nix b/pkgs/tools/misc/proxytunnel/default.nix index 74c04905994..7743793143a 100644 --- a/pkgs/tools/misc/proxytunnel/default.nix +++ b/pkgs/tools/misc/proxytunnel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl }: +{ lib, stdenv, fetchurl, openssl }: stdenv.mkDerivation { name = "proxytunnel-1.9.0"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = "Program that connects stdin and stdout to a server somewhere on the network, through a standard HTTPS proxy"; homepage = "http://proxytunnel.sourceforge.net/download.php"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/pv/default.nix b/pkgs/tools/misc/pv/default.nix index dd64366679c..013ddb8e3da 100644 --- a/pkgs/tools/misc/pv/default.nix +++ b/pkgs/tools/misc/pv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl } : +{ lib, stdenv, fetchurl } : stdenv.mkDerivation rec { name = "pv-1.6.6"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.ivarch.com/programs/pv"; description = "Tool for monitoring the progress of data through a pipeline"; - license = stdenv.lib.licenses.artistic2; - maintainers = with stdenv.lib.maintainers; [ ]; - platforms = with stdenv.lib.platforms; all; + license = lib.licenses.artistic2; + maintainers = with lib.maintainers; [ ]; + platforms = with lib.platforms; all; }; } diff --git a/pkgs/tools/misc/qjoypad/default.nix b/pkgs/tools/misc/qjoypad/default.nix index 2b8a2fb02be..185f0ca2816 100644 --- a/pkgs/tools/misc/qjoypad/default.nix +++ b/pkgs/tools/misc/qjoypad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libX11, libXtst, qt4 }: +{ lib, stdenv, fetchurl, pkgconfig, libX11, libXtst, qt4 }: stdenv.mkDerivation rec { name = "qjoypad-4.1.0"; src = fetchurl { @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { experience just a little bit nicer. ''; homepage = "http://qjoypad.sourceforge.net"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ astsmtl ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/misc/recoverjpeg/default.nix b/pkgs/tools/misc/recoverjpeg/default.nix index c71bd42c94c..4b8ea50cd4e 100644 --- a/pkgs/tools/misc/recoverjpeg/default.nix +++ b/pkgs/tools/misc/recoverjpeg/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram $out/bin/sort-pictures \ - --prefix PATH : ${stdenv.lib.makeBinPath [ exif imagemagick ]} + --prefix PATH : ${lib.makeBinPath [ exif imagemagick ]} ''; meta = with lib; { diff --git a/pkgs/tools/misc/recutils/default.nix b/pkgs/tools/misc/recutils/default.nix index 416fa23f453..5453ab75a4a 100644 --- a/pkgs/tools/misc/recutils/default.nix +++ b/pkgs/tools/misc/recutils/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, emacs, curl, check, bc }: +{ fetchurl, lib, stdenv, emacs, curl, check, bc }: stdenv.mkDerivation rec { name = "recutils-1.8"; @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/recutils/"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; maintainers = [ ]; }; } diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index 5c7fa9d4c24..ef684aebe3c 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, tk, tcllib, makeWrapper +{lib, stdenv, fetchurl, tk, tcllib, makeWrapper , tkremind ? true } : @@ -7,9 +7,9 @@ assert tkremind -> tcllib != null; assert tkremind -> makeWrapper != null; let - inherit (stdenv.lib) optional optionalString; - tclLibraries = stdenv.lib.optionals tkremind [ tcllib tk ]; - tclLibPaths = stdenv.lib.concatStringsSep " " + inherit (lib) optional optionalString; + tclLibraries = lib.optionals tkremind [ tcllib tk ]; + tclLibPaths = lib.concatStringsSep " " (map (p: "${p}/lib/${p.libPrefix}") tclLibraries); tkremindPatch = optionalString tkremind '' substituteInPlace scripts/tkremind --replace "exec wish" "exec ${tk}/bin/wish" @@ -42,8 +42,8 @@ in stdenv.mkDerivation rec { meta = { homepage = "https://dianne.skoll.ca/projects/remind/"; description = "Sophisticated calendar and alarm program for the console"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [raskin kovirobi]; - platforms = with stdenv.lib.platforms; unix; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [raskin kovirobi]; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/tools/misc/renameutils/default.nix b/pkgs/tools/misc/renameutils/default.nix index 73146f09792..e730b583d7c 100644 --- a/pkgs/tools/misc/renameutils/default.nix +++ b/pkgs/tools/misc/renameutils/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, readline}: +{lib, stdenv, fetchurl, readline}: stdenv.mkDerivation { name = "renameutils-0.12.0"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { homepage = "https://www.nongnu.org/renameutils/"; description = "A set of programs to make renaming of files faster"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/misc/rig/default.nix b/pkgs/tools/misc/rig/default.nix index 7e1d9307a16..9fa28264eed 100644 --- a/pkgs/tools/misc/rig/default.nix +++ b/pkgs/tools/misc/rig/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl } : +{ lib, stdenv, fetchurl } : stdenv.mkDerivation rec { version = "1.11"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { patches = [ ./rig_1.11-1.diff ]; meta = { - homepage = "http://rig.sourceforge.net/"; + homepage = "http://rig.sourceforge.net/"; description = "Random identity generator"; longDescription = '' RIG (Random Identity Generator) is a free replacement for a shareware @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { if the Web site/BBS/person you are giving the information to tries to cross-check the city, state, zip, or area code, it will check out. ''; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ tomberek ]; - platforms = with stdenv.lib.platforms; all; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ tomberek ]; + platforms = with lib.platforms; all; }; } diff --git a/pkgs/tools/misc/rlwrap/default.nix b/pkgs/tools/misc/rlwrap/default.nix index c19b0f1f9ac..ac1431d3a1b 100644 --- a/pkgs/tools/misc/rlwrap/default.nix +++ b/pkgs/tools/misc/rlwrap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, readline }: +{ lib, stdenv, fetchurl, readline }: stdenv.mkDerivation rec { pname = "rlwrap"; @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { meta = { description = "Readline wrapper for console programs"; homepage = "https://github.com/hanslub42/rlwrap"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index 36da8d0a463..0d0095645af 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , cairo , fetchFromGitHub , gettext @@ -18,7 +18,7 @@ , wrapGAppsHook , withGui ? false }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "rmlint"; version = "2.10.1"; @@ -30,14 +30,14 @@ stdenv.mkDerivation rec { sha256 = "15xfkcw1bkfyf3z8kl23k3rlv702m0h7ghqxvhniynvlwbgh6j2x"; }; - CFLAGS="-I${stdenv.lib.getDev util-linux}/include"; + CFLAGS="-I${lib.getDev util-linux}/include"; nativeBuildInputs = [ pkgconfig sphinx gettext scons - ] ++ stdenv.lib.optionals withGui [ + ] ++ lib.optionals withGui [ makeWrapper wrapGAppsHook ]; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { json-glib libelf util-linux - ] ++ stdenv.lib.optionals withGui [ + ] ++ lib.optionals withGui [ cairo gobject-introspection gtksourceview3 @@ -59,10 +59,10 @@ stdenv.mkDerivation rec { # this doesn't seem to support configureFlags, and appends $out afterwards, # so add the --without-gui in front of it - prefixKey = stdenv.lib.optionalString (!withGui) " --without-gui " + "--prefix="; + prefixKey = lib.optionalString (!withGui) " --without-gui " + "--prefix="; # in GUI mode, this shells out to itself, and tries to import python modules - postInstall = stdenv.lib.optionalString withGui '' + postInstall = lib.optionalString withGui '' gappsWrapperArgs+=(--prefix PATH : "$out/bin") gappsWrapperArgs+=(--prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${python3.pkgs.pygobject3}):$(toPythonPath ${python3.pkgs.pycairo})") ''; diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/tools/misc/rockbox-utility/default.nix index 1a13a1d2ed9..3e1e504e107 100644 --- a/pkgs/tools/misc/rockbox-utility/default.nix +++ b/pkgs/tools/misc/rockbox-utility/default.nix @@ -3,7 +3,7 @@ , qmake, withEspeak ? false, espeak ? null , qt5 }: -let inherit (stdenv.lib) getDev; in +let inherit (lib) getDev; in stdenv.mkDerivation rec { pname = "rockbox-utility"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ cryptopp libusb1 qtbase qttools ] - ++ stdenv.lib.optional withEspeak espeak; + ++ lib.optional withEspeak espeak; nativeBuildInputs = [ makeWrapper pkgconfig qmake qt5.wrapQtAppsHook ]; postPatch = '' @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { install -Dm755 RockboxUtility $out/bin/rockboxutility ln -s $out/bin/rockboxutility $out/bin/RockboxUtility wrapProgram $out/bin/rockboxutility \ - ${stdenv.lib.optionalString withEspeak '' + ${lib.optionalString withEspeak '' --prefix PATH : ${espeak}/bin ''} diff --git a/pkgs/tools/misc/routino/default.nix b/pkgs/tools/misc/routino/default.nix index d75e51d4ed8..5f737dc6beb 100644 --- a/pkgs/tools/misc/routino/default.nix +++ b/pkgs/tools/misc/routino/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; patchFlags = [ "-p0" ]; - patches = stdenv.lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.isDarwin [ (fetchpatch { url = "https://raw.githubusercontent.com/macports/macports-ports/18fd229516a46e7272003acbe555735b2a902db7/gis/routino/files/patch-Makefile_conf.diff"; sha256 = "1b7hpa4sizansnwwxq1c031nxwdwh71pg08jl9z9apiab8pjsn53"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" ]; - CLANG = stdenv.lib.optionalString stdenv.cc.isClang "1"; + CLANG = lib.optionalString stdenv.cc.isClang "1"; makeFlags = [ "prefix=$(out)" ]; diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix index 88db9409316..90d1e02b0df 100644 --- a/pkgs/tools/misc/rrdtool/default.nix +++ b/pkgs/tools/misc/rrdtool/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gettext perl libxml2 pango cairo groff ] - ++ stdenv.lib.optionals stdenv.isDarwin [ tcl-8_5 darwin.apple_sdk.frameworks.ApplicationServices ]; + ++ lib.optionals stdenv.isDarwin [ tcl-8_5 darwin.apple_sdk.frameworks.ApplicationServices ]; postInstall = '' # for munin and rrdtool support diff --git a/pkgs/tools/misc/sam-ba/default.nix b/pkgs/tools/misc/sam-ba/default.nix index 5d27af2050f..60853d2cf7e 100644 --- a/pkgs/tools/misc/sam-ba/default.nix +++ b/pkgs/tools/misc/sam-ba/default.nix @@ -4,7 +4,7 @@ let maybe64 = if stdenv.isx86_64 then "_64" else ""; - libPath = stdenv.lib.makeLibraryPath + libPath = lib.makeLibraryPath [ stdenv.cc.cc.lib libX11 libXScrnSaver libXext libXft libXrender freetype zlib fontconfig ]; diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index aef209022ff..0443deae077 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -16,21 +16,21 @@ stdenv.mkDerivation rec { "--enable-colors256" ]; - patches = stdenv.lib.optional stdenv.hostPlatform.isMusl + patches = lib.optional stdenv.hostPlatform.isMusl (fetchpatch { url = "https://gist.githubusercontent.com/yujinakayama/4608863/raw/76b9f89af5e5a2e97d9a0f36aac989fb56cf1447/gistfile1.diff"; sha256 = "0f9bf83p8zdxaa1pr75jyf5g8xr3r8kv7cyzzbpraa1q4j15ss1p"; stripLen = 1; }); - postPatch = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) + postPatch = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) # XXX: Awful hack to allow cross-compilation. '' sed -i ./configure \ -e 's/^as_fn_error .. \("cannot run test program while cross compiling\)/$as_echo \1/g' ''; # " - buildInputs = [ ncurses ] ++ stdenv.lib.optional stdenv.isLinux pam - ++ stdenv.lib.optional stdenv.isDarwin utmp; + buildInputs = [ ncurses ] ++ lib.optional stdenv.isLinux pam + ++ lib.optional stdenv.isDarwin utmp; doCheck = true; diff --git a/pkgs/tools/misc/sdate/default.nix b/pkgs/tools/misc/sdate/default.nix index 06b5360086c..69c9d726713 100644 --- a/pkgs/tools/misc/sdate/default.nix +++ b/pkgs/tools/misc/sdate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook }: +{ lib, stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { pname = "sdate"; version = "0.7"; @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.df7cb.de/projects/sdate"; description = "Eternal september version of the date program"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ edef ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ edef ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/misc/shadowenv/default.nix b/pkgs/tools/misc/shadowenv/default.nix index b3ab2002ca6..88f4840e2f0 100644 --- a/pkgs/tools/misc/shadowenv/default.nix +++ b/pkgs/tools/misc/shadowenv/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; postInstall = '' installManPage man/man1/shadowenv.1 diff --git a/pkgs/tools/misc/shallot/default.nix b/pkgs/tools/misc/shallot/default.nix index 84e241b7a2c..c3c88a6baf0 100644 --- a/pkgs/tools/misc/shallot/default.nix +++ b/pkgs/tools/misc/shallot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub, fetchpatch , openssl }: @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { meta = { description = "Allows you to create customized .onion addresses for your hidden service"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; homepage = "https://github.com/katmagic/Shallot"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/sixpair/default.nix b/pkgs/tools/misc/sixpair/default.nix index f738ed71ec7..52c61d917b1 100644 --- a/pkgs/tools/misc/sixpair/default.nix +++ b/pkgs/tools/misc/sixpair/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libusb-compat-0_1 }: +{ lib, stdenv, fetchurl, libusb-compat-0_1 }: stdenv.mkDerivation { name = "sixpair-2007-04-18"; @@ -31,8 +31,8 @@ stdenv.mkDerivation { This command-line utility searches USB buses for SIXAXIS controllers and tells them to connect to a new Bluetooth master. ''; homepage = "http://www.pabr.org/sixlinux/"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.tomsmeets ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.tomsmeets ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/slop/default.nix b/pkgs/tools/misc/slop/default.nix index 32d55a3733c..158c62e60e9 100644 --- a/pkgs/tools/misc/slop/default.nix +++ b/pkgs/tools/misc/slop/default.nix @@ -16,15 +16,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ glew glm libGLU libGL libX11 libXext libXrender icu ] - ++ stdenv.lib.optional doCheck cppcheck; + ++ lib.optional doCheck cppcheck; doCheck = false; meta = with lib; { inherit (src.meta) homepage; description = "Queries a selection from the user and prints to stdout"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + license = lib.licenses.gpl3Plus; maintainers = with maintainers; [ primeos mbakke ]; }; } diff --git a/pkgs/tools/misc/slsnif/default.nix b/pkgs/tools/misc/slsnif/default.nix index 8078ee51eb2..7f6f9fa40c2 100644 --- a/pkgs/tools/misc/slsnif/default.nix +++ b/pkgs/tools/misc/slsnif/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "slsnif-0.4.4"; @@ -8,10 +8,10 @@ stdenv.mkDerivation { sha256 = "0gn8c5hj8m3sywpwdgn6w5xl4rzsvg0z7d2w8dxi6p152j5b0pii"; }; - meta = { + meta = { description = "Serial line sniffer"; homepage = "http://slsnif.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/slurp/default.nix b/pkgs/tools/misc/slurp/default.nix index 190f637936d..ed4bb0037fb 100644 --- a/pkgs/tools/misc/slurp/default.nix +++ b/pkgs/tools/misc/slurp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - ] ++ stdenv.lib.optional buildDocs scdoc; + ] ++ lib.optional buildDocs scdoc; buildInputs = [ cairo @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { wayland-protocols ]; - mesonFlags = stdenv.lib.optional buildDocs "-Dman-pages=enabled"; + mesonFlags = lib.optional buildDocs "-Dman-pages=enabled"; meta = with lib; { description = "Select a region in a Wayland compositor"; diff --git a/pkgs/tools/misc/somafm-cli/default.nix b/pkgs/tools/misc/somafm-cli/default.nix index b0aebd6224e..abead39d348 100644 --- a/pkgs/tools/misc/somafm-cli/default.nix +++ b/pkgs/tools/misc/somafm-cli/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { installPhase = '' install -m0755 -D src/somafm $out/bin/somafm - wrapProgram $out/bin/somafm --prefix PATH ":" "${stdenv.lib.makeBinPath [ curl jq mpv ]}"; + wrapProgram $out/bin/somafm --prefix PATH ":" "${lib.makeBinPath [ curl jq mpv ]}"; ''; meta = with lib; { diff --git a/pkgs/tools/misc/spigot/default.nix b/pkgs/tools/misc/spigot/default.nix index 8321d03a48f..a088705036d 100644 --- a/pkgs/tools/misc/spigot/default.nix +++ b/pkgs/tools/misc/spigot/default.nix @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A command-line exact real calculator"; homepage = "https://www.chiark.greenend.org.uk/~sgtatham/spigot/"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.mit; + platforms = lib.platforms.all; maintainers = with maintainers; [ mcbeth ]; }; } diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 50d99db5322..0089a551f0f 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -19,10 +19,10 @@ rustPlatform.buildRustPackage rec { sha256 = "1p37cfkcpqv74gp7g099alkqxanfc002kaq1cim6zkinx50gxjxw"; }; - nativeBuildInputs = [ installShellFiles ] ++ stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; + nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config ]; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = lib.optionals stdenv.isLinux [ openssl ] + ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; postInstall = '' for shell in bash fish zsh; do diff --git a/pkgs/tools/misc/stow/default.nix b/pkgs/tools/misc/stow/default.nix index 80741f0543c..05a8fab58d1 100644 --- a/pkgs/tools/misc/stow/default.nix +++ b/pkgs/tools/misc/stow/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, perlPackages }: +{ lib, stdenv, fetchurl, perl, perlPackages }: let pname = "stow"; @@ -29,8 +29,8 @@ stdenv.mkDerivation { as .../share, .../man, and so on. ''; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; homepage = "https://www.gnu.org/software/stow/"; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/misc/sutils/default.nix b/pkgs/tools/misc/sutils/default.nix index c94b8f646a9..78172c5ef75 100644 --- a/pkgs/tools/misc/sutils/default.nix +++ b/pkgs/tools/misc/sutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, alsaLib }: +{ lib, stdenv, fetchFromGitHub, alsaLib }: stdenv.mkDerivation rec { version = "0.2"; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = { description = "Small command-line utilities"; homepage = "https://github.com/baskerville/sutils"; - maintainers = [ stdenv.lib.maintainers.meisternu ]; + maintainers = [ lib.maintainers.meisternu ]; license = "Custom"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index ae8679c03ad..423135d53fd 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { homepage = "https://github.com/spaam/svtplay-dl"; description = "Command-line tool to download videos from svtplay.se and other sites"; license = licenses.mit; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; maintainers = [ maintainers.rycee ]; }; } diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index 8a0c881a277..08496bc1185 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, udev, intltool, pkgconfig, glib, xmlto, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, fetchpatch, udev, intltool, pkgconfig, glib, xmlto, wrapGAppsHook , docbook_xml_dtd_412, docbook_xsl , libxml2, desktop-file-utils, libusb1, cups, gdk-pixbuf, pango, atk, libnotify , gobject-introspection, libsecret, packagekit @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/openprinting/system-config-printer"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/tools/misc/tab-rs/default.nix b/pkgs/tools/misc/tab-rs/default.nix index b3d2e1a77a7..24447dc74c3 100644 --- a/pkgs/tools/misc/tab-rs/default.nix +++ b/pkgs/tools/misc/tab-rs/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1clpl9fi07lms0din8f9m4y6br5jg8k5xsklsqmvgdwf83wyn321"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; + buildInputs = lib.optionals stdenv.isDarwin [ IOKit ]; # many tests are failing doCheck = false; diff --git a/pkgs/tools/misc/tensorman/default.nix b/pkgs/tools/misc/tensorman/default.nix index 835409be657..a9afcfd4091 100644 --- a/pkgs/tools/misc/tensorman/default.nix +++ b/pkgs/tools/misc/tensorman/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Utility for easy management of Tensorflow containers"; homepage = "https://github.com/pop-os/tensorman/"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ thefenriswolf ]; }; diff --git a/pkgs/tools/misc/tewisay/default.nix b/pkgs/tools/misc/tewisay/default.nix index b63ffb1cd10..0e07f3e53f3 100644 --- a/pkgs/tools/misc/tewisay/default.nix +++ b/pkgs/tools/misc/tewisay/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub, makeWrapper }: buildGoPackage rec { pname = "tewisay-unstable"; @@ -29,7 +29,7 @@ buildGoPackage rec { meta = { homepage = "https://github.com/lucy/tewisay"; description = "Cowsay replacement with unicode and partial ansi escape support"; - license = stdenv.lib.licenses.cc0; - maintainers = [ stdenv.lib.maintainers.chiiruno ]; + license = lib.licenses.cc0; + maintainers = [ lib.maintainers.chiiruno ]; }; } diff --git a/pkgs/tools/misc/time/default.nix b/pkgs/tools/misc/time/default.nix index 89af4f693d3..8707309937b 100644 --- a/pkgs/tools/misc/time/default.nix +++ b/pkgs/tools/misc/time/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { pname = "time"; @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { `time' reports unavailable information as zero values. ''; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; homepage = "https://www.gnu.org/software/time/"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/tmux-cssh/default.nix b/pkgs/tools/misc/tmux-cssh/default.nix index c38769f448f..f3f53627956 100644 --- a/pkgs/tools/misc/tmux-cssh/default.nix +++ b/pkgs/tools/misc/tmux-cssh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, tmux }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, tmux }: stdenv.mkDerivation { name = "tmux-cssh-20151015"; @@ -33,9 +33,9 @@ stdenv.mkDerivation { like most server do. ''; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ zimbatm ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ zimbatm ]; }; } diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index 7fa33ed82f2..32d27da67d4 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook , pkgconfig @@ -72,9 +72,9 @@ stdenv.mkDerivation rec { * A clean, easily extended, BSD-licensed codebase, under active development. ''; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ thammers fpletz ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ thammers fpletz ]; }; } diff --git a/pkgs/tools/misc/ttf2pt1/default.nix b/pkgs/tools/misc/ttf2pt1/default.nix index b7888f0884b..fcab21eb92b 100644 --- a/pkgs/tools/misc/ttf2pt1/default.nix +++ b/pkgs/tools/misc/ttf2pt1/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, freetype }: +{ lib, stdenv, fetchurl, perl, freetype }: stdenv.mkDerivation { name = "ttf2pt1-3.4.4"; @@ -20,13 +20,13 @@ stdenv.mkDerivation { buildInputs = [ freetype ]; nativeBuildInputs = [ perl ]; - + patches = ./gentoo-makefile.patch; # also contains the freetype patch - meta = { + meta = { description = "True Type to Postscript Type 3 converter, fpdf"; homepage = "http://ttf2pt1.sourceforge.net/index.html"; license = "ttf2pt1"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/ttmkfdir/default.nix b/pkgs/tools/misc/ttmkfdir/default.nix index d75011ea6f4..bc1279a7dec 100644 --- a/pkgs/tools/misc/ttmkfdir/default.nix +++ b/pkgs/tools/misc/ttmkfdir/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, freetype, fontconfig, libunwind, libtool, flex, bison }: +{ lib, stdenv, fetchurl, freetype, fontconfig, libunwind, libtool, flex, bison }: stdenv.mkDerivation { name = "ttf-mkfontdir-3.0.9-6"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { url = "http://mirror.fsf.org/trisquel/pool/main/t/ttmkfdir/ttmkfdir_3.0.9.orig.tar.gz"; sha256 = "0n6bmmndmp4c1myisvv7cby559gzgvwsw4rfw065a3f92m87jxiq"; }; - + # all the patches up from ttmkfdir-3.0.9/Makefile should be reviewed by someone # who knows more about C/C++ .. patches = @@ -15,7 +15,7 @@ stdenv.mkDerivation { url = "http://mirror.fsf.org/trisquel/pool/main/t/ttmkfdir/ttmkfdir_3.0.9-6.diff.gz"; sha256 = "141kxaf2by8nf87hqyszaxi0n7nnmswr1nh2i5r5bsvxxmaj9633"; }) - + ./cstring.patch # also fixes some other compilation issues (freetype includes) ]; @@ -27,6 +27,6 @@ stdenv.mkDerivation { meta = { description = "Create fonts.dir for TTF font directory"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/ttwatch/default.nix b/pkgs/tools/misc/ttwatch/default.nix index acebd4f92e8..dd7b1fae862 100644 --- a/pkgs/tools/misc/ttwatch/default.nix +++ b/pkgs/tools/misc/ttwatch/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake perl pkgconfig ]; buildInputs = [ openssl curl libusb1 protobufc ]; - cmakeFlags = stdenv.lib.optional enableUnsafe [ "-Dunsafe=on" ]; + cmakeFlags = lib.optional enableUnsafe [ "-Dunsafe=on" ]; preFixup = '' chmod +x $out/bin/ttbin2mysports diff --git a/pkgs/tools/misc/ttygif/default.nix b/pkgs/tools/misc/ttygif/default.nix index 045448f0302..226109ab20c 100644 --- a/pkgs/tools/misc/ttygif/default.nix +++ b/pkgs/tools/misc/ttygif/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; postInstall = '' wrapProgram $out/bin/ttygif \ - --prefix PATH : ${stdenv.lib.makeBinPath [ imagemagick xorg.xwd ]} + --prefix PATH : ${lib.makeBinPath [ imagemagick xorg.xwd ]} ''; meta = with lib; { diff --git a/pkgs/tools/misc/txr/default.nix b/pkgs/tools/misc/txr/default.nix index 9c200f1030e..d5a37e2e67f 100644 --- a/pkgs/tools/misc/txr/default.nix +++ b/pkgs/tools/misc/txr/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { description = "Programming language for convenient data munging"; license = licenses.bsd2; homepage = "http://nongnu.org/txr"; - maintainers = with stdenv.lib.maintainers; [ dtzWill ]; + maintainers = with lib.maintainers; [ dtzWill ]; platforms = platforms.linux; # Darwin fails although it should work AFAIK }; } diff --git a/pkgs/tools/misc/txt2man/default.nix b/pkgs/tools/misc/txt2man/default.nix index ded409754bc..27ff219a6e1 100644 --- a/pkgs/tools/misc/txt2man/default.nix +++ b/pkgs/tools/misc/txt2man/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, coreutils, gawk }: +{ lib, stdenv, fetchurl, coreutils, gawk }: stdenv.mkDerivation rec { pname = "txt2man"; @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { meta = { description = "Convert flat ASCII text to man page format"; homepage = "http://mvertes.free.fr/"; - license = stdenv.lib.licenses.gpl2; - platforms = with stdenv.lib.platforms; linux ++ darwin; - maintainers = with stdenv.lib.maintainers; [ bjornfor ]; + license = lib.licenses.gpl2; + platforms = with lib.platforms; linux ++ darwin; + maintainers = with lib.maintainers; [ bjornfor ]; }; } diff --git a/pkgs/tools/misc/unclutter-xfixes/default.nix b/pkgs/tools/misc/unclutter-xfixes/default.nix index 612ace92f5b..95c2cbb7625 100644 --- a/pkgs/tools/misc/unclutter-xfixes/default.nix +++ b/pkgs/tools/misc/unclutter-xfixes/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Rewrite of unclutter using the X11 Xfixes extension"; platforms = platforms.unix; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; inherit version; maintainers = [ maintainers.globin ]; }; diff --git a/pkgs/tools/misc/unclutter/default.nix b/pkgs/tools/misc/unclutter/default.nix index a7470fae689..1b760298191 100644 --- a/pkgs/tools/misc/unclutter/default.nix +++ b/pkgs/tools/misc/unclutter/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation { ''; maintainers = with maintainers; [ domenkozar ]; platforms = platforms.unix; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }; } diff --git a/pkgs/tools/misc/upower-notify/default.nix b/pkgs/tools/misc/upower-notify/default.nix index 2258f31fd31..ddc0fa42c69 100644 --- a/pkgs/tools/misc/upower-notify/default.nix +++ b/pkgs/tools/misc/upower-notify/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchgit }: +{ lib, stdenv, buildGoPackage, fetchgit }: # To use upower-notify, the maintainer suggests adding something like this to your configuration.nix: # @@ -8,7 +8,7 @@ # ''; buildGoPackage rec { pname = "upower-notify"; - version = "20160310-${stdenv.lib.strings.substring 0 7 rev}"; + version = "20160310-${lib.strings.substring 0 7 rev}"; rev = "14c581e683a7e90ec9fa6d409413c16599a5323c"; goPackagePath = "github.com/omeid/upower-notify"; diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix index f058f2cb8dd..ab1abec7b69 100644 --- a/pkgs/tools/misc/urjtag/default.nix +++ b/pkgs/tools/misc/urjtag/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoconf, automake, pkgconfig, gettext, libtool, bison +{ lib, stdenv, autoconf, automake, pkgconfig, gettext, libtool, bison , flex, which, subversion, fetchurl, makeWrapper, libftdi1, libusb-compat-0_1, readline , python3 , svfSupport ? true @@ -21,18 +21,18 @@ stdenv.mkDerivation rec { subversion makeWrapper readline libftdi1 libusb-compat-0_1 python3 ]; configureFlags = [ - (stdenv.lib.enableFeature svfSupport "svf") - (stdenv.lib.enableFeature bsdlSupport "bsdl") - (stdenv.lib.enableFeature staplSupport "stapl") - (stdenv.lib.enableFeature jedecSupport "jedec-exp") + (lib.enableFeature svfSupport "svf") + (lib.enableFeature bsdlSupport "bsdl") + (lib.enableFeature staplSupport "stapl") + (lib.enableFeature jedecSupport "jedec-exp") ]; meta = { description = "Enhanced, modern tool for communicating over JTAG with flash chips, CPUs,and many more"; homepage = "http://urjtag.org/"; - license = with stdenv.lib.licenses; [ gpl2Plus lgpl21Plus ]; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice - maintainers = with stdenv.lib.maintainers; [ lowfatcomputing ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus ]; + platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice + maintainers = with lib.maintainers; [ lowfatcomputing ]; }; } diff --git a/pkgs/tools/misc/urn-timer/default.nix b/pkgs/tools/misc/urn-timer/default.nix index a6871526f18..83dad9ebe7f 100644 --- a/pkgs/tools/misc/urn-timer/default.nix +++ b/pkgs/tools/misc/urn-timer/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , unstableGitUpdater @@ -57,7 +57,7 @@ stdenv.mkDerivation { url = "https://github.com/3snowp7im/urn.git"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/3snowp7im/urn"; description = "Split tracker / timer for speedrunning with GTK+ frontend"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/misc/uucp/default.nix b/pkgs/tools/misc/uucp/default.nix index 1516e9dba33..42084fa6296 100644 --- a/pkgs/tools/misc/uucp/default.nix +++ b/pkgs/tools/misc/uucp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "uucp-1.07"; @@ -29,9 +29,9 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/uucp/uucp.html"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; maintainers = [ ]; }; } diff --git a/pkgs/tools/misc/uudeview/default.nix b/pkgs/tools/misc/uudeview/default.nix index a8495d7767c..47bc916ceb5 100644 --- a/pkgs/tools/misc/uudeview/default.nix +++ b/pkgs/tools/misc/uudeview/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, tcl, tk }: +{ lib, stdenv, fetchurl, tcl, tk }: stdenv.mkDerivation rec { name = "uudeview-0.5.20"; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = { description = "The Nice and Friendly Decoder"; homepage = "http://www.fpx.de/fp/Software/UUDeview/"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ woffs ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ woffs ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 1d0b5d84f77..f207eda0de8 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "Y/vDYXWQ65zZ86vTwP4aCZYCMZuqbz6tpfv4uRkFAzc="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl protobuf rdkafka ] - ++ stdenv.lib.optional stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; + ++ lib.optional stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; # needed for internal protobuf c wrapper library PROTOC="${protobuf}/bin/protoc"; diff --git a/pkgs/tools/misc/venus/default.nix b/pkgs/tools/misc/venus/default.nix index 944b6e4ef64..28c4508525e 100644 --- a/pkgs/tools/misc/venus/default.nix +++ b/pkgs/tools/misc/venus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python, pythonPackages, libxslt, libxml2, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, python, pythonPackages, libxslt, libxml2, makeWrapper }: stdenv.mkDerivation rec { pname = "venus"; @@ -46,8 +46,8 @@ stdenv.mkDerivation rec { single combined feed, latest news first. ''; homepage = "http://intertwingly.net/code/venus/docs/index.html"; - license = stdenv.lib.licenses.psfl; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.psfl; + platforms = lib.platforms.all; maintainers = []; }; } diff --git a/pkgs/tools/misc/vmtouch/default.nix b/pkgs/tools/misc/vmtouch/default.nix index 0f46d8141f1..276389205f0 100644 --- a/pkgs/tools/misc/vmtouch/default.nix +++ b/pkgs/tools/misc/vmtouch/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, perl}: +{lib, stdenv, fetchFromGitHub, perl}: stdenv.mkDerivation rec { pname = "vmtouch"; @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { description = "Portable file system cache diagnostics and control"; longDescription = "vmtouch is a tool for learning about and controlling the file system cache of unix and unix-like systems."; homepage = "https://hoytech.com/vmtouch/"; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.garrison ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.garrison ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix index 8a68bef264c..5f80dad854e 100644 --- a/pkgs/tools/misc/watchexec/default.nix +++ b/pkgs/tools/misc/watchexec/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; postInstall = '' installManPage doc/watchexec.1 diff --git a/pkgs/tools/misc/websocat/default.nix b/pkgs/tools/misc/websocat/default.nix index 0d4bfacfa27..1a3afb0d65f 100644 --- a/pkgs/tools/misc/websocat/default.nix +++ b/pkgs/tools/misc/websocat/default.nix @@ -15,14 +15,14 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1hsms8rlnds8npr8m0dm21h04ci5ljda09pqb598v7ny3j2dldiq"; nativeBuildInputs = [ pkgconfig makeWrapper ]; - buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; + buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; # The wrapping is required so that the "sh-c" option of websocat works even # if sh is not in the PATH (as can happen, for instance, when websocat is # started as a systemd service). postInstall = '' wrapProgram $out/bin/websocat \ - --prefix PATH : ${stdenv.lib.makeBinPath [ bash ]} + --prefix PATH : ${lib.makeBinPath [ bash ]} ''; meta = with lib; { diff --git a/pkgs/tools/misc/wob/default.nix b/pkgs/tools/misc/wob/default.nix index 8ddc7960cbb..cbc09b0ce64 100644 --- a/pkgs/tools/misc/wob/default.nix +++ b/pkgs/tools/misc/wob/default.nix @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config scdoc wayland ]; buildInputs = [ wayland-protocols ] - ++ stdenv.lib.optional stdenv.isLinux libseccomp; + ++ lib.optional stdenv.isLinux libseccomp; - mesonFlags = stdenv.lib.optional stdenv.isLinux "-Dseccomp=enabled"; + mesonFlags = lib.optional stdenv.isLinux "-Dseccomp=enabled"; meta = with lib; { description = "A lightweight overlay bar for Wayland"; diff --git a/pkgs/tools/misc/woeusb/default.nix b/pkgs/tools/misc/woeusb/default.nix index 63c2d017868..8cbd1ad0697 100644 --- a/pkgs/tools/misc/woeusb/default.nix +++ b/pkgs/tools/misc/woeusb/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { # should be patched with a less useless default PATH, but for now # we add everything we need manually. wrapProgram "$out/bin/woeusb" \ - --set PATH '${stdenv.lib.makeBinPath [ coreutils dosfstools findutils gawk gnugrep grub2_light ncurses ntfs3g parted util-linux wget p7zip ]}' + --set PATH '${lib.makeBinPath [ coreutils dosfstools findutils gawk gnugrep grub2_light ncurses ntfs3g parted util-linux wget p7zip ]}' ''; doInstallCheck = true; diff --git a/pkgs/tools/misc/woof/default.nix b/pkgs/tools/misc/woof/default.nix index 5c48a3cb275..3f13cd496c5 100644 --- a/pkgs/tools/misc/woof/default.nix +++ b/pkgs/tools/misc/woof/default.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.home.unix-ag.org/simon/woof.html"; description = "Web Offer One File - Command-line utility to easily exchange files over a local network"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; maintainers = with maintainers; [ matthiasbeyer ]; }; } diff --git a/pkgs/tools/misc/wv/default.nix b/pkgs/tools/misc/wv/default.nix index 78affe34b58..36ad53e00d0 100644 --- a/pkgs/tools/misc/wv/default.nix +++ b/pkgs/tools/misc/wv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, imagemagick, libpng, glib, pkgconfig, libgsf +{ lib, stdenv, fetchurl, zlib, imagemagick, libpng, glib, pkgconfig, libgsf , libxml2, bzip2 }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Converter from Microsoft Word formats to human-editable ones"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.gpl2; + platforms = lib.platforms.unix; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/tools/misc/wv2/default.nix b/pkgs/tools/misc/wv2/default.nix index 8ed0455a33e..c0f85b4b8de 100644 --- a/pkgs/tools/misc/wv2/default.nix +++ b/pkgs/tools/misc/wv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, cmake, libgsf, glib, libxml2 }: +{ lib, stdenv, fetchurl, pkg-config, cmake, libgsf, glib, libxml2 }: stdenv.mkDerivation rec { name = "wv2-0.4.2"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Excellent MS Word filter lib, used in most Office suites"; - license = stdenv.lib.licenses.lgpl2; + license = lib.licenses.lgpl2; homepage = "http://wvware.sourceforge.net"; }; } diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix index 12acbcfbe1c..bf91e966239 100644 --- a/pkgs/tools/misc/xburst-tools/default.nix +++ b/pkgs/tools/misc/xburst-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, libusb-compat-0_1, libusb1, autoconf, automake, libconfuse, pkgconfig +{ lib, stdenv, fetchgit, libusb-compat-0_1, libusb1, autoconf, automake, libconfuse, pkgconfig , gccCross ? null }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { sh autogen.sh ''; - configureFlags = stdenv.lib.optionals (gccCross != null) [ + configureFlags = lib.optionals (gccCross != null) [ "--enable-firmware" "CROSS_COMPILE=${gccCross.targetPrefix}" ]; @@ -31,13 +31,13 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoconf automake pkgconfig ]; buildInputs = [ libusb-compat-0_1 libusb1 libconfuse ] ++ - stdenv.lib.optional (gccCross != null) gccCross; + lib.optional (gccCross != null) gccCross; meta = { description = "Qi tools to access the Ben Nanonote USB_BOOT mode"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; homepage = "http://www.linux-mtd.infradead.org/"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = stdenv.lib.platforms.x86_64; + maintainers = with lib.maintainers; [viric]; + platforms = lib.platforms.x86_64; }; } diff --git a/pkgs/tools/misc/xclip/default.nix b/pkgs/tools/misc/xclip/default.nix index c1a015d3c09..6c5857f1c9a 100644 --- a/pkgs/tools/misc/xclip/default.nix +++ b/pkgs/tools/misc/xclip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libXmu }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libXmu }: stdenv.mkDerivation rec { pname = "xclip"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Tool to access the X clipboard from a console application"; homepage = "https://github.com/astrand/xclip"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl2; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/misc/xflux/default.nix b/pkgs/tools/misc/xflux/default.nix index adc3b87ffa7..92c00d7e44d 100644 --- a/pkgs/tools/misc/xflux/default.nix +++ b/pkgs/tools/misc/xflux/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libXxf86vm, libXext, libX11, libXrandr, gcc}: +{lib, stdenv, fetchurl, libXxf86vm, libXext, libX11, libXrandr, gcc}: stdenv.mkDerivation { name = "xflux-2013-09-01"; src = fetchurl { @@ -6,7 +6,7 @@ stdenv.mkDerivation { sha256 = "cc50158fabaeee58c331f006cc1c08fd2940a126e99d37b76c8e878ef20c2021"; }; - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ gcc.cc libXxf86vm libXext @@ -32,8 +32,8 @@ stdenv.mkDerivation { when the sun rises. ''; homepage = "https://justgetflux.com/"; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.paholg ]; + license = lib.licenses.unfree; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.paholg ]; }; } diff --git a/pkgs/tools/misc/xflux/gui.nix b/pkgs/tools/misc/xflux/gui.nix index 03a458e818d..378337f6232 100644 --- a/pkgs/tools/misc/xflux/gui.nix +++ b/pkgs/tools/misc/xflux/gui.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildPythonApplication, python3Packages, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, buildPythonApplication, python3Packages, wrapGAppsHook , xflux, librsvg, gtk3, gobject-introspection, pango, gdk-pixbuf, atk , pexpect, pyGtkGlade, pygobject3, pyxdg, libappindicator-gtk3 }: @@ -42,8 +42,8 @@ buildPythonApplication rec { meta = { description = "Better lighting for Linux. Open source GUI for xflux"; homepage = "https://justgetflux.com/linux.html"; - license = stdenv.lib.licenses.unfree; # marked as unfree since the source code contains a copy of the unfree xflux binary - maintainers = [ stdenv.lib.maintainers.sheenobu ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.unfree; # marked as unfree since the source code contains a copy of the unfree xflux binary + maintainers = [ lib.maintainers.sheenobu ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/xprite-editor/default.nix b/pkgs/tools/misc/xprite-editor/default.nix index 553863dda1a..b130de94975 100644 --- a/pkgs/tools/misc/xprite-editor/default.nix +++ b/pkgs/tools/misc/xprite-editor/default.nix @@ -24,10 +24,10 @@ rustPlatform.buildRustPackage rec { ''; }; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ gtk3 ] - ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit ]; + buildInputs = lib.optionals stdenv.isLinux [ gtk3 ] + ++ lib.optionals stdenv.isDarwin [ AppKit ]; - nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config python3 ]; + nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config python3 ]; cargoSha256 = "1a0zy8gfc1gdk8nnv5qr4yspqy1jsip5nql3w74rl6h46cplpf5y"; diff --git a/pkgs/tools/misc/xtitle/default.nix b/pkgs/tools/misc/xtitle/default.nix index 2c24e627b63..5199977e587 100644 --- a/pkgs/tools/misc/xtitle/default.nix +++ b/pkgs/tools/misc/xtitle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxcb, xcbutil, xcbutilwm, git }: +{ lib, stdenv, fetchurl, libxcb, xcbutil, xcbutilwm, git }: stdenv.mkDerivation { name = "xtitle-0.4.4"; @@ -16,8 +16,8 @@ stdenv.mkDerivation { meta = { description = "Outputs X window titles"; homepage = "https://github.com/baskerville/xtitle"; - maintainers = [ stdenv.lib.maintainers.meisternu ]; + maintainers = [ lib.maintainers.meisternu ]; license = "Custom"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix index 8717d901239..a0392bf4754 100644 --- a/pkgs/tools/misc/xvfb-run/default.nix +++ b/pkgs/tools/misc/xvfb-run/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { patchShebangs $out/bin/xvfb-run wrapProgram $out/bin/xvfb-run \ --set FONTCONFIG_FILE "${fontsConf}" \ - --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which util-linux gawk coreutils ]} + --prefix PATH : ${lib.makeBinPath [ getopt xorgserver xauth which util-linux gawk coreutils ]} ''; meta = with lib; { diff --git a/pkgs/tools/misc/yubikey-manager-qt/default.nix b/pkgs/tools/misc/yubikey-manager-qt/default.nix index 5b5fb66be30..fd6610a1973 100644 --- a/pkgs/tools/misc/yubikey-manager-qt/default.nix +++ b/pkgs/tools/misc/yubikey-manager-qt/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { buildPythonPath "$pythonPath" wrapQtApp $out/bin/ykman-gui \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.getLib pcsclite}/lib:${yubikey-personalization}/lib" \ + --prefix LD_LIBRARY_PATH : "${lib.getLib pcsclite}/lib:${yubikey-personalization}/lib" \ --prefix PYTHONPATH : "$program_PYTHONPATH" mkdir -p $out/share/applications diff --git a/pkgs/tools/misc/zsh-autoenv/default.nix b/pkgs/tools/misc/zsh-autoenv/default.nix index 72aa2d77bc3..61589345d70 100644 --- a/pkgs/tools/misc/zsh-autoenv/default.nix +++ b/pkgs/tools/misc/zsh-autoenv/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation { variables (overwriting and restoring). ''; homepage = "https://github.com/Tarrasch/zsh-autoenv"; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } |