diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2021-01-23 10:43:20 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-23 10:43:20 +0100 |
commit | 3698438873a314899ea8af763aa28577b2794fd5 (patch) | |
tree | 25116119adaa84b8df83c7760459411cd58f45ab /pkgs/development | |
parent | 4affc40a50dbabf2216176307a507b9225e01be7 (diff) | |
parent | f9c6e07c67e9196ed1f134b604c5683167a829e0 (diff) | |
download | nixlib-3698438873a314899ea8af763aa28577b2794fd5.tar nixlib-3698438873a314899ea8af763aa28577b2794fd5.tar.gz nixlib-3698438873a314899ea8af763aa28577b2794fd5.tar.bz2 nixlib-3698438873a314899ea8af763aa28577b2794fd5.tar.lz nixlib-3698438873a314899ea8af763aa28577b2794fd5.tar.xz nixlib-3698438873a314899ea8af763aa28577b2794fd5.tar.zst nixlib-3698438873a314899ea8af763aa28577b2794fd5.zip |
Merge pull request #110572 from doronbehar/stdenv/no-stdenv.lib
treewide: Remove usages of stdenv.lib by @doronbehar
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/interpreters/octave/default.nix | 45 | ||||
-rw-r--r-- | pkgs/development/libraries/comedilib/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/libraries/cpp-utilities/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/libraries/liberio/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/libraries/qrupdate/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/libraries/qtutilities/default.nix | 10 | ||||
-rw-r--r-- | pkgs/development/libraries/tweeny/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/tools/misc/sccache/default.nix | 16 |
8 files changed, 55 insertions, 31 deletions
diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 7dedf79c340f..6ad25d24eae6 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -1,4 +1,5 @@ { stdenv +, lib # Note: either stdenv.mkDerivation or, for octaveFull, the qt-5 mkDerivation # with wrapQtAppsHook (comes from libsForQt5.callPackage) , mkDerivation @@ -124,21 +125,21 @@ in mkDerivation rec { libwebp gl2ps ] - ++ stdenv.lib.optionals enableQt [ + ++ lib.optionals enableQt [ qtbase qtsvg qscintilla ] - ++ stdenv.lib.optionals (ghostscript != null) [ ghostscript ] - ++ stdenv.lib.optionals (hdf5 != null) [ hdf5 ] - ++ stdenv.lib.optionals (glpk != null) [ glpk ] - ++ stdenv.lib.optionals (suitesparse != null) [ suitesparse' ] - ++ stdenv.lib.optionals (enableJava) [ jdk ] - ++ stdenv.lib.optionals (sundials != null) [ sundials ] - ++ stdenv.lib.optionals (gnuplot != null) [ gnuplot ] - ++ stdenv.lib.optionals (python != null) [ python ] - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libGL libGLU libX11 ] - ++ stdenv.lib.optionals stdenv.isDarwin [ + ++ lib.optionals (ghostscript != null) [ ghostscript ] + ++ lib.optionals (hdf5 != null) [ hdf5 ] + ++ lib.optionals (glpk != null) [ glpk ] + ++ lib.optionals (suitesparse != null) [ suitesparse' ] + ++ lib.optionals (enableJava) [ jdk ] + ++ lib.optionals (sundials != null) [ sundials ] + ++ lib.optionals (gnuplot != null) [ gnuplot ] + ++ lib.optionals (python != null) [ python ] + ++ lib.optionals (!stdenv.isDarwin) [ libGL libGLU libX11 ] + ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Accelerate darwin.apple_sdk.frameworks.Cocoa @@ -152,9 +153,9 @@ in mkDerivation rec { fftwSinglePrec texinfo ] - ++ stdenv.lib.optionals (sundials != null) [ sundials ] - ++ stdenv.lib.optionals enableJIT [ llvm ] - ++ stdenv.lib.optionals enableQt [ + ++ lib.optionals (sundials != null) [ sundials ] + ++ lib.optionals enableJIT [ llvm ] + ++ lib.optionals enableQt [ qtscript qttools ] @@ -172,11 +173,11 @@ in mkDerivation rec { "--with-lapack=lapack" (if use64BitIdx then "--enable-64" else "--disable-64") ] - ++ stdenv.lib.optionals stdenv.isDarwin [ "--enable-link-all-dependencies" ] - ++ stdenv.lib.optionals enableReadline [ "--enable-readline" ] - ++ stdenv.lib.optionals stdenv.isDarwin [ "--with-x=no" ] - ++ stdenv.lib.optionals enableQt [ "--with-qt=5" ] - ++ stdenv.lib.optionals enableJIT [ "--enable-jit" ] + ++ lib.optionals stdenv.isDarwin [ "--enable-link-all-dependencies" ] + ++ lib.optionals enableReadline [ "--enable-readline" ] + ++ lib.optionals stdenv.isDarwin [ "--with-x=no" ] + ++ lib.optionals enableQt [ "--with-qt=5" ] + ++ lib.optionals enableJIT [ "--enable-jit" ] ; # Keep a copy of the octave tests detailed results in the output @@ -198,13 +199,13 @@ in mkDerivation rec { meta = { homepage = "https://www.gnu.org/software/octave/"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ raskin doronbehar ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ raskin doronbehar ]; description = "Scientific Pragramming Language"; # https://savannah.gnu.org/bugs/?func=detailitem&item_id=56425 is the best attempt to fix JIT broken = enableJIT; platforms = if overridePlatforms == null then - (with stdenv.lib; platforms.linux ++ platforms.darwin) + (lib.platforms.linux ++ lib.platforms.darwin) else overridePlatforms; }; } diff --git a/pkgs/development/libraries/comedilib/default.nix b/pkgs/development/libraries/comedilib/default.nix index e42f02407d4b..fef22dea06ae 100644 --- a/pkgs/development/libraries/comedilib/default.nix +++ b/pkgs/development/libraries/comedilib/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitHub , autoreconfHook , flex diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index 38879342f7a7..cec6feded139 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitHub , fetchpatch , cmake diff --git a/pkgs/development/libraries/liberio/default.nix b/pkgs/development/libraries/liberio/default.nix index 7a40c1a83da5..743455b836d5 100644 --- a/pkgs/development/libraries/liberio/default.nix +++ b/pkgs/development/libraries/liberio/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitHub , autoreconfHook , systemd diff --git a/pkgs/development/libraries/qrupdate/default.nix b/pkgs/development/libraries/qrupdate/default.nix index 3e4109b1bf0b..ad7e88d4647e 100644 --- a/pkgs/development/libraries/qrupdate/default.nix +++ b/pkgs/development/libraries/qrupdate/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , gfortran , blas diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix index c44e8f4fd873..831c51fa234d 100644 --- a/pkgs/development/libraries/qtutilities/default.nix +++ b/pkgs/development/libraries/qtutilities/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, cpp-utilities, qttools, qtbase, cmake, pkg-config }: +{ stdenv +, lib +, fetchFromGitHub +, cpp-utilities +, qttools +, qtbase +, cmake +, pkg-config +}: stdenv.mkDerivation rec { pname = "qtutilities"; diff --git a/pkgs/development/libraries/tweeny/default.nix b/pkgs/development/libraries/tweeny/default.nix index c1737f6f017a..8340e47fbf9b 100644 --- a/pkgs/development/libraries/tweeny/default.nix +++ b/pkgs/development/libraries/tweeny/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitHub , cmake }: diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix index 9c4fa7089104..c68a1c1547cc 100644 --- a/pkgs/development/tools/misc/sccache/default.nix +++ b/pkgs/development/tools/misc/sccache/default.nix @@ -1,4 +1,14 @@ -{ stdenv, fetchFromGitHub, cargo, rustc, rustPlatform, pkg-config, glib, openssl, darwin }: +{ stdenv +, lib +, fetchFromGitHub +, cargo +, rustc +, rustPlatform +, pkg-config +, glib +, openssl +, darwin +}: rustPlatform.buildRustPackage rec { version = "0.2.14"; @@ -18,12 +28,12 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ openssl - ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; # Tests fail because of client server setup which is not possible inside the pure environment, # see https://github.com/mozilla/sccache/issues/460 checkPhase = null; - meta = with stdenv.lib; { + meta = with lib; { description = "Ccache with Cloud Storage"; homepage = "https://github.com/mozilla/sccache"; maintainers = with maintainers; [ doronbehar ]; |