git.iko.soy/typeable/nixpkgs
on master help sign in
pkgs/development: stdenv.lib -> lib
commit2f78ee7e816ae39f86bae2e6c61b2d14d3fe3ff4 authorBen Siraphob <bensiraphob@gmail.com> dateSun 24 Jan 2021, 00:15 (6 years ago) parentec334a1
121 files changed+324−322
pkgs/development/androidndk-pkgs/androidndk-pkgs.nix+2−2 pkgs/development/androidndk-pkgs/default.nix+3−1 pkgs/development/beam-modules/build-erlang-mk.nix+1−1 pkgs/development/beam-modules/build-hex.nix+2−2 pkgs/development/beam-modules/build-mix.nix+1−1 pkgs/development/beam-modules/build-rebar3.nix+1−1 pkgs/development/beam-modules/default.nix+11−11 pkgs/development/beam-modules/fetch-hex.nix+2−2 pkgs/development/beam-modules/fetch-rebar-deps.nix+3−3 pkgs/development/beam-modules/hex/default.nix+3−3 pkgs/development/beam-modules/lib.nix+2−2 pkgs/development/beam-modules/pc/default.nix+1−1 pkgs/development/beam-modules/pgsql/default.nix+3−3 pkgs/development/beam-modules/rebar3-release.nix+1−1 pkgs/development/beam-modules/webdriver/default.nix+3−3 pkgs/development/haskell-modules/configuration-nix.nix+2−2 pkgs/development/haskell-modules/generic-builder.nix+20−20 pkgs/development/haskell-modules/hoogle.nix+2−2 pkgs/development/haskell-modules/make-package-set.nix+4−4 pkgs/development/java-modules/build-maven-package.nix+3−3 pkgs/development/java-modules/junit/default.nix+4−4 pkgs/development/java-modules/maven-hello/default.nix+4−4 pkgs/development/java-modules/maven-minimal.nix+2−2 pkgs/development/libraries/SDL/default.nix+1−1 pkgs/development/libraries/SDL2/default.nix+1−1 pkgs/development/libraries/aravis/default.nix+1−1 pkgs/development/libraries/atk/default.nix+1−1 pkgs/development/libraries/cairo/default.nix+2−2 pkgs/development/libraries/clutter-gst/default.nix+1−1 pkgs/development/libraries/clutter-gtk/default.nix+1−1 pkgs/development/libraries/gts/default.nix+1−1 pkgs/development/libraries/irrlicht/default.nix+1−1 pkgs/development/libraries/java/hsqldb/default.nix+1−1 pkgs/development/libraries/java/junixsocket/default.nix+1−1 pkgs/development/libraries/libgpod/default.nix+1−1 pkgs/development/libraries/libre/default.nix+1−1 pkgs/development/libraries/librem/default.nix+2−2 pkgs/development/libraries/libsmartcols/default.nix+1−1 pkgs/development/libraries/libsmi/default.nix+1−1 pkgs/development/libraries/libsnark/default.nix+1−1 pkgs/development/libraries/libvirt/default.nix+1−1 pkgs/development/libraries/libxmi/default.nix+1−1 pkgs/development/libraries/muparser/default.nix+1−1 pkgs/development/libraries/qt-3/default.nix+2−2 pkgs/development/libraries/qt-4.x/4.8/default.nix+1−1 pkgs/development/libraries/qt-5/5.12/default.nix+4−4 pkgs/development/libraries/qt-5/5.14/default.nix+2−2 pkgs/development/libraries/qt-5/5.15/default.nix+2−2 pkgs/development/libraries/qt-5/modules/qtconnectivity.nix+2−2 pkgs/development/libraries/qt-5/modules/qtlocation.nix+2−2 pkgs/development/libraries/qt-5/modules/qtmacextras.nix+2−2 pkgs/development/libraries/qt-5/modules/qtmultimedia.nix+2−2 pkgs/development/libraries/qt-5/modules/qtwebengine.nix+1−1 pkgs/development/libraries/qt-5/modules/qtwebkit.nix+2−2 pkgs/development/libraries/qt-5/modules/qtwebview.nix+2−2 pkgs/development/libraries/tokyo-tyrant/default.nix+1−1 pkgs/development/libraries/wiredtiger/default.nix+1−1 pkgs/development/libraries/wxwidgets/2.8/default.nix+2−2 pkgs/development/libraries/wxwidgets/2.9/default.nix+2−2 pkgs/development/libraries/wxwidgets/3.0/default.nix+1−1 pkgs/development/libraries/wxwidgets/3.1/default.nix+1−1 pkgs/development/libraries/xalanc/default.nix+1−1 pkgs/development/libraries/xercesc/default.nix+1−1 pkgs/development/misc/avr8-burn-omat/default.nix+1−1 pkgs/development/misc/google-clasp/default.nix+3−3 pkgs/development/misc/haskell/hasura/ci-info/default.nix+2−2 pkgs/development/misc/haskell/hasura/graphql-engine/default.nix+3−3 pkgs/development/misc/haskell/hasura/graphql-parser/default.nix+2−2 pkgs/development/misc/haskell/hasura/pg-client/default.nix+2−2 pkgs/development/misc/loc/default.nix+2−2 pkgs/development/misc/msp430/mspdebug.nix+9−9 pkgs/development/misc/resholve/deps.nix+3−3 pkgs/development/misc/yelp-tools/default.nix+1−1 pkgs/development/pharo/vm/build-vm-legacy.nix+5−5 pkgs/development/pharo/vm/build-vm.nix+2−2 pkgs/development/pharo/vm/share.nix+2−2 pkgs/development/pharo/wrapper/default.nix+6−6 pkgs/development/pure-modules/audio/default.nix+4−4 pkgs/development/pure-modules/avahi/default.nix+4−4 pkgs/development/pure-modules/csv/default.nix+4−4 pkgs/development/pure-modules/doc/default.nix+4−4 pkgs/development/pure-modules/fastcgi/default.nix+4−4 pkgs/development/pure-modules/faust/default.nix+4−4 pkgs/development/pure-modules/ffi/default.nix+4−4 pkgs/development/pure-modules/gen/default.nix+4−4 pkgs/development/pure-modules/gl/default.nix+4−4 pkgs/development/pure-modules/glpk/default.nix+3−3 pkgs/development/pure-modules/gplot/default.nix+4−4 pkgs/development/pure-modules/gsl/default.nix+4−4 pkgs/development/pure-modules/gtk/default.nix+4−4 pkgs/development/pure-modules/liblo/default.nix+4−4 pkgs/development/pure-modules/lilv/default.nix+4−4 pkgs/development/pure-modules/lv2/default.nix+4−4 pkgs/development/pure-modules/midi/default.nix+4−4 pkgs/development/pure-modules/mpfr/default.nix+4−4 pkgs/development/pure-modules/octave/default.nix+4−4 pkgs/development/pure-modules/odbc/default.nix+4−4 pkgs/development/pure-modules/pandoc/default.nix+4−4 pkgs/development/pure-modules/rational/default.nix+4−4 pkgs/development/pure-modules/readline/default.nix+4−4 pkgs/development/pure-modules/sockets/default.nix+4−4 pkgs/development/pure-modules/sql3/default.nix+4−4 pkgs/development/pure-modules/stldict/default.nix+4−4 pkgs/development/pure-modules/stllib/default.nix+4−4 pkgs/development/pure-modules/tk/default.nix+4−4 pkgs/development/pure-modules/xml/default.nix+4−4 pkgs/development/web/deno/default.nix+1−1 pkgs/development/web/grails/default.nix+3−3 pkgs/development/web/insomnia/default.nix+1−1 pkgs/development/web/kcgi/default.nix+2−2 pkgs/development/web/kore/default.nix+2−2 pkgs/development/web/nodejs/nodejs.nix+2−2 pkgs/development/web/nodejs/v10.nix+2−2 pkgs/development/web/nodejs/v12.nix+2−2 pkgs/development/web/nodejs/v14.nix+2−2 pkgs/development/web/postman/default.nix+1−1 pkgs/development/web/remarkjs/default.nix+2−2 pkgs/development/web/twitter-bootstrap/default.nix+2−2 pkgs/development/web/woff2/default.nix+2−2 pkgs/development/web/xmlindent/default.nix+3−3 pkgs/top-level/all-packages.nix+3−3
pkgs/development/androidndk-pkgs/androidndk-pkgs.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv
1+{ lib, stdenv
22, makeWrapper
33, runCommand, wrapBintoolsWith, wrapCCWith
44, buildAndroidndk, androidndk, targetAndroidndkPkgs
@@ -48,7 +48,7 @@ let
4848 hostInfo = ndkInfoFun stdenv.hostPlatform;
4949 targetInfo = ndkInfoFun stdenv.targetPlatform;
5050
51− prefix = stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (stdenv.targetPlatform.config + "-");
51+ prefix = lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (stdenv.targetPlatform.config + "-");
5252in
5353
5454rec {
pkgs/development/androidndk-pkgs/default.nix+3−1
@@ -1,4 +1,4 @@
1−{ androidenv, buildPackages, pkgs, targetPackages
1+{ lib, androidenv, buildPackages, pkgs, targetPackages
22}:
33
44{
@@ -17,6 +17,7 @@
1717 };
1818 in
1919 import ./androidndk-pkgs.nix {
20+ inherit lib;
2021 inherit (buildPackages)
2122 makeWrapper;
2223 inherit (pkgs)
@@ -46,6 +47,7 @@
4647 };
4748 in
4849 import ./androidndk-pkgs.nix {
50+ inherit lib;
4951 inherit (buildPackages)
5052 makeWrapper;
5153 inherit (pkgs)
pkgs/development/beam-modules/build-erlang-mk.nix+1−1
@@ -15,7 +15,7 @@
1515, buildFlags ? []
1616, ... }@attrs:
1717
18−with stdenv.lib;
18+with lib;
1919
2020let
2121 debugInfoFlag = lib.optionalString (enableDebugInfo || erlang.debugInfo) "+debug_info";
pkgs/development/beam-modules/build-hex.nix+2−2
@@ -1,11 +1,11 @@
1−{ stdenv, buildRebar3, fetchHex }:
1+{ lib, stdenv, buildRebar3, fetchHex }:
22
33{ name, version, sha256
44, builder ? buildRebar3
55, hexPkg ? name
66, ... }@attrs:
77
8−with stdenv.lib;
8+with lib;
99
1010let
1111 pkg = self: builder (attrs // {
pkgs/development/beam-modules/build-mix.nix+1−1
@@ -15,7 +15,7 @@
1515, enableDebugInfo ? false
1616, ... }@attrs:
1717
18−with stdenv.lib;
18+with lib;
1919
2020let
2121
pkgs/development/beam-modules/build-rebar3.nix+1−1
@@ -14,7 +14,7 @@
1414, enableDebugInfo ? false
1515, ... }@attrs:
1616
17−with stdenv.lib;
17+with lib;
1818
1919let
2020 debugInfoFlag = lib.optionalString (enableDebugInfo || erlang.debugInfo) "debug-info";
pkgs/development/beam-modules/default.nix+11−11
@@ -1,12 +1,12 @@
1−{ stdenv, pkgs, erlang }:
1+{ lib, stdenv, pkgs, erlang }:
22
33let
4− inherit (stdenv.lib) makeExtensible;
4+ inherit (lib) makeExtensible;
55
6− lib = pkgs.callPackage ./lib.nix {};
6+ lib' = pkgs.callPackage ./lib.nix {};
77
88 # FIXME: add support for overrideScope
9− callPackageWithScope = scope: drv: args: stdenv.lib.callPackageWith scope drv args;
9+ callPackageWithScope = scope: drv: args: lib'.callPackageWith scope drv args;
1010 mkScope = scope: pkgs // scope;
1111
1212 packages = self:
@@ -38,27 +38,27 @@ let
3838 # BEAM-based languages.
3939 elixir = elixir_1_11;
4040
41− elixir_1_11 = lib.callElixir ../interpreters/elixir/1.11.nix {
41+ elixir_1_11 = lib'.callElixir ../interpreters/elixir/1.11.nix {
4242 inherit erlang;
4343 debugInfo = true;
4444 };
4545
46− elixir_1_10 = lib.callElixir ../interpreters/elixir/1.10.nix {
46+ elixir_1_10 = lib'.callElixir ../interpreters/elixir/1.10.nix {
4747 inherit erlang;
4848 debugInfo = true;
4949 };
5050
51− elixir_1_9 = lib.callElixir ../interpreters/elixir/1.9.nix {
51+ elixir_1_9 = lib'.callElixir ../interpreters/elixir/1.9.nix {
5252 inherit erlang;
5353 debugInfo = true;
5454 };
5555
56− elixir_1_8 = lib.callElixir ../interpreters/elixir/1.8.nix {
56+ elixir_1_8 = lib'.callElixir ../interpreters/elixir/1.8.nix {
5757 inherit erlang;
5858 debugInfo = true;
5959 };
6060
61− elixir_1_7 = lib.callElixir ../interpreters/elixir/1.7.nix {
61+ elixir_1_7 = lib'.callElixir ../interpreters/elixir/1.7.nix {
6262 inherit erlang;
6363 debugInfo = true;
6464 };
@@ -67,8 +67,8 @@ let
6767 # https://hexdocs.pm/elixir/compatibility-and-deprecations.html
6868
6969 lfe = lfe_1_3;
70− lfe_1_2 = lib.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3 buildHex; };
71− lfe_1_3 = lib.callLFE ../interpreters/lfe/1.3.nix { inherit erlang buildRebar3 buildHex; };
70+ lfe_1_2 = lib'.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3 buildHex; };
71+ lfe_1_3 = lib'.callLFE ../interpreters/lfe/1.3.nix { inherit erlang buildRebar3 buildHex; };
7272
7373 # Non hex packages. Examples how to build Rebar/Mix packages with and
7474 # without helper functions buildRebar3 and buildMix.
pkgs/development/beam-modules/fetch-hex.nix+2−2
@@ -1,10 +1,10 @@
1−{ stdenv, fetchurl }:
1+{ lib, stdenv, fetchurl }:
22
33{ pkg, version, sha256
44, meta ? {}
55}:
66
7−with stdenv.lib;
7+with lib;
88
99stdenv.mkDerivation ({
1010 name = "hex-source-${pkg}-${version}";
pkgs/development/beam-modules/fetch-rebar-deps.nix+3−3
@@ -1,10 +1,10 @@
1−{ stdenv, rebar3 }:
1+{ lib, stdenv, rebar3 }:
22
33{ name, version, sha256, src
44, meta ? {}
55}:
66
7−with stdenv.lib;
7+with lib;
88
99stdenv.mkDerivation ({
1010 name = "rebar-deps-${name}-${version}";
@@ -28,6 +28,6 @@ stdenv.mkDerivation ({
2828 outputHashMode = "recursive";
2929 outputHash = sha256;
3030
31− impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars;
31+ impureEnvVars = lib.fetchers.proxyImpureEnvVars;
3232 inherit meta;
3333})
pkgs/development/beam-modules/hex/default.nix+3−3
@@ -45,13 +45,13 @@ let
4545
4646 meta = {
4747 description = "Package manager for the Erlang VM https://hex.pm";
48− license = stdenv.lib.licenses.mit;
48+ license = lib.licenses.mit;
4949 homepage = "https://github.com/hexpm/hex";
50− maintainers = with stdenv.lib.maintainers; [ ericbmerritt ];
50+ maintainers = with lib.maintainers; [ ericbmerritt ];
5151 };
5252
5353 passthru = {
5454 env = shell self;
5555 };
5656};
57−in stdenv.lib.fix pkg
57+in lib.fix pkg
pkgs/development/beam-modules/lib.nix+2−2
@@ -1,4 +1,4 @@
1−{ pkgs, stdenv }:
1+{ pkgs, lib, stdenv }:
22
33rec {
44
@@ -7,7 +7,7 @@ rec {
77 callPackageWith = autoArgs: fn: args:
88 let
99 f = if pkgs.lib.isFunction fn then fn else import fn;
10− auto = builtins.intersectAttrs (stdenv.lib.functionArgs f) autoArgs;
10+ auto = builtins.intersectAttrs (lib.functionArgs f) autoArgs;
1111 in f (auto // args);
1212
1313 callPackage = callPackageWith pkgs;
pkgs/development/beam-modules/pc/default.nix+1−1
@@ -7,7 +7,7 @@ buildHex {
77
88 meta = {
99 description = "a rebar3 port compiler for native code";
10− license = stdenv.lib.licenses.mit;
10+ license = lib.licenses.mit;
1111 homepage = "https://github.com/blt/port_compiler";
1212 };
1313}
pkgs/development/beam-modules/pgsql/default.nix+3−3
@@ -21,9 +21,9 @@ let
2121
2222 meta = {
2323 description = "Erlang PostgreSQL Driver";
24− license = stdenv.lib.licenses.mit;
24+ license = lib.licenses.mit;
2525 homepage = "https://github.com/semiocast/pgsql";
26− maintainers = with stdenv.lib.maintainers; [ ericbmerritt ];
26+ maintainers = with lib.maintainers; [ ericbmerritt ];
2727 };
2828
2929 passthru = {
@@ -31,4 +31,4 @@ let
3131 };
3232
3333};
34−in stdenv.lib.fix pkg
34+in lib.fix pkg
pkgs/development/beam-modules/rebar3-release.nix+1−1
@@ -15,7 +15,7 @@
1515, enableDebugInfo ? false
1616, ... }@attrs:
1717
18−with stdenv.lib;
18+with lib;
1919
2020let
2121 shell = drv: stdenv.mkDerivation {
pkgs/development/beam-modules/webdriver/default.nix+3−3
@@ -27,9 +27,9 @@ let
2727
2828 meta = {
2929 description = "WebDriver implementation in Erlang";
30− license = stdenv.lib.licenses.mit;
30+ license = lib.licenses.mit;
3131 homepage = "https://github.com/Quviq/webdrv";
32− maintainers = with stdenv.lib.maintainers; [ ericbmerritt ];
32+ maintainers = with lib.maintainers; [ ericbmerritt ];
3333 };
3434
3535 passthru = {
@@ -37,4 +37,4 @@ let
3737 };
3838
3939};
40−in stdenv.lib.fix pkg
40+in lib.fix pkg
pkgs/development/haskell-modules/configuration-nix.nix+2−2
@@ -610,12 +610,12 @@ self: super: builtins.intersectAttrs super {
610610
611611 git-annex = with pkgs;
612612 if (!stdenv.isLinux) then
613− let path = stdenv.lib.makeBinPath [ coreutils ];
613+ let path = lib.makeBinPath [ coreutils ];
614614 in overrideCabal (addBuildTool super.git-annex makeWrapper) (_drv: {
615615 # This is an instance of https://github.com/NixOS/nix/pull/1085
616616 # Fails with:
617617 # gpg: can't connect to the agent: File name too long
618− postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
618+ postPatch = lib.optionalString stdenv.isDarwin ''
619619 substituteInPlace Test.hs \
620620 --replace ', testCase "crypto" test_crypto' ""
621621 '';
pkgs/development/haskell-modules/generic-builder.nix+20−20
@@ -1,4 +1,4 @@
1−{ stdenv, buildPackages, buildHaskellPackages, ghc
1+{ lib, stdenv, buildPackages, buildHaskellPackages, ghc
22, jailbreak-cabal, hscolour, cpphs, nodejs
33, ghcWithHoogle, ghcWithPackages
44}:
@@ -22,10 +22,10 @@ in
2222, buildFlags ? []
2323, haddockFlags ? []
2424, description ? null
25−, doCheck ? !isCross && stdenv.lib.versionOlder "7.4" ghc.version
25+, doCheck ? !isCross && lib.versionOlder "7.4" ghc.version
2626, doBenchmark ? false
2727, doHoogle ? true
28−, doHaddockQuickjump ? doHoogle && stdenv.lib.versionAtLeast ghc.version "8.6"
28+, doHaddockQuickjump ? doHoogle && lib.versionAtLeast ghc.version "8.6"
2929, editedCabalFile ? null
3030# aarch64 outputs otherwise exceed 2GB limit
3131, enableLibraryProfiling ? !(ghc.isGhcjs or stdenv.targetPlatform.isAarch64 or false)
@@ -36,14 +36,14 @@ in
3636, enableSharedLibraries ? !stdenv.hostPlatform.isStatic && (ghc.enableShared or false)
3737, enableDeadCodeElimination ? (!stdenv.isDarwin) # TODO: use -dead_strip for darwin
3838, enableStaticLibraries ? !(stdenv.hostPlatform.isWindows or stdenv.hostPlatform.isWasm)
39−, enableHsc2hsViaAsm ? stdenv.hostPlatform.isWindows && stdenv.lib.versionAtLeast ghc.version "8.4"
39+, enableHsc2hsViaAsm ? stdenv.hostPlatform.isWindows && lib.versionAtLeast ghc.version "8.4"
4040, extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? []
4141# On macOS, statically linking against system frameworks is not supported;
4242# see https://developer.apple.com/library/content/qa/qa1118/_index.html
4343# They must be propagated to the environment of any executable linking with the library
4444, libraryFrameworkDepends ? [], executableFrameworkDepends ? []
4545, homepage ? "https://hackage.haskell.org/package/${pname}"
46−, platforms ? with stdenv.lib.platforms; all # GHC can cross-compile
46+, platforms ? with lib.platforms; all # GHC can cross-compile
4747, hydraPlatforms ? null
4848, hyperlinkSource ? true
4949, isExecutable ? false, isLibrary ? !isExecutable
@@ -71,7 +71,7 @@ in
7171, shellHook ? ""
7272, coreSetup ? false # Use only core packages to build Setup.hs.
7373, useCpphs ? false
74−, hardeningDisable ? stdenv.lib.optional (ghc.isHaLVM or false) "all"
74+, hardeningDisable ? lib.optional (ghc.isHaLVM or false) "all"
7575, enableSeparateBinOutput ? false
7676, enableSeparateDataOutput ? false
7777, enableSeparateDocOutput ? doHaddock
@@ -95,7 +95,7 @@ assert stdenv.hostPlatform.isWasm -> enableStaticLibraries == false;
9595
9696let
9797
98− inherit (stdenv.lib) optional optionals optionalString versionOlder versionAtLeast
98+ inherit (lib) optional optionals optionalString versionOlder versionAtLeast
9999 concatStringsSep enableFeature optionalAttrs;
100100
101101 isGhcjs = ghc.isGhcjs or false;
@@ -182,7 +182,7 @@ let
182182 parallelBuildingFlags = "-j$NIX_BUILD_CORES" + optionalString stdenv.isLinux " +RTS -A64M -RTS";
183183
184184 crossCabalFlagsString =
185− stdenv.lib.optionalString isCross (" " + stdenv.lib.concatStringsSep " " crossCabalFlags);
185+ lib.optionalString isCross (" " + lib.concatStringsSep " " crossCabalFlags);
186186
187187 buildFlagsString = optionalString (buildFlags != []) (" " + concatStringsSep " " buildFlags);
188188
@@ -213,7 +213,7 @@ let
213213 (enableFeature doBenchmark "benchmarks")
214214 "--enable-library-vanilla" # TODO: Should this be configurable?
215215 (enableFeature enableLibraryForGhci "library-for-ghci")
216− ] ++ optionals (enableDeadCodeElimination && (stdenv.lib.versionOlder "8.0.1" ghc.version)) [
216+ ] ++ optionals (enableDeadCodeElimination && (lib.versionOlder "8.0.1" ghc.version)) [
217217 "--ghc-option=-split-sections"
218218 ] ++ optionals dontStrip [
219219 "--disable-library-stripping"
@@ -283,7 +283,7 @@ let
283283 continue
284284 fi
285285 '';
286−in stdenv.lib.fix (drv:
286+in lib.fix (drv:
287287
288288assert allPkgconfigDepends != [] -> pkg-config != null;
289289
@@ -423,7 +423,7 @@ stdenv.mkDerivation ({
423423
424424 echo configureFlags: $configureFlags
425425 ${setupCommand} configure $configureFlags 2>&1 | ${coreutils}/bin/tee "$NIX_BUILD_TOP/cabal-configure.log"
426− ${stdenv.lib.optionalString (!allowInconsistentDependencies) ''
426+ ${lib.optionalString (!allowInconsistentDependencies) ''
427427 if ${gnugrep}/bin/egrep -q -z 'Warning:.*depends on multiple versions' "$NIX_BUILD_TOP/cabal-configure.log"; then
428428 echo >&2 "*** abort because of serious configure-time warning from Cabal"
429429 exit 1
@@ -455,7 +455,7 @@ stdenv.mkDerivation ({
455455 ${optionalString doHoogle "--hoogle"} \
456456 ${optionalString doHaddockQuickjump "--quickjump"} \
457457 ${optionalString (isLibrary && hyperlinkSource) "--hyperlink-source"} \
458− ${stdenv.lib.concatStringsSep " " haddockFlags}
458+ ${lib.concatStringsSep " " haddockFlags}
459459 ''}
460460 runHook postHaddock
461461 '';
@@ -492,7 +492,7 @@ stdenv.mkDerivation ({
492492 done
493493 ''}
494494 ${optionalString doCoverage "mkdir -p $out/share && cp -r dist/hpc $out/share"}
495− ${optionalString (enableSharedExecutables && isExecutable && !isGhcjs && stdenv.isDarwin && stdenv.lib.versionOlder ghc.version "7.10") ''
495+ ${optionalString (enableSharedExecutables && isExecutable && !isGhcjs && stdenv.isDarwin && lib.versionOlder ghc.version "7.10") ''
496496 for exe in "${binDir}/"* ; do
497497 install_name_tool -add_rpath "$out/lib/ghc-${ghc.version}/${pname}-${version}" "$exe"
498498 done
@@ -535,7 +535,7 @@ stdenv.mkDerivation ({
535535 pkg-configDepends
536536 setupHaskellDepends
537537 ;
538− } // stdenv.lib.optionalAttrs doCheck {
538+ } // lib.optionalAttrs doCheck {
539539 inherit
540540 testDepends
541541 testFrameworkDepends
@@ -544,7 +544,7 @@ stdenv.mkDerivation ({
544544 testSystemDepends
545545 testToolDepends
546546 ;
547− } // stdenv.lib.optionalAttrs doBenchmark {
547+ } // lib.optionalAttrs doBenchmark {
548548 inherit
549549 benchmarkDepends
550550 benchmarkFrameworkDepends
@@ -561,7 +561,7 @@ stdenv.mkDerivation ({
561561 inherit propagatedBuildInputs otherBuildInputs allPkgconfigDepends;
562562 haskellBuildInputs = isHaskellPartition.right;
563563 systemBuildInputs = isHaskellPartition.wrong;
564− isHaskellPartition = stdenv.lib.partition
564+ isHaskellPartition = lib.partition
565565 isHaskellPkg
566566 (propagatedBuildInputs ++ otherBuildInputs ++ depsBuildBuild ++ nativeBuildInputs);
567567 };
@@ -608,13 +608,13 @@ stdenv.mkDerivation ({
608608 ghcEnv = withPackages (_:
609609 otherBuildInputsHaskell ++
610610 propagatedBuildInputs ++
611− stdenv.lib.optionals (!isCross) setupHaskellDepends);
611+ lib.optionals (!isCross) setupHaskellDepends);
612612
613− ghcCommandCaps = stdenv.lib.toUpper ghcCommand';
613+ ghcCommandCaps = lib.toUpper ghcCommand';
614614 in stdenv.mkDerivation ({
615615 inherit name shellHook;
616616
617− depsBuildBuild = stdenv.lib.optional isCross ghcEnvForBuild;
617+ depsBuildBuild = lib.optional isCross ghcEnvForBuild;
618618 nativeBuildInputs =
619619 [ ghcEnv ] ++ optional (allPkgconfigDepends != []) pkg-config ++
620620 collectedToolDepends;
@@ -623,7 +623,7 @@ stdenv.mkDerivation ({
623623 phases = ["installPhase"];
624624 installPhase = "echo $nativeBuildInputs $buildInputs > $out";
625625 LANG = "en_US.UTF-8";
626− LOCALE_ARCHIVE = stdenv.lib.optionalString (stdenv.hostPlatform.libc == "glibc") "${buildPackages.glibcLocales}/lib/locale/locale-archive";
626+ LOCALE_ARCHIVE = lib.optionalString (stdenv.hostPlatform.libc == "glibc") "${buildPackages.glibcLocales}/lib/locale/locale-archive";
627627 "NIX_${ghcCommandCaps}" = "${ghcEnv}/bin/${ghcCommand}";
628628 "NIX_${ghcCommandCaps}PKG" = "${ghcEnv}/bin/${ghcCommand}-pkg";
629629 # TODO: is this still valid?
pkgs/development/haskell-modules/hoogle.nix+2−2
@@ -120,7 +120,7 @@ buildPackages.stdenv.mkDerivation {
120120 meta = {
121121 description = "A local Hoogle database";
122122 platforms = ghc.meta.platforms;
123− hydraPlatforms = with stdenv.lib.platforms; none;
124− maintainers = with stdenv.lib.maintainers; [ ttuegel ];
123+ hydraPlatforms = with lib.platforms; none;
124+ maintainers = with lib.maintainers; [ ttuegel ];
125125 };
126126}
pkgs/development/haskell-modules/make-package-set.nix+4−4
@@ -41,7 +41,7 @@ self:
4141let
4242 inherit (stdenv) buildPlatform hostPlatform;
4343
44− inherit (stdenv.lib) fix' extends makeOverridable;
44+ inherit (lib) fix' extends makeOverridable;
4545 inherit (haskellLib) overrideCabal;
4646
4747 mkDerivationImpl = pkgs.callPackage ./generic-builder.nix {
@@ -84,8 +84,8 @@ let
8484 # lost on `.override`) but determine the auto-args based on `drv` (the problem here
8585 # is that nix has no way to "passthrough" args while preserving the reflection
8686 # info that callPackage uses to determine the arguments).
87− drv = if stdenv.lib.isFunction fn then fn else import fn;
88− auto = builtins.intersectAttrs (stdenv.lib.functionArgs drv) scope;
87+ drv = if lib.isFunction fn then fn else import fn;
88+ auto = builtins.intersectAttrs (lib.functionArgs drv) scope;
8989
9090 # this wraps the `drv` function to add a `overrideScope` function to the result.
9191 drvScope = allArgs: drv allArgs // {
@@ -98,7 +98,7 @@ let
9898 # nothing.
9999 in callPackageWithScope newScope drv manualArgs;
100100 };
101− in stdenv.lib.makeOverridable drvScope (auto // manualArgs);
101+ in lib.makeOverridable drvScope (auto // manualArgs);
102102
103103 mkScope = scope: let
104104 ps = pkgs.__splicedPackages;
pkgs/development/java-modules/build-maven-package.nix+3−3
@@ -1,11 +1,11 @@
1−{ stdenv, maven, pkgs }:
1+{ lib, stdenv, maven, pkgs }:
22{ mavenDeps, src, name, meta, m2Path, skipTests ? true, quiet ? true, ... }:
33
44with builtins;
5−with stdenv.lib;
5+with lib;
66
77let
8− mavenMinimal = import ./maven-minimal.nix { inherit pkgs stdenv; };
8+ mavenMinimal = import ./maven-minimal.nix { inherit lib pkgs stdenv; };
99in stdenv.mkDerivation rec {
1010 inherit mavenDeps src name meta m2Path;
1111
pkgs/development/java-modules/junit/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, pkgs, mavenbuild, fetchMaven }:
1+{ lib, stdenv, pkgs, mavenbuild, fetchMaven }:
22
33with pkgs.javaPackages;
44
@@ -21,9 +21,9 @@ in rec {
2121 meta = {
2222 homepage = "https://junit.org/junit4/";
2323 description = "Simple framework to write repeatable tests. It is an instance of the xUnit architecture for unit testing frameworks";
24− license = stdenv.lib.licenses.epl10;
25− platforms = stdenv.lib.platforms.all;
26− maintainers = with stdenv.lib.maintainers;
24+ license = lib.licenses.epl10;
25+ platforms = lib.platforms.all;
26+ maintainers = with lib.maintainers;
2727 [ nequissimus ];
2828 };
2929 };
pkgs/development/java-modules/maven-hello/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, pkgs, mavenbuild }:
1+{ lib, stdenv, pkgs, mavenbuild }:
22
33with pkgs.javaPackages;
44
@@ -20,9 +20,9 @@ in rec {
2020 meta = {
2121 homepage = "https://github.com/NeQuissimus/maven-hello/";
2222 description = "Maven Hello World";
23− license = stdenv.lib.licenses.unlicense;
24− platforms = stdenv.lib.platforms.all;
25− maintainers = with stdenv.lib.maintainers;
23+ license = lib.licenses.unlicense;
24+ platforms = lib.platforms.all;
25+ maintainers = with lib.maintainers;
2626 [ nequissimus ];
2727 };
2828 };
pkgs/development/java-modules/maven-minimal.nix+2−2
@@ -1,6 +1,6 @@
1−{ stdenv, pkgs }:
1+{ lib, stdenv, pkgs }:
22
3−with stdenv.lib;
3+with lib;
44with pkgs.javaPackages;
55
66let
pkgs/development/libraries/SDL/default.nix+1−1
@@ -1,5 +1,5 @@
11{ lib, stdenv, config, fetchurl, fetchpatch, pkg-config, audiofile, libcap, libiconv
2−, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
2+, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
33, openglSupport ? libGLSupported, libGL, libGLU
44, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib
55, x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid
pkgs/development/libraries/SDL2/default.nix+1−1
@@ -1,5 +1,5 @@
11{ lib, stdenv, config, fetchurl, pkg-config
2−, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
2+, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
33, openglSupport ? libGLSupported, libGL
44, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib
55, x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid
pkgs/development/libraries/aravis/default.nix+1−1
@@ -20,7 +20,7 @@
2020let
2121 gstreamerAtLeastVersion1 =
2222 lib.all
23− (pkg: pkg != null && lib.versionAtLeast (stdenv.lib.getVersion pkg) "1.0")
23+ (pkg: pkg != null && lib.versionAtLeast (lib.getVersion pkg) "1.0")
2424 [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ];
2525in
2626 assert enableGstPlugin -> lib.all (pkg: pkg != null) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ];
pkgs/development/libraries/atk/default.nix+1−1
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
5555 license = lib.licenses.lgpl2Plus;
5656
5757 maintainers = with lib.maintainers; [ raskin ];
58− platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin;
58+ platforms = lib.platforms.linux ++ lib.platforms.darwin;
5959 };
6060
6161}
pkgs/development/libraries/cairo/default.nix+2−2
@@ -3,7 +3,7 @@
33, x11Support? !stdenv.isDarwin, libXext, libXrender
44, gobjectSupport ? true, glib
55, xcbSupport ? x11Support, libxcb, xcbutil # no longer experimental since 1.12
6−, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
6+, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
77, glSupport ? x11Support && config.cairo.gl or (libGLSupported && stdenv.isLinux)
88, libGL ? null # libGLU libGL is no longer a big dependency
99, pdfSupport ? true
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
2020 inherit version;
2121
2222 src = fetchurl {
23− url = "https://cairographics.org/${if lib.mod (builtins.fromJSON (stdenv.lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${pname}-${version}.tar.xz";
23+ url = "https://cairographics.org/${if lib.mod (builtins.fromJSON (lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${pname}-${version}.tar.xz";
2424 sha256 = "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy";
2525 };
2626
pkgs/development/libraries/clutter-gst/default.nix+1−1
@@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
3030 license = lib.licenses.lgpl2Plus;
3131
3232 maintainers = with lib.maintainers; [ lethalman ];
33− platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice
33+ platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice
3434 };
3535}
pkgs/development/libraries/clutter-gtk/default.nix+1−1
@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
3232 homepage = "http://www.clutter-project.org/";
3333 license = lib.licenses.lgpl2Plus;
3434 maintainers = with lib.maintainers; [ lethalman ];
35− platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice
35+ platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice
3636 };
3737}
pkgs/development/libraries/gts/default.nix+1−1
@@ -43,6 +43,6 @@ stdenv.mkDerivation rec {
4343 '';
4444
4545 maintainers = [ lib.maintainers.viric ];
46− platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin;
46+ platforms = lib.platforms.linux ++ lib.platforms.darwin;
4747 };
4848}
pkgs/development/libraries/irrlicht/default.nix+1−1
@@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
3333 homepage = "http://irrlicht.sourceforge.net/";
3434 license = lib.licenses.zlib;
3535 description = "Open source high performance realtime 3D engine written in C++";
36− platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin;
36+ platforms = lib.platforms.linux ++ lib.platforms.darwin;
3737 };
3838}
pkgs/development/libraries/java/hsqldb/default.nix+1−1
@@ -3,7 +3,7 @@
33stdenv.mkDerivation rec {
44 pname = "hsqldb";
55 version = "2.5.1";
6− underscoreMajMin = lib.strings.replaceChars ["."] ["_"] (stdenv.lib.versions.majorMinor version);
6+ underscoreMajMin = lib.strings.replaceChars ["."] ["_"] (lib.versions.majorMinor version);
77
88 src = fetchurl {
99 url = "mirror://sourceforge/project/hsqldb/hsqldb/hsqldb_${underscoreMajMin}/hsqldb-${version}.zip";
pkgs/development/libraries/java/junixsocket/default.nix+1−1
@@ -37,6 +37,6 @@ stdenv.mkDerivation rec {
3737 description = "A Java/JNI library for using Unix Domain Sockets from Java";
3838 homepage = "https://github.com/kohlschutter/junixsocket";
3939 license = lib.licenses.asl20;
40− platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin;
40+ platforms = lib.platforms.linux ++ lib.platforms.darwin;
4141 };
4242}
pkgs/development/libraries/libgpod/default.nix+1−1
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
3939 homepage = "https://gtkpod.sourceforge.net/";
4040 description = "Library used by gtkpod to access the contents of an ipod";
4141 license = "LGPL";
42− platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux;
42+ platforms = lib.platforms.gnu ++ lib.platforms.linux;
4343 maintainers = [ ];
4444 };
4545}
pkgs/development/libraries/libre/default.nix+1−1
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 buildInputs = [ zlib openssl ];
1010 makeFlags = [ "USE_ZLIB=1" "USE_OPENSSL=1" "PREFIX=$(out)" ]
1111 ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}"
12− ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.lib.getDev stdenv.cc.libc}"
12+ ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${lib.getDev stdenv.cc.libc}"
1313 ;
1414 meta = {
1515 description = "A library for real-time communications with async IO support and a complete SIP stack";
pkgs/development/libraries/librem/default.nix+2−2
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
1212 "LIBRE_INC=${libre}/include/re"
1313 ''PREFIX=$(out)''
1414 ]
15− ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.lib.getDev stdenv.cc.cc}"
16− ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.lib.getDev stdenv.cc.libc}"
15+ ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${lib.getDev stdenv.cc.cc}"
16+ ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${lib.getDev stdenv.cc.libc}"
1717 ;
1818 meta = {
1919 description = " A library for real-time audio and video processing";
pkgs/development/libraries/libsmartcols/default.nix+1−1
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 description = "smart column output alignment library";
2626 homepage = https://github.com/karelzak/util-linux/tree/master/libsmartcols;
2727 license = lib.licenses.gpl2Plus;
28− platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin;
28+ platforms = lib.platforms.linux ++ lib.platforms.darwin;
2929 maintainers = with lib.maintainers; [ rb2k ];
3030 };
3131}
pkgs/development/libraries/libsmi/default.nix+1−1
@@ -13,6 +13,6 @@ stdenv.mkDerivation rec {
1313 description = "A Library to Access SMI MIB Information";
1414 homepage = "https://www.ibr.cs.tu-bs.de/projects/libsmi/index.html";
1515 license = licenses.free;
16− platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin;
16+ platforms = lib.platforms.linux ++ lib.platforms.darwin;
1717 };
1818}
pkgs/development/libraries/libsnark/default.nix+1−1
@@ -24,6 +24,6 @@ in stdenv.mkDerivation rec {
2424 description = "C++ library for zkSNARKs";
2525 homepage = "https://github.com/scipr-lab/libsnark";
2626 license = licenses.mit;
27− platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin;
27+ platforms = lib.platforms.linux ++ lib.platforms.darwin;
2828 };
2929}
pkgs/development/libraries/libvirt/default.nix+1−1
@@ -92,7 +92,7 @@ in stdenv.mkDerivation rec {
9292 --replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",'
9393 patchShebangs . # fixes /usr/bin/python references
9494 ''
95− + (lib.concatStringsSep "\n" (stdenv.lib.mapAttrsToList patchBuilder overrides));
95+ + (lib.concatStringsSep "\n" (lib.mapAttrsToList patchBuilder overrides));
9696
9797 mesonAutoFeatures = "auto";
9898
pkgs/development/libraries/libxmi/default.nix+1−1
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
1515 description = "Library for rasterizing 2-D vector graphics";
1616 homepage = "https://www.gnu.org/software/libxmi/";
1717 license = lib.licenses.gpl2Plus;
18− platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice
18+ platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice
1919 maintainers = [ ];
2020 };
2121}
pkgs/development/libraries/muparser/default.nix+1−1
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
1818 homepage = "http://muparser.sourceforge.net";
1919 description = "An extensible high performance math expression parser library written in C++";
2020 license = lib.licenses.mit;
21− platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin;
21+ platforms = lib.platforms.linux ++ lib.platforms.darwin;
2222 };
2323}
pkgs/development/libraries/qt-3/default.nix+2−2
@@ -6,8 +6,8 @@
66, cursorSupport ? true, libXcursor ? null
77, threadSupport ? true
88, mysqlSupport ? false, libmysqlclient ? null
9−, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
10−, openglSupport ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
9+, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
10+, openglSupport ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
1111, libGL ? null, libGLU ? null, libXmu ? null
1212, xlibsWrapper, xorgproto, zlib, libjpeg, libpng, which
1313}:
pkgs/development/libraries/qt-4.x/4.8/default.nix+1−1
@@ -4,7 +4,7 @@
44, libmng, which, libGLU, openssl, dbus, cups, pkg-config
55, libtiff, glib, icu, libmysqlclient, postgresql, sqlite, perl, coreutils, libXi
66, alsaLib
7−, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
7+, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
88, flashplayerFix ? false, gdk-pixbuf
99, gtkStyle ? stdenv.hostPlatform == stdenv.buildPlatform, gtk2
1010, gnomeStyle ? false, libgnomeui, GConf, gnome_vfs
pkgs/development/libraries/qt-5/5.12/default.nix+4−4
@@ -16,7 +16,7 @@ top-level attribute to `top-level/all-packages.nix`.
1616
1717{
1818 newScope,
19− stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper,
19+ lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper,
2020 bison, cups ? null, harfbuzz, libGL, perl,
2121 gstreamer, gst-plugins-base, gtk3, dconf,
2222 llvmPackages_5,
@@ -27,7 +27,7 @@ top-level attribute to `top-level/all-packages.nix`.
2727 debug ? false,
2828}:
2929
30−with stdenv.lib;
30+with lib;
3131
3232let
3333
@@ -119,7 +119,7 @@ let
119119 import ../qtModule.nix
120120 {
121121 inherit perl;
122− inherit (stdenv) lib;
122+ inherit lib;
123123 # Use a variant of mkDerivation that does not include wrapQtApplications
124124 # to avoid cyclic dependencies between Qt modules.
125125 mkDerivation =
@@ -136,7 +136,7 @@ let
136136
137137 mkDerivationWith =
138138 import ../mkDerivation.nix
139− { inherit (stdenv) lib; inherit debug; inherit (self) wrapQtAppsHook; };
139+ { inherit lib; inherit debug; inherit (self) wrapQtAppsHook; };
140140
141141 mkDerivation = mkDerivationWith stdenvActual.mkDerivation;
142142
pkgs/development/libraries/qt-5/5.14/default.nix+2−2
@@ -16,7 +16,7 @@ top-level attribute to `top-level/all-packages.nix`.
1616
1717{
1818 newScope,
19− stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper,
19+ lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper,
2020 bison, cups ? null, harfbuzz, libGL, perl,
2121 gstreamer, gst-plugins-base, gtk3, dconf,
2222 llvmPackages_5,
@@ -27,7 +27,7 @@ top-level attribute to `top-level/all-packages.nix`.
2727 debug ? false,
2828}:
2929
30−with stdenv.lib;
30+with lib;
3131
3232let
3333
pkgs/development/libraries/qt-5/5.15/default.nix+2−2
@@ -16,7 +16,7 @@ top-level attribute to `top-level/all-packages.nix`.
1616
1717{
1818 newScope,
19− stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper,
19+ lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper,
2020 bison, cups ? null, harfbuzz, libGL, perl,
2121 gstreamer, gst-plugins-base, gtk3, dconf,
2222 llvmPackages_5,
@@ -27,7 +27,7 @@ top-level attribute to `top-level/all-packages.nix`.
2727 debug ? false,
2828}:
2929
30−with stdenv.lib;
30+with lib;
3131
3232let
3333
pkgs/development/libraries/qt-5/modules/qtconnectivity.nix+2−2
@@ -1,8 +1,8 @@
1−{ qtModule, stdenv, qtbase, qtdeclarative, bluez }:
1+{ qtModule, lib, stdenv, qtbase, qtdeclarative, bluez }:
22
33qtModule {
44 name = "qtconnectivity";
55 qtInputs = [ qtbase qtdeclarative ];
6− buildInputs = stdenv.lib.optional stdenv.isLinux bluez;
6+ buildInputs = lib.optional stdenv.isLinux bluez;
77 outputs = [ "out" "dev" "bin" ];
88}
pkgs/development/libraries/qt-5/modules/qtlocation.nix+2−2
@@ -1,10 +1,10 @@
1−{ stdenv, qtModule, qtbase, qtmultimedia }:
1+{ lib, stdenv, qtModule, qtbase, qtmultimedia }:
22
33qtModule {
44 name = "qtlocation";
55 qtInputs = [ qtbase qtmultimedia ];
66 outputs = [ "bin" "out" "dev" ];
7− qmakeFlags = stdenv.lib.optional stdenv.isDarwin [
7+ qmakeFlags = lib.optional stdenv.isDarwin [
88 # boost uses std::auto_ptr which has been disabled in clang with libcxx
99 # This flag re-enables this feature
1010 # https://libcxx.llvm.org/docs/UsingLibcxx.html#c-17-specific-configuration-macros
pkgs/development/libraries/qt-5/modules/qtmacextras.nix+2−2
@@ -1,9 +1,9 @@
1−{ stdenv, qtModule, qtbase }:
1+{ lib, stdenv, qtModule, qtbase }:
22
33qtModule {
44 name = "qtmacextras";
55 qtInputs = [ qtbase ];
6− meta = with stdenv.lib; {
6+ meta = with lib; {
77 maintainers = with maintainers; [ periklis ];
88 platforms = platforms.darwin;
99 };
pkgs/development/libraries/qt-5/modules/qtmultimedia.nix+2−2
@@ -1,8 +1,8 @@
1−{ qtModule, stdenv, qtbase, qtdeclarative, pkg-config
1+{ qtModule, lib, stdenv, qtbase, qtdeclarative, pkg-config
22, alsaLib, gstreamer, gst-plugins-base, libpulseaudio, wayland
33}:
44
5−with stdenv.lib;
5+with lib;
66
77qtModule {
88 name = "qtmultimedia";
pkgs/development/libraries/qt-5/modules/qtwebengine.nix+1−1
@@ -18,7 +18,7 @@
1818, lib, stdenv, fetchpatch
1919}:
2020
21−with stdenv.lib;
21+with lib;
2222
2323qtModule {
2424 name = "qtwebengine";
pkgs/development/libraries/qt-5/modules/qtwebkit.nix+2−2
@@ -43,7 +43,7 @@ qtModule {
4343
4444 # QtWebKit overrides qmake's default_pre and default_post features,
4545 # so its custom qmake files must be found first at the front of QMAKEPATH.
46− preConfigure = stdenv.lib.optionalString (!usingAnnulenWebkitFork) ''
46+ preConfigure = lib.optionalString (!usingAnnulenWebkitFork) ''
4747 QMAKEPATH="$PWD/Tools/qmake''${QMAKEPATH:+:}$QMAKEPATH"
4848 fixQtBuiltinPaths . '*.pr?'
4949 # Fix hydra's "Log limit exceeded"
@@ -72,6 +72,6 @@ qtModule {
7272 preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" '';
7373
7474 meta = {
75− maintainers = with stdenv.lib.maintainers; [ abbradar periklis ];
75+ maintainers = with lib.maintainers; [ abbradar periklis ];
7676 };
7777}
pkgs/development/libraries/qt-5/modules/qtwebview.nix+2−2
@@ -1,6 +1,6 @@
1−{ darwin, stdenv, qtModule, qtdeclarative, qtwebengine }:
1+{ darwin, lib, stdenv, qtModule, qtdeclarative, qtwebengine }:
22
3−with stdenv.lib;
3+with lib;
44
55qtModule {
66 name = "qtwebview";
pkgs/development/libraries/tokyo-tyrant/default.nix+1−1
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
3535
3636 license = lib.licenses.lgpl21Plus;
3737
38− platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice
38+ platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice
3939 maintainers = [ ];
4040 };
4141}
pkgs/development/libraries/wiredtiger/default.nix+1−1
@@ -14,7 +14,7 @@ let
1414 mkEnable = mkFlag "enable-" "disable-";
1515 mkWith = mkFlag "with-" "without-";
1616
17− shouldUsePkg = pkg: if pkg != null && lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null;
17+ shouldUsePkg = pkg: if pkg != null && lib.any (lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null;
1818
1919 optLz4 = shouldUsePkg lz4;
2020 optSnappy = shouldUsePkg snappy;
pkgs/development/libraries/wxwidgets/2.8/default.nix+2−2
@@ -1,7 +1,7 @@
11{ lib, stdenv, fetchurl, pkg-config, gtk2, libXinerama, libSM, libXxf86vm, xorgproto
22, libX11, cairo
3−, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
4−, withMesa ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
3+, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
4+, withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
55, libGLU ? null, libGL ? null
66, compat24 ? false, compat26 ? true, unicode ? true,
77}:
pkgs/development/libraries/wxwidgets/2.9/default.nix+2−2
@@ -1,7 +1,7 @@
11{ lib, stdenv, fetchurl, pkg-config, gtk2, libXinerama, libSM, libXxf86vm, xorgproto
22, setfile
3−, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
4−, withMesa ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
3+, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
4+, withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
55, libGLU ? null, libGL ? null
66, compat24 ? false, compat26 ? true, unicode ? true
77, Carbon ? null, Cocoa ? null, Kernel ? null, QuickTime ? null, AGL ? null
pkgs/development/libraries/wxwidgets/3.0/default.nix+1−1
@@ -2,7 +2,7 @@
22, libXinerama, libSM, libXxf86vm
33, gtk2, gtk3
44, xorgproto, gst_all_1, setfile
5−, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
5+, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
66, withMesa ? libGLSupported
77, libGLU ? null, libGL ? null
88, compat24 ? false, compat26 ? true, unicode ? true
pkgs/development/libraries/wxwidgets/3.1/default.nix+1−1
@@ -12,7 +12,7 @@
1212, xorgproto
1313, gst_all_1
1414, setfile
15−, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
15+, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
1616, withMesa ? libGLSupported
1717, libGLU ? null
1818, libGL ? null
pkgs/development/libraries/xalanc/default.nix+1−1
@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
2626 homepage = "http://xalan.apache.org/";
2727 description = "A XSLT processor for transforming XML documents";
2828 license = lib.licenses.asl20;
29− platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin;
29+ platforms = lib.platforms.linux ++ lib.platforms.darwin;
3030 maintainers = [ lib.maintainers.jagajaga ];
3131 };
3232}
pkgs/development/libraries/xercesc/default.nix+1−1
@@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
1717 homepage = "https://xerces.apache.org/xerces-c/";
1818 description = "Validating XML parser written in a portable subset of C++";
1919 license = lib.licenses.asl20;
20− platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin;
20+ platforms = lib.platforms.linux ++ lib.platforms.darwin;
2121 };
2222}
pkgs/development/misc/avr8-burn-omat/default.nix+1−1
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
2727 meta = with lib; {
2828 description = "GUI tool for avrdude";
2929 homepage = "http://avr8-burn-o-mat.aaabbb.de/avr8_burn_o_mat_avrdude_gui_en.html";
30− license = stdenv.lib.licenses.gpl3;
30+ license = lib.licenses.gpl3;
3131 platforms = platforms.all;
3232 };
3333}
pkgs/development/misc/google-clasp/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, pkgs }:
1+{ lib, stdenv, pkgs }:
22let
33 version = "2.2.1";
44in
@@ -12,8 +12,8 @@ in
1212 meta = {
1313 description = "Command Line tool for Google Apps Script Projects";
1414 homepage = "https://developers.google.com/apps-script/guides/clasp";
15− license = stdenv.lib.licenses.asl20;
16− maintainers = [ stdenv.lib.maintainers.michojel ];
15+ license = lib.licenses.asl20;
16+ maintainers = [ lib.maintainers.michojel ];
1717 priority = 100;
1818 };
1919}
pkgs/development/misc/haskell/hasura/ci-info/default.nix+2−2
@@ -1,5 +1,5 @@
11{ mkDerivation, aeson, aeson-casing, base, fetchgit, hashable
2−, hpack, stdenv, template-haskell, text, th-lift-instances
2+, hpack, lib, stdenv, template-haskell, text, th-lift-instances
33, unordered-containers
44}:
55mkDerivation {
@@ -18,5 +18,5 @@ mkDerivation {
1818 libraryToolDepends = [ hpack ];
1919 prePatch = "hpack";
2020 homepage = "https://github.com/hasura/ci-info-hs#readme";
21− license = stdenv.lib.licenses.mit;
21+ license = lib.licenses.mit;
2222}
pkgs/development/misc/haskell/hasura/graphql-engine/default.nix+3−3
@@ -13,7 +13,7 @@
1313, optparse-applicative, pem, pg-client, postgresql-binary
1414, postgresql-libpq, process, profunctors, psqueues, QuickCheck
1515, regex-tdfa, safe, scientific, semver, shakespeare, split
16−, Spock-core, stdenv, stm, stm-containers, template-haskell, text
16+, Spock-core, lib, stdenv, stm, stm-containers, template-haskell, text
1717, text-builder, text-conversions, th-lift-instances, these, time
1818, transformers, transformers-base, unix, unordered-containers
1919, uri-encode, uuid, vector, wai, wai-websockets, warp, websockets
@@ -68,8 +68,8 @@ mkDerivation {
6868 doCheck = false;
6969 homepage = "https://www.hasura.io";
7070 description = "GraphQL API over Postgres";
71− license = stdenv.lib.licenses.asl20;
72− maintainers = with stdenv.lib.maintainers; [ offline ];
71+ license = lib.licenses.asl20;
72+ maintainers = with lib.maintainers; [ offline ];
7373 hydraPlatforms = [];
7474 broken = true;
7575}
pkgs/development/misc/haskell/hasura/graphql-parser/default.nix+2−2
@@ -1,6 +1,6 @@
11{ mkDerivation, aeson, attoparsec, base, bytestring, containers
22, criterion, fetchgit, filepath, hedgehog, hpack, prettyprinter
3−, protolude, regex-tdfa, scientific, stdenv, template-haskell, text
3+, protolude, regex-tdfa, scientific, lib, stdenv, template-haskell, text
44, text-builder, th-lift-instances, unordered-containers, vector
55}:
66mkDerivation {
@@ -32,5 +32,5 @@ mkDerivation {
3232 doCheck = false;
3333 prePatch = "hpack";
3434 homepage = "https://github.com/hasura/graphql-parser-hs#readme";
35− license = stdenv.lib.licenses.bsd3;
35+ license = lib.licenses.bsd3;
3636}
pkgs/development/misc/haskell/hasura/pg-client/default.nix+2−2
@@ -2,7 +2,7 @@
22, criterion, fetchgit, file-embed, hashable, hashtables, hasql
33, hasql-pool, hasql-transaction, monad-control, mtl
44, postgresql-binary, postgresql-libpq, resource-pool, retry
5−, scientific, stdenv, template-haskell, text, text-builder, th-lift
5+, scientific, lib, stdenv, template-haskell, text, text-builder, th-lift
66, th-lift-instances, time, transformers-base, uuid, vector
77}:
88mkDerivation {
@@ -26,5 +26,5 @@ mkDerivation {
2626 hasql-transaction mtl postgresql-libpq text text-builder
2727 ];
2828 homepage = "https://github.com/hasura/platform";
29− license = stdenv.lib.licenses.bsd3;
29+ license = lib.licenses.bsd3;
3030}
pkgs/development/misc/loc/default.nix+2−2
@@ -18,8 +18,8 @@ buildRustPackage rec {
1818 meta = with lib; {
1919 homepage = "https://github.com/cgag/loc";
2020 description = "Count lines of code quickly";
21− license = stdenv.lib.licenses.mit;
22− maintainers = with stdenv.lib.maintainers; [ ];
21+ license = lib.licenses.mit;
22+ maintainers = with lib.maintainers; [ ];
2323 platforms = platforms.unix;
2424 };
2525}
pkgs/development/misc/msp430/mspdebug.nix+9−9
@@ -25,13 +25,13 @@ stdenv.mkDerivation rec {
2525 };
2626
2727 enableParallelBuilding = true;
28− nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin pkg-config
29− ++ stdenv.lib.optional (enableMspds && stdenv.isLinux) autoPatchelfHook;
28+ nativeBuildInputs = lib.optional stdenv.isDarwin pkg-config
29+ ++ lib.optional (enableMspds && stdenv.isLinux) autoPatchelfHook;
3030 buildInputs = [ libusb-compat-0_1 ]
31− ++ stdenv.lib.optional stdenv.isDarwin hidapi
32− ++ stdenv.lib.optional enableReadline readline;
31+ ++ lib.optional stdenv.isDarwin hidapi
32+ ++ lib.optional enableReadline readline;
3333
34− postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
34+ postPatch = lib.optionalString stdenv.isDarwin ''
3535 # TODO: remove once a new 0.26+ release is made
3636 substituteInPlace drivers/tilib_api.c --replace .so ${stdenv.hostPlatform.extensions.sharedLibrary}
3737
@@ -40,8 +40,8 @@ stdenv.mkDerivation rec {
4040 '';
4141
4242 # TODO: wrap with MSPDEBUG_TILIB_PATH env var instead of these rpath fixups in 0.26+
43− runtimeDependencies = stdenv.lib.optional enableMspds mspds;
44− postFixup = stdenv.lib.optionalString (enableMspds && stdenv.isDarwin) ''
43+ runtimeDependencies = lib.optional enableMspds mspds;
44+ postFixup = lib.optionalString (enableMspds && stdenv.isDarwin) ''
4545 # autoPatchelfHook only works on linux so...
4646 for dep in $runtimeDependencies; do
4747 install_name_tool -add_rpath $dep/lib $out/bin/$pname
@@ -50,8 +50,8 @@ stdenv.mkDerivation rec {
5050
5151 installFlags = [ "PREFIX=$(out)" "INSTALL=install" ];
5252 makeFlags = [ "UNAME_S=$(unameS)" ] ++
53− stdenv.lib.optional (!enableReadline) "WITHOUT_READLINE=1";
54− unameS = stdenv.lib.optionalString stdenv.isDarwin "Darwin";
53+ lib.optional (!enableReadline) "WITHOUT_READLINE=1";
54+ unameS = lib.optionalString stdenv.isDarwin "Darwin";
5555
5656 meta = with lib; {
5757 description = "A free programmer, debugger, and gdb proxy for MSP430 MCUs";
pkgs/development/misc/resholve/deps.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv
1+{ lib, stdenv
22, python27Packages
33, fetchFromGitHub
44, makeWrapper
@@ -106,12 +106,12 @@ rec {
106106 _NIX_SHELL_LIBCMARK = "${cmark}/lib/libcmark${stdenv.hostPlatform.extensions.sharedLibrary}";
107107
108108 # See earlier note on glibcLocales
109− LOCALE_ARCHIVE = stdenv.lib.optionalString (stdenv.buildPlatform.libc == "glibc") "${glibcLocales}/lib/locale/locale-archive";
109+ LOCALE_ARCHIVE = lib.optionalString (stdenv.buildPlatform.libc == "glibc") "${glibcLocales}/lib/locale/locale-archive";
110110
111111 meta = {
112112 description = "A new unix shell";
113113 homepage = "https://www.oilshell.org/";
114− license = with stdenv.lib.licenses; [
114+ license = with lib.licenses; [
115115 psfl # Includes a portion of the python interpreter and standard library
116116 asl20 # Licence for Oil itself
117117 ];
pkgs/development/misc/yelp-tools/default.nix+1−1
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
55 version = "3.38.0";
66
77 src = fetchurl {
8− url = "mirror://gnome/sources/yelp-tools/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
8+ url = "mirror://gnome/sources/yelp-tools/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
99 sha256 = "1c045c794sm83rrjan67jmsk20qacrw1m814p4nw85w5xsry8z30";
1010 };
1111
pkgs/development/pharo/vm/build-vm-legacy.nix+5−5
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222
2323 inherit name src;
2424
25− pharo-share = import ./share.nix { inherit stdenv fetchurl unzip; };
25+ pharo-share = import ./share.nix { inherit lib stdenv fetchurl unzip; };
2626
2727 hardeningDisable = [ "format" "pic" ];
2828
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
3131 buildInputs = [ bash glibc openssl libGLU libGL freetype
3232 xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share ];
3333
34− LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath
34+ LD_LIBRARY_PATH = lib.makeLibraryPath
3535 [ cairo libGLU libGL freetype openssl libuuid alsaLib
3636 xorg.libICE xorg.libSM ];
3737
@@ -89,9 +89,9 @@ stdenv.mkDerivation rec {
8989 license = licenses.mit;
9090 maintainers = [ maintainers.lukego ];
9191 # Pharo VM sources are packaged separately for darwin (OS X)
92− platforms = stdenv.lib.filter
93− (system: with stdenv.lib.systems.elaborate { inherit system; };
92+ platforms = lib.filter
93+ (system: with lib.systems.elaborate { inherit system; };
9494 isUnix && !isDarwin)
95− stdenv.lib.platforms.mesaPlatforms;
95+ lib.platforms.mesaPlatforms;
9696 };
9797}
pkgs/development/pharo/vm/build-vm.nix+2−2
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
3939 else throw "Unsupported platform: only Linux/Darwin x86/x64 are supported.";
4040
4141 # Shared data (for the sources file)
42− pharo-share = import ./share.nix { inherit stdenv fetchurl unzip; };
42+ pharo-share = import ./share.nix { inherit lib stdenv fetchurl unzip; };
4343
4444 # Note: -fPIC causes the VM to segfault.
4545 hardeningDisable = [ "format" "pic"
@@ -138,7 +138,7 @@ stdenv.mkDerivation rec {
138138 mkdir -p "$out/bin"
139139
140140 # Note: include ELF rpath in LD_LIBRARY_PATH for finding libc.
141− libs=$out:$(patchelf --print-rpath "$out/pharo"):${stdenv.lib.makeLibraryPath libs}
141+ libs=$out:$(patchelf --print-rpath "$out/pharo"):${lib.makeLibraryPath libs}
142142
143143 # Create the script
144144 cat > "$out/bin/${cmd}" <<EOF
pkgs/development/pharo/vm/share.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, unzip }:
1+{ lib, stdenv, fetchurl, unzip }:
22
33stdenv.mkDerivation rec {
44 version = "1.0";
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
5252 meta = {
5353 description = "Shared files for Pharo";
5454 homepage = "https://pharo.org";
55− license = stdenv.lib.licenses.mit;
55+ license = lib.licenses.mit;
5656 maintainers = [ ];
5757 };
5858}
pkgs/development/pharo/wrapper/default.nix+6−6
@@ -1,4 +1,4 @@
1−{ stdenv, file, makeDesktopItem, cog32, spur32, spur64 ? "none" }:
1+{ lib, stdenv, file, makeDesktopItem, cog32, spur32, spur64 ? "none" }:
22
33stdenv.mkDerivation rec {
44 name = "pharo";
@@ -50,13 +50,13 @@ stdenv.mkDerivation rec {
5050 '';
5151
5252 homepage = "http://pharo.org";
53− license = stdenv.lib.licenses.mit;
54− maintainers = [ stdenv.lib.maintainers.lukego ];
53+ license = lib.licenses.mit;
54+ maintainers = [ lib.maintainers.lukego ];
5555 # Pharo VM sources are packaged separately for darwin (OS X)
56− platforms = stdenv.lib.filter
57− (system: with stdenv.lib.systems.elaborate { inherit system; };
56+ platforms = lib.filter
57+ (system: with lib.systems.elaborate { inherit system; };
5858 isUnix && !isDarwin)
59− stdenv.lib.platforms.mesaPlatforms;
59+ lib.platforms.mesaPlatforms;
6060 };
6161}
6262
pkgs/development/pure-modules/audio/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkg-config, pure, portaudio, fftw, libsndfile, libsamplerate }:
1+{ lib, stdenv, fetchurl, pkg-config, pure, portaudio, fftw, libsndfile, libsamplerate }:
22
33stdenv.mkDerivation rec {
44 baseName = "audio";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
1818 meta = {
1919 description = "A digital audio interface for the Pure programming language";
2020 homepage = "http://puredocs.bitbucket.org/pure-audio.html";
21− license = stdenv.lib.licenses.bsd3;
22− platforms = stdenv.lib.platforms.linux;
23− maintainers = with stdenv.lib.maintainers; [ asppsa ];
21+ license = lib.licenses.bsd3;
22+ platforms = lib.platforms.linux;
23+ maintainers = with lib.maintainers; [ asppsa ];
2424 };
2525}
pkgs/development/pure-modules/avahi/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkg-config, pure, avahi }:
1+{ lib, stdenv, fetchurl, pkg-config, pure, avahi }:
22
33stdenv.mkDerivation rec {
44 baseName = "avahi";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
1818 meta = {
1919 description = "A digital audio interface for the Pure programming language";
2020 homepage = "http://puredocs.bitbucket.org/pure-avahi.html";
21− license = stdenv.lib.licenses.lgpl3Plus;
22− platforms = stdenv.lib.platforms.linux;
23− maintainers = with stdenv.lib.maintainers; [ asppsa ];
21+ license = lib.licenses.lgpl3Plus;
22+ platforms = lib.platforms.linux;
23+ maintainers = with lib.maintainers; [ asppsa ];
2424 };
2525}
pkgs/development/pure-modules/csv/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkg-config, pure }:
1+{ lib, stdenv, fetchurl, pkg-config, pure }:
22
33stdenv.mkDerivation rec {
44 baseName = "csv";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
1818 meta = {
1919 description = "Comma Separated Value Interface for the Pure Programming Language";
2020 homepage = "http://puredocs.bitbucket.org/pure-csv.html";
21− license = stdenv.lib.licenses.free;
22− platforms = stdenv.lib.platforms.linux;
23− maintainers = with stdenv.lib.maintainers; [ asppsa ];
21+ license = lib.licenses.free;
22+ platforms = lib.platforms.linux;
23+ maintainers = with lib.maintainers; [ asppsa ];
2424 };
2525}
pkgs/development/pure-modules/doc/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkg-config, pure }:
1+{ lib, stdenv, fetchurl, pkg-config, pure }:
22
33stdenv.mkDerivation rec {
44 baseName = "doc";
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
1717 meta = {
1818 description = "A simple utility for literate programming and documenting source code written in the Pure programming language";
1919 homepage = "http://puredocs.bitbucket.org/pure-doc.html";
20− license = stdenv.lib.licenses.gpl3Plus;
21− platforms = stdenv.lib.platforms.linux;
22− maintainers = with stdenv.lib.maintainers; [ asppsa ];
20+ license = lib.licenses.gpl3Plus;
21+ platforms = lib.platforms.linux;
22+ maintainers = with lib.maintainers; [ asppsa ];
2323 };
2424}
pkgs/development/pure-modules/fastcgi/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkg-config, pure, fcgi }:
1+{ lib, stdenv, fetchurl, pkg-config, pure, fcgi }:
22
33stdenv.mkDerivation rec {
44 baseName = "fastcgi";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
1818 meta = {
1919 description = "Lets you write FastCGI scripts with Pure, to be run by web servers like Apache";
2020 homepage = "http://puredocs.bitbucket.org/pure-fastcgi.html";
21− license = stdenv.lib.licenses.bsd3;
22− platforms = stdenv.lib.platforms.linux;
23− maintainers = with stdenv.lib.maintainers; [ asppsa ];
21+ license = lib.licenses.bsd3;
22+ platforms = lib.platforms.linux;
23+ maintainers = with lib.maintainers; [ asppsa ];
2424 };
2525}
pkgs/development/pure-modules/faust/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkg-config, pure, faust, libtool }:
1+{ lib, stdenv, fetchurl, pkg-config, pure, faust, libtool }:
22
33stdenv.mkDerivation rec {
44 baseName = "faust";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
1818 meta = {
1919 description = "Lets you load and run Faust-generated signal processing modules in Pure";
2020 homepage = "http://puredocs.bitbucket.org/pure-faust.html";
21− license = stdenv.lib.licenses.lgpl3Plus;
22− platforms = stdenv.lib.platforms.linux;
23− maintainers = with stdenv.lib.maintainers; [ asppsa ];
21+ license = lib.licenses.lgpl3Plus;
22+ platforms = lib.platforms.linux;
23+ maintainers = with lib.maintainers; [ asppsa ];
2424 };
2525}
pkgs/development/pure-modules/ffi/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkg-config, pure, libffi }:
1+{ lib, stdenv, fetchurl, pkg-config, pure, libffi }:
22
33stdenv.mkDerivation rec {
44 baseName = "ffi";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
1818 meta = {
1919 description = "Provides an interface to libffi which enables you to call C functions from Pure and vice versa";
2020 homepage = "http://puredocs.bitbucket.org/pure-ffi.html";
21− license = stdenv.lib.licenses.lgpl3Plus;
22− platforms = stdenv.lib.platforms.linux;
23− maintainers = with stdenv.lib.maintainers; [ asppsa ];
21+ license = lib.licenses.lgpl3Plus;
22+ platforms = lib.platforms.linux;
23+ maintainers = with lib.maintainers; [ asppsa ];
2424 };
2525}
pkgs/development/pure-modules/gen/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl,
1+{ lib, stdenv, fetchurl,
22 pkg-config, pure, haskellPackages }:
33
44stdenv.mkDerivation rec {
@@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
1919 meta = {
2020 description = "Pure interface generator";
2121 homepage = "http://puredocs.bitbucket.org/pure-gen.html";
22− license = stdenv.lib.licenses.free;
23− platforms = stdenv.lib.platforms.linux;
22+ license = lib.licenses.free;
23+ platforms = lib.platforms.linux;
2424 hydraPlatforms = [];
25− maintainers = with stdenv.lib.maintainers; [ asppsa ];
25+ maintainers = with lib.maintainers; [ asppsa ];
2626 };
2727}
pkgs/development/pure-modules/gl/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkg-config, pure, freeglut, libGLU, libGL, xlibsWrapper }:
1+{ lib, stdenv, fetchurl, pkg-config, pure, freeglut, libGLU, libGL, xlibsWrapper }:
22
33stdenv.mkDerivation rec {
44 baseName = "gl";
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
2121 meta = {
2222 description = "Fairly complete Pure bindings for the OpenGL graphics library, which allow you to do 2D and 3D graphics programming with Pure";
2323 homepage = "http://puredocs.bitbucket.org/pure-gl.html";
24− license = stdenv.lib.licenses.bsd3;
25− platforms = stdenv.lib.platforms.linux;
26− maintainers = with stdenv.lib.maintainers; [ asppsa ];
24+ license = lib.licenses.bsd3;
25+ platforms = lib.platforms.linux;
26+ maintainers = with lib.maintainers; [ asppsa ];
2727 };
2828}
pkgs/development/pure-modules/glpk/default.nix+3−3
@@ -34,8 +34,8 @@ stdenv.mkDerivation rec {
3434 meta = {
3535 description = "GLPK interface for the Pure Programming Language";
3636 homepage = "http://puredocs.bitbucket.org/pure-glpk.html";
37− license = stdenv.lib.licenses.gpl3Plus;
38− platforms = stdenv.lib.platforms.linux;
39− maintainers = with stdenv.lib.maintainers; [ asppsa ];
37+ license = lib.licenses.gpl3Plus;
38+ platforms = lib.platforms.linux;
39+ maintainers = with lib.maintainers; [ asppsa ];
4040 };
4141}
pkgs/development/pure-modules/gplot/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkg-config, pure, gnuplot }:
1+{ lib, stdenv, fetchurl, pkg-config, pure, gnuplot }:
22
33stdenv.mkDerivation rec {
44 baseName = "gplot";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
1818 meta = {
1919 description = "A pure binding to gnuplot";
2020 homepage = "http://puredocs.bitbucket.org/pure-gplot.html";
21− license = stdenv.lib.licenses.lgpl3Plus;
22− platforms = stdenv.lib.platforms.linux;
23− maintainers = with stdenv.lib.maintainers; [ asppsa ];
21+ license = lib.licenses.lgpl3Plus;
22+ platforms = lib.platforms.linux;
23+ maintainers = with lib.maintainers; [ asppsa ];
2424 };
2525}
pkgs/development/pure-modules/gsl/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pure, pkg-config, gsl }:
1+{ lib, stdenv, fetchurl, pure, pkg-config, gsl }:
22
33stdenv.mkDerivation rec {
44 baseName = "gsl";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
1818 meta = {
1919 description = "GNU Scientific Library interface for Pure";
2020 homepage = "http://puredocs.bitbucket.org/pure-gsl.html";
21− license = stdenv.lib.licenses.gpl3Plus;
22− platforms = stdenv.lib.platforms.linux;
23− maintainers = with stdenv.lib.maintainers; [ asppsa ];
21+ license = lib.licenses.gpl3Plus;
22+ platforms = lib.platforms.linux;
23+ maintainers = with lib.maintainers; [ asppsa ];
2424 };
2525}
pkgs/development/pure-modules/gtk/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkg-config, pure, pure-ffi, gtk2 }:
1+{ lib, stdenv, fetchurl, pkg-config, pure, pure-ffi, gtk2 }:
22
33stdenv.mkDerivation rec {
44 baseName = "gtk";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
1818 meta = {
1919 description = "A collection of bindings to use the GTK GUI toolkit version 2.x with Pure";
2020 homepage = "http://puredocs.bitbucket.org/pure-gtk.html";
21− license = stdenv.lib.licenses.lgpl3Plus;
22− platforms = stdenv.lib.platforms.linux;
23− maintainers = with stdenv.lib.maintainers; [ asppsa ];
21+ license = lib.licenses.lgpl3Plus;
22+ platforms = lib.platforms.linux;
23+ maintainers = with lib.maintainers; [ asppsa ];
2424 };
2525}
pkgs/development/pure-modules/liblo/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkg-config, pure, liblo }:
1+{ lib, stdenv, fetchurl, pkg-config, pure, liblo }:
22
33stdenv.mkDerivation rec {
44 baseName = "liblo";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
1818 meta = {
1919 description = "A quick and dirty Pure wrapper for the liblo library, which implements Berkeley’s Open Sound Control (OSC) protocol";
2020 homepage = "http://puredocs.bitbucket.org/pure-liblo.html";
21− license = stdenv.lib.licenses.lgpl3Plus;
22− platforms = stdenv.lib.platforms.linux;
23− maintainers = with stdenv.lib.maintainers; [ asppsa ];
21+ license = lib.licenses.lgpl3Plus;
22+ platforms = lib.platforms.linux;
23+ maintainers = with lib.maintainers; [ asppsa ];
2424 };
2525}
pkgs/development/pure-modules/lilv/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkg-config, pure, lilv, lv2, serd, sord, sratom }:
1+{ lib, stdenv, fetchurl, pkg-config, pure, lilv, lv2, serd, sord, sratom }:
22
33stdenv.mkDerivation rec {
44 baseName = "lilv";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
1818 meta = {
1919 description = "A Pure module for David Robillard’s Lilv, a library for LV2 plugin host writers";
2020 homepage = "http://puredocs.bitbucket.org/pure-lilv.html";
21− license = stdenv.lib.licenses.bsd3;
22− platforms = stdenv.lib.platforms.linux;
23− maintainers = with stdenv.lib.maintainers; [ asppsa ];
21+ license = lib.licenses.bsd3;
22+ platforms = lib.platforms.linux;
23+ maintainers = with lib.maintainers; [ asppsa ];
2424 };
2525}
pkgs/development/pure-modules/lv2/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkg-config, pure, lv2 }:
1+{ lib, stdenv, fetchurl, pkg-config, pure, lv2 }:
22
33stdenv.mkDerivation rec {
44 baseName = "lv2";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
1818 meta = {
1919 description = "A generic LV2 plugin wrapper for Pure which can be linked with batch-compiled Pure scripts to obtain LV2 plugin modules";
2020 homepage = "http://puredocs.bitbucket.org/pure-lv2.html";
21− license = stdenv.lib.licenses.bsd3;
22− platforms = stdenv.lib.platforms.linux;
23− maintainers = with stdenv.lib.maintainers; [ asppsa ];
21+ license = lib.licenses.bsd3;
22+ platforms = lib.platforms.linux;
23+ maintainers = with lib.maintainers; [ asppsa ];
2424 };
2525}
pkgs/development/pure-modules/midi/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkg-config, pure, portmidi }:
1+{ lib, stdenv, fetchurl, pkg-config, pure, portmidi }:
22
33stdenv.mkDerivation rec {
44 baseName = "midi";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
1818 meta = {
1919 description = "A MIDI interface for the Pure programming language";
2020 homepage = "http://puredocs.bitbucket.org/pure-midi.html";
21− license = stdenv.lib.licenses.bsd3;
22− platforms = stdenv.lib.platforms.linux;
23− maintainers = with stdenv.lib.maintainers; [ asppsa ];
21+ license = lib.licenses.bsd3;
22+ platforms = lib.platforms.linux;
23+ maintainers = with lib.maintainers; [ asppsa ];
2424 };
2525}
pkgs/development/pure-modules/mpfr/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkg-config, pure }:
1+{ lib, stdenv, fetchurl, pkg-config, pure }:
22
33stdenv.mkDerivation rec {
44 baseName = "mpfr";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
1818 meta = {
1919 description = "This module makes the MPFR multiprecision floats available in Pure";
2020 homepage = "http://puredocs.bitbucket.org/pure-mpfr.html";
21− license = stdenv.lib.licenses.lgpl3Plus;
22− platforms = stdenv.lib.platforms.linux;
23− maintainers = with stdenv.lib.maintainers; [ asppsa ];
21+ license = lib.licenses.lgpl3Plus;
22+ platforms = lib.platforms.linux;
23+ maintainers = with lib.maintainers; [ asppsa ];
2424 };
2525}
pkgs/development/pure-modules/octave/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkg-config, pure, octave }:
1+{ lib, stdenv, fetchurl, pkg-config, pure, octave }:
22
33stdenv.mkDerivation rec {
44 baseName = "octave";
@@ -18,10 +18,10 @@ stdenv.mkDerivation rec {
1818 meta = {
1919 description = "An Octave module for the Pure programming language";
2020 homepage = "http://puredocs.bitbucket.org/pure-octave.html";
21− license = stdenv.lib.licenses.gpl3Plus;
21+ license = lib.licenses.gpl3Plus;
2222 # This is set to none for now because it does not work with the
2323 # current stable version of Octave.
24− platforms = stdenv.lib.platforms.none;
25− maintainers = with stdenv.lib.maintainers; [ asppsa ];
24+ platforms = lib.platforms.none;
25+ maintainers = with lib.maintainers; [ asppsa ];
2626 };
2727}
pkgs/development/pure-modules/odbc/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkg-config, pure, libiodbc }:
1+{ lib, stdenv, fetchurl, pkg-config, pure, libiodbc }:
22
33stdenv.mkDerivation rec {
44 baseName = "odbc";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
1818 meta = {
1919 description = "A simple ODBC interface for the Pure programming language";
2020 homepage = "http://puredocs.bitbucket.org/pure-odbc.html";
21− license = stdenv.lib.licenses.lgpl3Plus;
22− platforms = stdenv.lib.platforms.linux;
23− maintainers = with stdenv.lib.maintainers; [ asppsa ];
21+ license = lib.licenses.lgpl3Plus;
22+ platforms = lib.platforms.linux;
23+ maintainers = with lib.maintainers; [ asppsa ];
2424 };
2525}
pkgs/development/pure-modules/pandoc/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkg-config, pure, pandoc, gawk, getopt }:
1+{ lib, stdenv, fetchurl, pkg-config, pure, pandoc, gawk, getopt }:
22
33stdenv.mkDerivation rec {
44 baseName = "pandoc";
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
2222 meta = {
2323 description = "Converts Sphinx-formatted Pure documentation files to Markdown and other formats using Pandoc";
2424 homepage = "http://puredocs.bitbucket.org/pure-pandoc.html";
25− license = stdenv.lib.licenses.gpl3Plus;
26− platforms = stdenv.lib.platforms.linux;
27− maintainers = with stdenv.lib.maintainers; [ asppsa ];
25+ license = lib.licenses.gpl3Plus;
26+ platforms = lib.platforms.linux;
27+ maintainers = with lib.maintainers; [ asppsa ];
2828 };
2929}
pkgs/development/pure-modules/rational/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkg-config, pure }:
1+{ lib, stdenv, fetchurl, pkg-config, pure }:
22
33stdenv.mkDerivation rec {
44 baseName = "rational";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
1818 meta = {
1919 description = "A collection of utility functions for rational numbers, and a module for doing interval arithmetic in Pure";
2020 homepage = "http://puredocs.bitbucket.org/pure-rational.html";
21− license = stdenv.lib.licenses.gpl3Plus;
22− platforms = stdenv.lib.platforms.linux;
23− maintainers = with stdenv.lib.maintainers; [ asppsa ];
21+ license = lib.licenses.gpl3Plus;
22+ platforms = lib.platforms.linux;
23+ maintainers = with lib.maintainers; [ asppsa ];
2424 };
2525}
pkgs/development/pure-modules/readline/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkg-config, pure, readline }:
1+{ lib, stdenv, fetchurl, pkg-config, pure, readline }:
22
33stdenv.mkDerivation rec {
44 baseName = "readline";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
1818 meta = {
1919 description = "A trivial wrapper around GNU readline, which gives Pure scripts access to the most important facilities of the readline interface";
2020 homepage = "http://puredocs.bitbucket.org/pure-readline.html";
21− license = stdenv.lib.licenses.free;
22− platforms = stdenv.lib.platforms.linux;
23− maintainers = with stdenv.lib.maintainers; [ asppsa ];
21+ license = lib.licenses.free;
22+ platforms = lib.platforms.linux;
23+ maintainers = with lib.maintainers; [ asppsa ];
2424 };
2525}
pkgs/development/pure-modules/sockets/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkg-config, pure }:
1+{ lib, stdenv, fetchurl, pkg-config, pure }:
22
33stdenv.mkDerivation rec {
44 baseName = "sockets";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
1818 meta = {
1919 description = "A Pure interface to the Berkeley socket functions";
2020 homepage = "http://puredocs.bitbucket.org/pure-sockets.html";
21− license = stdenv.lib.licenses.gpl3Plus;
22− platforms = stdenv.lib.platforms.linux;
23− maintainers = with stdenv.lib.maintainers; [ asppsa ];
21+ license = lib.licenses.gpl3Plus;
22+ platforms = lib.platforms.linux;
23+ maintainers = with lib.maintainers; [ asppsa ];
2424 };
2525}
pkgs/development/pure-modules/sql3/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkg-config, pure, sqlite }:
1+{ lib, stdenv, fetchurl, pkg-config, pure, sqlite }:
22
33stdenv.mkDerivation rec {
44 baseName = "sql3";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
1818 meta = {
1919 description = "A SQLite module for the Pure programming language";
2020 homepage = "http://puredocs.bitbucket.org/pure-sql3.html";
21− license = stdenv.lib.licenses.bsd3;
22− platforms = stdenv.lib.platforms.linux;
23− maintainers = with stdenv.lib.maintainers; [ asppsa ];
21+ license = lib.licenses.bsd3;
22+ platforms = lib.platforms.linux;
23+ maintainers = with lib.maintainers; [ asppsa ];
2424 };
2525}
pkgs/development/pure-modules/stldict/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkg-config, pure }:
1+{ lib, stdenv, fetchurl, pkg-config, pure }:
22
33stdenv.mkDerivation rec {
44 baseName = "stldict";
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
2424 meta = {
2525 description = "A Pure interface to the C++ dictionary containers map and unordered_map";
2626 homepage = "http://puredocs.bitbucket.org/pure-stldict.html";
27− license = stdenv.lib.licenses.lgpl3Plus;
28− platforms = stdenv.lib.platforms.linux;
29− maintainers = with stdenv.lib.maintainers; [ asppsa ];
27+ license = lib.licenses.lgpl3Plus;
28+ platforms = lib.platforms.linux;
29+ maintainers = with lib.maintainers; [ asppsa ];
3030 };
3131}
pkgs/development/pure-modules/stllib/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkg-config, pure }:
1+{ lib, stdenv, fetchurl, pkg-config, pure }:
22
33stdenv.mkDerivation rec {
44 baseName = "stllib";
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
2424 meta = {
2525 description = "An “umbrella” package that contains a pair of Pure addons, pure-stlvec and pure-stlmap";
2626 homepage = "http://puredocs.bitbucket.org/pure-stllib.html";
27− license = stdenv.lib.licenses.bsd3;
28− platforms = stdenv.lib.platforms.linux;
29− maintainers = with stdenv.lib.maintainers; [ asppsa ];
27+ license = lib.licenses.bsd3;
28+ platforms = lib.platforms.linux;
29+ maintainers = with lib.maintainers; [ asppsa ];
3030 };
3131}
pkgs/development/pure-modules/tk/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkg-config, pure, tcl, tk, xlibsWrapper }:
1+{ lib, stdenv, fetchurl, pkg-config, pure, tcl, tk, xlibsWrapper }:
22
33stdenv.mkDerivation rec {
44 baseName = "tk";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
1818 meta = {
1919 description = "A basic interface between Pure and Tcl/Tk";
2020 homepage = "http://puredocs.bitbucket.org/pure-tk.html";
21− license = stdenv.lib.licenses.bsd3;
22− platforms = stdenv.lib.platforms.linux;
23− maintainers = with stdenv.lib.maintainers; [ asppsa ];
21+ license = lib.licenses.bsd3;
22+ platforms = lib.platforms.linux;
23+ maintainers = with lib.maintainers; [ asppsa ];
2424 };
2525}
pkgs/development/pure-modules/xml/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkg-config, pure, libxml2, libxslt }:
1+{ lib, stdenv, fetchurl, pkg-config, pure, libxml2, libxslt }:
22
33stdenv.mkDerivation rec {
44 baseName = "xml";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
1818 meta = {
1919 description = "A simplified interface to the Gnome libxml2 and libxslt libraries for Pure";
2020 homepage = "http://puredocs.bitbucket.org/pure-xml.html";
21− license = stdenv.lib.licenses.lgpl3Plus;
22− platforms = stdenv.lib.platforms.linux;
23− maintainers = with stdenv.lib.maintainers; [ asppsa ];
21+ license = lib.licenses.lgpl3Plus;
22+ platforms = lib.platforms.linux;
23+ maintainers = with lib.maintainers; [ asppsa ];
2424 };
2525}
pkgs/development/web/deno/default.nix+1−1
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
3232 # Install completions post-install
3333 nativeBuildInputs = [ installShellFiles ];
3434
35− buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security CoreServices ];
35+ buildInputs = lib.optionals stdenv.isDarwin [ Security CoreServices ];
3636
3737 # The rusty_v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem
3838 # To avoid this we pre-download the file and place it in the locations it will require it in advance
pkgs/development/web/grails/default.nix+3−3
@@ -6,8 +6,8 @@
66}:
77
88let
9− binpath = stdenv.lib.makeBinPath
10− ([ coreutils ncurses gnused gnugrep ] ++ stdenv.lib.optional (jdk != null) jdk);
9+ binpath = lib.makeBinPath
10+ ([ coreutils ncurses gnused gnugrep ] ++ lib.optional (jdk != null) jdk);
1111in
1212stdenv.mkDerivation rec {
1313 pname = "grails";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
2929 rm -f "$out"/bin/*.bat
3030 # Improve purity
3131 sed -i -e '2iPATH=${binpath}:\$PATH' "$out"/bin/grails
32− '' + stdenv.lib.optionalString (jdk != null) ''
32+ '' + lib.optionalString (jdk != null) ''
3333 # Inject JDK path into grails
3434 sed -i -e '2iJAVA_HOME=${jdk.home}' "$out"/bin/grails
3535 '';
pkgs/development/web/insomnia/default.nix+1−1
@@ -6,7 +6,7 @@
66, libudev0-shim, glibc, curl, openssl, autoPatchelfHook }:
77
88let
9− runtimeLibs = stdenv.lib.makeLibraryPath [
9+ runtimeLibs = lib.makeLibraryPath [
1010 curl
1111 glibc
1212 libudev0-shim
pkgs/development/web/kcgi/default.nix+2−2
@@ -3,7 +3,7 @@
33stdenv.mkDerivation rec {
44 pname = "kcgi";
55 version = "0.10.8";
6− underscoreVersion = stdenv.lib.replaceChars ["."] ["_"] version;
6+ underscoreVersion = lib.replaceChars ["."] ["_"] version;
77
88 src = fetchFromGitHub {
99 owner = "kristapsdz";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 '';
1717
1818 nativeBuildInputs = [ pkg-config ];
19− buildInputs = [ ] ++ stdenv.lib.optionals stdenv.isLinux [ libbsd ] ;
19+ buildInputs = [ ] ++ lib.optionals stdenv.isLinux [ libbsd ] ;
2020
2121 dontAddPrefix = true;
2222
pkgs/development/web/kore/default.nix+2−2
@@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
2828 '';
2929
3030 # added to fix build w/gcc7 and clang5
31− NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=pointer-compare"
32− + stdenv.lib.optionalString stdenv.cc.isClang " -Wno-error=unknown-warning-option";
31+ NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=pointer-compare"
32+ + lib.optionalString stdenv.cc.isClang " -Wno-error=unknown-warning-option";
3333
3434 enableParallelBuilding = true;
3535
pkgs/development/web/nodejs/nodejs.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, openssl, python, zlib, libuv, util-linux, http-parser
1+{ lib, stdenv, fetchurl, openssl, python, zlib, libuv, util-linux, http-parser
22, pkg-config, which
33# Updater dependencies
44, writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts, nix, runtimeShell
@@ -7,7 +7,7 @@
77, procps, icu
88}:
99
10−with stdenv.lib;
10+with lib;
1111
1212{ enableNpm ? true, version, sha256, patches ? [] } @args:
1313
pkgs/development/web/nodejs/v10.nix+2−2
@@ -1,4 +1,4 @@
1−{ callPackage, openssl, icu, python2, stdenv, enableNpm ? true }:
1+{ callPackage, openssl, icu, python2, lib, stdenv, enableNpm ? true }:
22
33let
44 buildNodejs = callPackage ./nodejs.nix {
@@ -10,5 +10,5 @@ in
1010 inherit enableNpm;
1111 version = "10.23.1";
1212 sha256 = "1ypddif8jc8qrw9n1f8zbpknjcbnjc9xhpm57hc5nqbrmzsidal8";
13− patches = stdenv.lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
13+ patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
1414 }
pkgs/development/web/nodejs/v12.nix+2−2
@@ -1,4 +1,4 @@
1−{ callPackage, openssl, icu, python2, stdenv, enableNpm ? true }:
1+{ callPackage, openssl, icu, python2, lib, stdenv, enableNpm ? true }:
22
33let
44 buildNodejs = callPackage ./nodejs.nix {
@@ -10,5 +10,5 @@ in
1010 inherit enableNpm;
1111 version = "12.20.1";
1212 sha256 = "0lqq6a2byw4qmig98j45gqnl0593xdhx1dr9k7x2nnvhblrfw3p0";
13− patches = stdenv.lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
13+ patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
1414 }
pkgs/development/web/nodejs/v14.nix+2−2
@@ -1,4 +1,4 @@
1−{ callPackage, openssl, python3, stdenv, enableNpm ? true }:
1+{ callPackage, openssl, python3, lib, stdenv, enableNpm ? true }:
22
33let
44 buildNodejs = callPackage ./nodejs.nix {
@@ -10,5 +10,5 @@ in
1010 inherit enableNpm;
1111 version = "14.15.4";
1212 sha256 = "177cxp4fhmglyx035j8smiy1bp5fz6q2phlcl0a2mdbldkvfrdxd";
13− patches = stdenv.lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
13+ patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
1414 }
pkgs/development/web/postman/default.nix+1−1
@@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
8888 patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" _Postman
8989 for file in $(find . -type f \( -name \*.node -o -name _Postman -o -name \*.so\* \) ); do
9090 ORIGIN=$(patchelf --print-rpath $file); \
91− patchelf --set-rpath "${stdenv.lib.makeLibraryPath buildInputs}:$ORIGIN" $file
91+ patchelf --set-rpath "${lib.makeLibraryPath buildInputs}:$ORIGIN" $file
9292 done
9393 popd
9494 '';
pkgs/development/web/remarkjs/default.nix+2−2
@@ -63,8 +63,8 @@ in stdenv.mkDerivation rec {
6363 homepage = "https://remarkjs.com";
6464 description = "A simple, in-browser, markdown-driven slideshow tool";
6565 maintainers = [];
66− platforms = stdenv.lib.platforms.linux;
67− license = stdenv.lib.licenses.mit;
66+ platforms = lib.platforms.linux;
67+ license = lib.licenses.mit;
6868 broken = true;
6969 };
7070}
pkgs/development/web/twitter-bootstrap/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, unzip }:
1+{ lib, stdenv, fetchurl, unzip }:
22
33stdenv.mkDerivation rec {
44 pname = "bootstrap";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020 meta = {
2121 description = "Front-end framework for faster and easier web development";
2222 homepage = "https://getbootstrap.com/";
23− license = stdenv.lib.licenses.mit;
23+ license = lib.licenses.mit;
2424 };
2525
2626}
pkgs/development/web/woff2/default.nix+2−2
@@ -16,14 +16,14 @@ stdenv.mkDerivation rec {
1616 outputs = [ "out" "dev" "lib" ];
1717
1818 # Need to explicitly link to brotlicommon
19− patches = stdenv.lib.optional static ./brotli-static.patch;
19+ patches = lib.optional static ./brotli-static.patch;
2020
2121 nativeBuildInputs = [ cmake pkg-config ];
2222
2323 cmakeFlags = [
2424 "-DCANONICAL_PREFIXES=ON"
2525 "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}"
26− ] ++ stdenv.lib.optional static "-DCMAKE_SKIP_RPATH:BOOL=TRUE";
26+ ] ++ lib.optional static "-DCMAKE_SKIP_RPATH:BOOL=TRUE";
2727
2828 propagatedBuildInputs = [ brotli ];
2929
pkgs/development/web/xmlindent/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, flex }:
1+{ lib, stdenv, fetchurl, flex }:
22
33stdenv.mkDerivation rec {
44 pname = "xmlindent";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
1818 meta = {
1919 description = "XML stream reformatter";
2020 homepage = "http://xmlindent.sourceforge.net/";
21− license = stdenv.lib.licenses.gpl3;
22− platforms = stdenv.lib.platforms.linux;
21+ license = lib.licenses.gpl3;
22+ platforms = lib.platforms.linux;
2323 maintainers = [ ];
2424 };
2525}
pkgs/top-level/all-packages.nix+3−3
@@ -16152,7 +16152,7 @@ in
1615216152 qt512 = recurseIntoAttrs (makeOverridable
1615316153 (import ../development/libraries/qt-5/5.12) {
1615416154 inherit newScope;
16155− inherit stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper;
16155+ inherit lib stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper;
1615616156 inherit bison;
1615716157 inherit cups;
1615816158 inherit dconf;
@@ -16167,7 +16167,7 @@ in
1616716167 qt514 = recurseIntoAttrs (makeOverridable
1616816168 (import ../development/libraries/qt-5/5.14) {
1616916169 inherit newScope;
16170− inherit stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper;
16170+ inherit lib stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper;
1617116171 inherit bison;
1617216172 inherit cups;
1617316173 inherit dconf;
@@ -16182,7 +16182,7 @@ in
1618216182 qt515 = recurseIntoAttrs (makeOverridable
1618316183 (import ../development/libraries/qt-5/5.15) {
1618416184 inherit newScope;
16185− inherit stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper;
16185+ inherit lib stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper;
1618616186 inherit bison;
1618716187 inherit cups;
1618816188 inherit dconf;