summaryrefslogtreecommitdiffstats
path: root/pkgs/development
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/compilers/chicken/4/fetchegg/default.nix4
-rw-r--r--pkgs/development/compilers/chicken/5/fetchegg/default.nix4
-rw-r--r--pkgs/development/compilers/open-watcom-bin/default.nix4
-rw-r--r--pkgs/development/libraries/gcc/libgcc/default.nix4
-rw-r--r--pkgs/development/libraries/relibc/default.nix8
-rw-r--r--pkgs/development/libraries/science/math/mkl/default.nix9
-rw-r--r--pkgs/development/lisp-modules/asdf/2.26.nix10
-rw-r--r--pkgs/development/lisp-modules/asdf/3.1.nix10
-rw-r--r--pkgs/development/lisp-modules/asdf/default.nix10
-rw-r--r--pkgs/development/lisp-modules/clwrapper/default.nix4
-rw-r--r--pkgs/development/lisp-modules/define-package.nix4
-rw-r--r--pkgs/development/lisp-modules/lisp-packages.nix4
-rw-r--r--pkgs/development/lisp-modules/quicklisp-to-nix.nix4
-rw-r--r--pkgs/development/misc/msp430/gcc-support.nix4
14 files changed, 42 insertions, 41 deletions
diff --git a/pkgs/development/compilers/chicken/4/fetchegg/default.nix b/pkgs/development/compilers/chicken/4/fetchegg/default.nix
index d4d33a5593c3..23c5760b4bce 100644
--- a/pkgs/development/compilers/chicken/4/fetchegg/default.nix
+++ b/pkgs/development/compilers/chicken/4/fetchegg/default.nix
@@ -1,7 +1,7 @@
# Fetches a chicken egg from henrietta using `chicken-install -r'
# See: http://wiki.call-cc.org/chicken-projects/egg-index-4.html
-{ stdenvNoCC, chicken }:
+{ lib, stdenvNoCC, chicken }:
{ name, version, md5 ? "", sha256 ? "" }:
if md5 != "" then
@@ -20,6 +20,6 @@ stdenvNoCC.mkDerivation {
eggName = name;
- impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars;
+ impureEnvVars = lib.fetchers.proxyImpureEnvVars;
}
diff --git a/pkgs/development/compilers/chicken/5/fetchegg/default.nix b/pkgs/development/compilers/chicken/5/fetchegg/default.nix
index 24bfbd7a30f4..08d23cbaa616 100644
--- a/pkgs/development/compilers/chicken/5/fetchegg/default.nix
+++ b/pkgs/development/compilers/chicken/5/fetchegg/default.nix
@@ -1,7 +1,7 @@
# Fetches a chicken egg from henrietta using `chicken-install -r'
# See: http://wiki.call-cc.org/chicken-projects/egg-index-5.html
-{ stdenvNoCC, chicken }:
+{ lib, stdenvNoCC, chicken }:
{ name, version, md5 ? "", sha256 ? "" }:
if md5 != "" then
@@ -20,6 +20,6 @@ stdenvNoCC.mkDerivation {
eggName = name;
- impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars;
+ impureEnvVars = lib.fetchers.proxyImpureEnvVars;
}
diff --git a/pkgs/development/compilers/open-watcom-bin/default.nix b/pkgs/development/compilers/open-watcom-bin/default.nix
index a9c6b221065c..9a1066dd3c25 100644
--- a/pkgs/development/compilers/open-watcom-bin/default.nix
+++ b/pkgs/development/compilers/open-watcom-bin/default.nix
@@ -1,4 +1,4 @@
-{ stdenvNoCC, fetchurl, qemu, expect, writeScript, writeScriptBin, ncurses, bash, coreutils }:
+{ lib, stdenvNoCC, fetchurl, qemu, expect, writeScript, writeScriptBin, ncurses, bash, coreutils }:
let
@@ -112,7 +112,7 @@ stdenvNoCC.mkDerivation rec {
done
'';
- meta = with stdenvNoCC.lib; {
+ meta = with lib; {
description = "A C/C++ Compiler (binary distribution)";
homepage = "http://www.openwatcom.org/";
license = licenses.watcom;
diff --git a/pkgs/development/libraries/gcc/libgcc/default.nix b/pkgs/development/libraries/gcc/libgcc/default.nix
index f579da5f1d6c..ab62fdf3fa20 100644
--- a/pkgs/development/libraries/gcc/libgcc/default.nix
+++ b/pkgs/development/libraries/gcc/libgcc/default.nix
@@ -1,4 +1,4 @@
-{ stdenvNoLibs, buildPackages
+{ lib, stdenvNoLibs, buildPackages
, gcc, glibc
, libiberty
}:
@@ -128,7 +128,7 @@ stdenvNoLibs.mkDerivation rec {
"--disable-vtable-verify"
"--with-system-zlib"
- ] ++ stdenvNoLibs.lib.optional (stdenvNoLibs.hostPlatform.libc == "glibc")
+ ] ++ lib.optional (stdenvNoLibs.hostPlatform.libc == "glibc")
"--with-glibc-version=${glibc.version}";
configurePlatforms = [ "build" "host" ];
diff --git a/pkgs/development/libraries/relibc/default.nix b/pkgs/development/libraries/relibc/default.nix
index cedffcaaef9f..5f27f902fa9b 100644
--- a/pkgs/development/libraries/relibc/default.nix
+++ b/pkgs/development/libraries/relibc/default.nix
@@ -1,7 +1,7 @@
-{ stdenvNoCC, buildPackages, makeRustPlatform }:
+{ lib, stdenvNoCC, buildPackages, makeRustPlatform }:
let
- rpath = stdenvNoCC.lib.makeLibraryPath [
+ rpath = lib.makeLibraryPath [
buildPackages.stdenv.cc.libc
"$out"
];
@@ -30,7 +30,7 @@ let
"{}" \;
'';
- meta.platforms = with stdenvNoCC.lib; platforms.redox ++ platforms.linux;
+ meta.platforms = with lib; platforms.redox ++ platforms.linux;
};
redoxRustPlatform = buildPackages.makeRustPlatform {
@@ -68,7 +68,7 @@ redoxRustPlatform.buildRustPackage rec {
cargoSha256 = "1fzz7ba3ga57x1cbdrcfrdwwjr70nh4skrpxp4j2gak2c3scj6rz";
- meta = with stdenvNoCC.lib; {
+ meta = with lib; {
homepage = "https://gitlab.redox-os.org/redox-os/relibc";
description = "C Library in Rust for Redox and Linux";
license = licenses.mit;
diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix
index b631def3bb2e..34fea3162a9c 100644
--- a/pkgs/development/libraries/science/math/mkl/default.nix
+++ b/pkgs/development/libraries/science/math/mkl/default.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
, callPackage
, stdenvNoCC
, fetchurl
@@ -135,7 +136,7 @@ in stdenvNoCC.mkDerivation {
ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libcblas${shlibExt}
ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapack${shlibExt}
ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapacke${shlibExt}
- '' + stdenvNoCC.lib.optionalString stdenvNoCC.hostPlatform.isLinux ''
+ '' + lib.optionalString stdenvNoCC.hostPlatform.isLinux ''
ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libblas${shlibExt}".3"
ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libcblas${shlibExt}".3"
ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapack${shlibExt}".3"
@@ -145,7 +146,7 @@ in stdenvNoCC.mkDerivation {
# fixDarwinDylibName fails for libmkl_cdft_core.dylib because the
# larger updated load commands do not fit. Use install_name_tool
# explicitly and ignore the error.
- postFixup = stdenvNoCC.lib.optionalString stdenvNoCC.isDarwin ''
+ postFixup = lib.optionalString stdenvNoCC.isDarwin ''
for f in $out/lib/*.dylib; do
install_name_tool -id $out/lib/$(basename $f) $f || true
done
@@ -160,7 +161,7 @@ in stdenvNoCC.mkDerivation {
passthru.tests.pkg-config = callPackage ./test { };
- meta = with stdenvNoCC.lib; {
+ meta = with lib; {
description = "Intel Math Kernel Library";
longDescription = ''
Intel Math Kernel Library (Intel MKL) optimizes code with minimal effort
diff --git a/pkgs/development/lisp-modules/asdf/2.26.nix b/pkgs/development/lisp-modules/asdf/2.26.nix
index 41b971ebae28..e2f655a5b6ea 100644
--- a/pkgs/development/lisp-modules/asdf/2.26.nix
+++ b/pkgs/development/lisp-modules/asdf/2.26.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, texinfo, texLive, perl}:
+{lib, stdenv, fetchurl, texinfo, texLive, perl}:
let
s = # Generated upstream information
rec {
@@ -31,11 +31,11 @@ stdenv.mkDerivation {
cp -r doc/* "$out"/share/doc/asdf/
ln -s "$out"/lib/common-lisp/{asdf/uiop,uiop}
'';
- meta = {
+ meta = with lib; {
inherit (s) version;
description = "Standard software-system definition library for Common Lisp";
- license = stdenv.lib.licenses.mit ;
- maintainers = [stdenv.lib.maintainers.raskin];
- platforms = stdenv.lib.platforms.linux;
+ license = licenses.mit;
+ maintainers = [maintainers.raskin];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/development/lisp-modules/asdf/3.1.nix b/pkgs/development/lisp-modules/asdf/3.1.nix
index 9149155fb2f2..7e697d3a6376 100644
--- a/pkgs/development/lisp-modules/asdf/3.1.nix
+++ b/pkgs/development/lisp-modules/asdf/3.1.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, texinfo, texLive, perl}:
+{lib, stdenv, fetchurl, texinfo, texLive, perl}:
let
s = # Generated upstream information
rec {
@@ -30,11 +30,11 @@ stdenv.mkDerivation {
cp -r doc/* "$out"/share/doc/asdf/
ln -s "$out"/lib/common-lisp/{asdf/uiop,uiop}
'';
- meta = {
+ meta = with lib; {
inherit (s) version;
description = "Standard software-system definition library for Common Lisp";
- license = stdenv.lib.licenses.mit ;
- maintainers = [stdenv.lib.maintainers.raskin];
- platforms = stdenv.lib.platforms.unix;
+ license = licenses.mit ;
+ maintainers = [maintainers.raskin];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/lisp-modules/asdf/default.nix b/pkgs/development/lisp-modules/asdf/default.nix
index 579788194473..eecea3f98b63 100644
--- a/pkgs/development/lisp-modules/asdf/default.nix
+++ b/pkgs/development/lisp-modules/asdf/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, texinfo, texLive, perl}:
+{lib, stdenv, fetchurl, texinfo, texLive, perl}:
let
s = # Generated upstream information
rec {
@@ -31,11 +31,11 @@ stdenv.mkDerivation {
cp -r doc/* "$out"/share/doc/asdf/
ln -s "$out"/lib/common-lisp/{asdf/uiop,uiop}
'';
- meta = {
+ meta = with lib; {
inherit (s) version;
description = "Standard software-system definition library for Common Lisp";
- license = stdenv.lib.licenses.mit ;
- maintainers = [stdenv.lib.maintainers.raskin];
- platforms = stdenv.lib.platforms.unix;
+ license = licenses.mit ;
+ maintainers = [maintainers.raskin];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/lisp-modules/clwrapper/default.nix b/pkgs/development/lisp-modules/clwrapper/default.nix
index 821fe8920484..69872eb41af6 100644
--- a/pkgs/development/lisp-modules/clwrapper/default.nix
+++ b/pkgs/development/lisp-modules/clwrapper/default.nix
@@ -1,4 +1,4 @@
-{stdenv, asdf, which, bash, lisp ? null}:
+{lib, stdenv, asdf, which, bash, lisp ? null}:
stdenv.mkDerivation {
name = "cl-wrapper-script";
@@ -52,6 +52,6 @@ stdenv.mkDerivation {
meta = {
description = "Script used to wrap Common Lisp implementations";
- maintainers = [stdenv.lib.maintainers.raskin];
+ maintainers = [lib.maintainers.raskin];
};
}
diff --git a/pkgs/development/lisp-modules/define-package.nix b/pkgs/development/lisp-modules/define-package.nix
index 96ceb76f6f22..ca969ab2327d 100644
--- a/pkgs/development/lisp-modules/define-package.nix
+++ b/pkgs/development/lisp-modules/define-package.nix
@@ -1,4 +1,4 @@
-args @ {stdenv, clwrapper, baseName, packageName ? baseName
+args @ {lib, stdenv, clwrapper, baseName, packageName ? baseName
, parasites ? []
, buildSystems ? ([packageName] ++ parasites)
, version ? "latest"
@@ -89,7 +89,7 @@ basePackage = {
env -i \
NIX_LISP="$NIX_LISP" \
NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(progn
- ${stdenv.lib.concatMapStrings (system: ''
+ ${lib.concatMapStrings (system: ''
(asdf:compile-system :${system})
(asdf:load-system :${system})
(asdf:operate (quote asdf::compile-bundle-op) :${system})
diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index 63b9540522ec..831edcaee279 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -1,6 +1,6 @@
-{stdenv, clwrapper, pkgs, sbcl, coreutils, nix, asdf}:
+{lib, stdenv, clwrapper, pkgs, sbcl, coreutils, nix, asdf}:
let lispPackages = rec {
- inherit pkgs clwrapper stdenv;
+ inherit lib pkgs clwrapper stdenv;
nixLib = pkgs.lib;
callPackage = nixLib.callPackageWith lispPackages;
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
index cbaa13af9624..df6d908ba9d0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
@@ -1,6 +1,6 @@
-{stdenv, fetchurl, pkgs, clwrapper}:
+{lib, stdenv, fetchurl, pkgs, clwrapper}:
let quicklisp-to-nix-packages = rec {
- inherit stdenv fetchurl clwrapper pkgs quicklisp-to-nix-packages;
+ inherit lib stdenv fetchurl clwrapper pkgs quicklisp-to-nix-packages;
callPackage = pkgs.lib.callPackageWith quicklisp-to-nix-packages;
buildLispPackage = callPackage ./define-package.nix;
diff --git a/pkgs/development/misc/msp430/gcc-support.nix b/pkgs/development/misc/msp430/gcc-support.nix
index e9ed959c2fd0..fa143173c70c 100644
--- a/pkgs/development/misc/msp430/gcc-support.nix
+++ b/pkgs/development/misc/msp430/gcc-support.nix
@@ -1,4 +1,4 @@
-{ stdenvNoCC, fetchzip }:
+{ lib, stdenvNoCC, fetchzip }:
let
mspgccVersion = "6_1_1_0";
@@ -19,7 +19,7 @@ in stdenvNoCC.mkDerivation rec {
touch $out/lib/lib
'';
- meta = with stdenvNoCC.lib; {
+ meta = with lib; {
description = ''
Development headers and linker scripts for TI MSP430 microcontrollers
'';
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-06 23:41:46 +0000