diff options
author | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-24 00:15:07 +0700 |
---|---|---|
committer | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-24 00:16:29 +0700 |
commit | 2f78ee7e816ae39f86bae2e6c61b2d14d3fe3ff4 (patch) | |
tree | fd273f1e48a30237aa9b96342f6324757a4ca09f /pkgs/development/misc | |
parent | ec334a1b01c491faa3463c96717b71921dddef2c (diff) |
pkgs/development: stdenv.lib -> lib
Diffstat (limited to 'pkgs/development/misc')
10 files changed, 28 insertions, 28 deletions
diff --git a/pkgs/development/misc/avr8-burn-omat/default.nix b/pkgs/development/misc/avr8-burn-omat/default.nix index 1f504ac280e88..0a9d666f8b7f3 100644 --- a/pkgs/development/misc/avr8-burn-omat/default.nix +++ b/pkgs/development/misc/avr8-burn-omat/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = with lib; { description = "GUI tool for avrdude"; homepage = "http://avr8-burn-o-mat.aaabbb.de/avr8_burn_o_mat_avrdude_gui_en.html"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; platforms = platforms.all; }; } diff --git a/pkgs/development/misc/google-clasp/default.nix b/pkgs/development/misc/google-clasp/default.nix index 1e138aaa8f7e7..12598e9fd86cf 100644 --- a/pkgs/development/misc/google-clasp/default.nix +++ b/pkgs/development/misc/google-clasp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs }: +{ lib, stdenv, pkgs }: let version = "2.2.1"; in @@ -12,8 +12,8 @@ in meta = { description = "Command Line tool for Google Apps Script Projects"; homepage = "https://developers.google.com/apps-script/guides/clasp"; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.michojel ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.michojel ]; priority = 100; }; } diff --git a/pkgs/development/misc/haskell/hasura/ci-info/default.nix b/pkgs/development/misc/haskell/hasura/ci-info/default.nix index 53c85a2e5ba19..55b070a9f7730 100644 --- a/pkgs/development/misc/haskell/hasura/ci-info/default.nix +++ b/pkgs/development/misc/haskell/hasura/ci-info/default.nix @@ -1,5 +1,5 @@ { mkDerivation, aeson, aeson-casing, base, fetchgit, hashable -, hpack, stdenv, template-haskell, text, th-lift-instances +, hpack, lib, stdenv, template-haskell, text, th-lift-instances , unordered-containers }: mkDerivation { @@ -18,5 +18,5 @@ mkDerivation { libraryToolDepends = [ hpack ]; prePatch = "hpack"; homepage = "https://github.com/hasura/ci-info-hs#readme"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; } diff --git a/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix b/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix index 055459514e444..3cf840c15e15f 100644 --- a/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix +++ b/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix @@ -13,7 +13,7 @@ , optparse-applicative, pem, pg-client, postgresql-binary , postgresql-libpq, process, profunctors, psqueues, QuickCheck , regex-tdfa, safe, scientific, semver, shakespeare, split -, Spock-core, stdenv, stm, stm-containers, template-haskell, text +, Spock-core, lib, stdenv, stm, stm-containers, template-haskell, text , text-builder, text-conversions, th-lift-instances, these, time , transformers, transformers-base, unix, unordered-containers , uri-encode, uuid, vector, wai, wai-websockets, warp, websockets @@ -68,8 +68,8 @@ mkDerivation { doCheck = false; homepage = "https://www.hasura.io"; description = "GraphQL API over Postgres"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ offline ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ offline ]; hydraPlatforms = []; broken = true; } diff --git a/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix b/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix index 991b5384d5c21..82314a7485ba4 100644 --- a/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix +++ b/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix @@ -1,6 +1,6 @@ { mkDerivation, aeson, attoparsec, base, bytestring, containers , criterion, fetchgit, filepath, hedgehog, hpack, prettyprinter -, protolude, regex-tdfa, scientific, stdenv, template-haskell, text +, protolude, regex-tdfa, scientific, lib, stdenv, template-haskell, text , text-builder, th-lift-instances, unordered-containers, vector }: mkDerivation { @@ -32,5 +32,5 @@ mkDerivation { doCheck = false; prePatch = "hpack"; homepage = "https://github.com/hasura/graphql-parser-hs#readme"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; } diff --git a/pkgs/development/misc/haskell/hasura/pg-client/default.nix b/pkgs/development/misc/haskell/hasura/pg-client/default.nix index 725e5e7f64084..aa780abd8e99d 100644 --- a/pkgs/development/misc/haskell/hasura/pg-client/default.nix +++ b/pkgs/development/misc/haskell/hasura/pg-client/default.nix @@ -2,7 +2,7 @@ , criterion, fetchgit, file-embed, hashable, hashtables, hasql , hasql-pool, hasql-transaction, monad-control, mtl , postgresql-binary, postgresql-libpq, resource-pool, retry -, scientific, stdenv, template-haskell, text, text-builder, th-lift +, scientific, lib, stdenv, template-haskell, text, text-builder, th-lift , th-lift-instances, time, transformers-base, uuid, vector }: mkDerivation { @@ -26,5 +26,5 @@ mkDerivation { hasql-transaction mtl postgresql-libpq text text-builder ]; homepage = "https://github.com/hasura/platform"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; } diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix index 33de722baa242..74b5ca09d2a25 100644 --- a/pkgs/development/misc/loc/default.nix +++ b/pkgs/development/misc/loc/default.nix @@ -18,8 +18,8 @@ buildRustPackage rec { meta = with lib; { homepage = "https://github.com/cgag/loc"; description = "Count lines of code quickly"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/misc/msp430/mspdebug.nix b/pkgs/development/misc/msp430/mspdebug.nix index f8616ff0bc4f1..122b3cec4b72c 100644 --- a/pkgs/development/misc/msp430/mspdebug.nix +++ b/pkgs/development/misc/msp430/mspdebug.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin pkg-config - ++ stdenv.lib.optional (enableMspds && stdenv.isLinux) autoPatchelfHook; + nativeBuildInputs = lib.optional stdenv.isDarwin pkg-config + ++ lib.optional (enableMspds && stdenv.isLinux) autoPatchelfHook; buildInputs = [ libusb-compat-0_1 ] - ++ stdenv.lib.optional stdenv.isDarwin hidapi - ++ stdenv.lib.optional enableReadline readline; + ++ lib.optional stdenv.isDarwin hidapi + ++ lib.optional enableReadline readline; - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' # TODO: remove once a new 0.26+ release is made substituteInPlace drivers/tilib_api.c --replace .so ${stdenv.hostPlatform.extensions.sharedLibrary} @@ -40,8 +40,8 @@ stdenv.mkDerivation rec { ''; # TODO: wrap with MSPDEBUG_TILIB_PATH env var instead of these rpath fixups in 0.26+ - runtimeDependencies = stdenv.lib.optional enableMspds mspds; - postFixup = stdenv.lib.optionalString (enableMspds && stdenv.isDarwin) '' + runtimeDependencies = lib.optional enableMspds mspds; + postFixup = lib.optionalString (enableMspds && stdenv.isDarwin) '' # autoPatchelfHook only works on linux so... for dep in $runtimeDependencies; do install_name_tool -add_rpath $dep/lib $out/bin/$pname @@ -50,8 +50,8 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" "INSTALL=install" ]; makeFlags = [ "UNAME_S=$(unameS)" ] ++ - stdenv.lib.optional (!enableReadline) "WITHOUT_READLINE=1"; - unameS = stdenv.lib.optionalString stdenv.isDarwin "Darwin"; + lib.optional (!enableReadline) "WITHOUT_READLINE=1"; + unameS = lib.optionalString stdenv.isDarwin "Darwin"; meta = with lib; { description = "A free programmer, debugger, and gdb proxy for MSP430 MCUs"; diff --git a/pkgs/development/misc/resholve/deps.nix b/pkgs/development/misc/resholve/deps.nix index 9be283e493356..86bcba5707590 100644 --- a/pkgs/development/misc/resholve/deps.nix +++ b/pkgs/development/misc/resholve/deps.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , python27Packages , fetchFromGitHub , makeWrapper @@ -106,12 +106,12 @@ rec { _NIX_SHELL_LIBCMARK = "${cmark}/lib/libcmark${stdenv.hostPlatform.extensions.sharedLibrary}"; # See earlier note on glibcLocales - LOCALE_ARCHIVE = stdenv.lib.optionalString (stdenv.buildPlatform.libc == "glibc") "${glibcLocales}/lib/locale/locale-archive"; + LOCALE_ARCHIVE = lib.optionalString (stdenv.buildPlatform.libc == "glibc") "${glibcLocales}/lib/locale/locale-archive"; meta = { description = "A new unix shell"; homepage = "https://www.oilshell.org/"; - license = with stdenv.lib.licenses; [ + license = with lib.licenses; [ psfl # Includes a portion of the python interpreter and standard library asl20 # Licence for Oil itself ]; diff --git a/pkgs/development/misc/yelp-tools/default.nix b/pkgs/development/misc/yelp-tools/default.nix index fae1c1731ae0e..9d5eb2af49687 100644 --- a/pkgs/development/misc/yelp-tools/default.nix +++ b/pkgs/development/misc/yelp-tools/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/yelp-tools/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/yelp-tools/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1c045c794sm83rrjan67jmsk20qacrw1m814p4nw85w5xsry8z30"; }; |