b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #110913 from siraben/other-stdenv-lib

Browse source
This commit is contained in:
Sandro 2021-01-27 10:13:05 +01:00 committed by GitHub
parent b58f10c3ba 36c91cea1d
commit 2ee93d61ad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 69 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/tests/vault-postgresql.nix
View file

@ -8,7 +8,7 @@
import ./make-test-python.nix ({ pkgs, ... }: import ./make-test-python.nix ({ pkgs, ... }:
{ {
name = "vault-postgresql"; name = "vault-postgresql";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ lnl7 roberth ]; maintainers = [ lnl7 roberth ];
}; };
machine = { lib, pkgs, ... }: { machine = { lib, pkgs, ... }: {

8
pkgs/build-support/fetchgit/default.nix
View file

@ -1,6 +1,6 @@
{stdenvNoCC, git, git-lfs, cacert}: let {lib, stdenvNoCC, git, git-lfs, cacert}: let
urlToName = url: rev: let urlToName = url: rev: let
inherit (stdenvNoCC.lib) removeSuffix splitString last; inherit (lib) removeSuffix splitString last;
base = last (splitString ":" (baseNameOf (removeSuffix "/" url))); base = last (splitString ":" (baseNameOf (removeSuffix "/" url)));
matched = builtins.match "(.*).git" base; matched = builtins.match "(.*).git" base;
@ -56,7 +56,7 @@ stdenvNoCC.mkDerivation {
fetcher = ./nix-prefetch-git; # This must be a string to ensure it's called with bash. fetcher = ./nix-prefetch-git; # This must be a string to ensure it's called with bash.
nativeBuildInputs = [ git ] nativeBuildInputs = [ git ]
++ stdenvNoCC.lib.optionals fetchLFS [ git-lfs ]; ++ lib.optionals fetchLFS [ git-lfs ];
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";
outputHashMode = "recursive"; outputHashMode = "recursive";
@ -66,7 +66,7 @@ stdenvNoCC.mkDerivation {
GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";
impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars ++ [ impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [
"GIT_PROXY_COMMAND" "SOCKS_SERVER" "GIT_PROXY_COMMAND" "SOCKS_SERVER"
]; ];

4
pkgs/build-support/fetchhg/default.nix
View file

@ -1,4 +1,4 @@
{ stdenvNoCC, mercurial }: { lib, stdenvNoCC, mercurial }:
{ name ? null { name ? null
, url , url
, rev ? null , rev ? null
@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation {
builder = ./builder.sh; builder = ./builder.sh;
nativeBuildInputs = [mercurial]; nativeBuildInputs = [mercurial];
impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars; impureEnvVars = lib.fetchers.proxyImpureEnvVars;
subrepoClause = if fetchSubrepos then "S" else ""; subrepoClause = if fetchSubrepos then "S" else "";

4
pkgs/build-support/fetchmtn/default.nix
View file

@ -1,5 +1,5 @@
# You can specify some extra mirrors and a cache DB via options # You can specify some extra mirrors and a cache DB via options
{stdenvNoCC, monotone, defaultDBMirrors ? [], cacheDB ? "./mtn-checkout.db"}: {lib, stdenvNoCC, monotone, defaultDBMirrors ? [], cacheDB ? "./mtn-checkout.db"}:
# dbs is a list of strings # dbs is a list of strings
# each is an url for sync # each is an url for sync
@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation {
dbs = defaultDBMirrors ++ dbs; dbs = defaultDBMirrors ++ dbs;
inherit branch cacheDB name selector; inherit branch cacheDB name selector;
impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars; impureEnvVars = lib.fetchers.proxyImpureEnvVars;
} }

4
pkgs/build-support/fetchrepoproject/default.nix
View file

@ -1,4 +1,4 @@
{ stdenvNoCC, gitRepo, cacert, copyPathsToStore }: { lib, stdenvNoCC, gitRepo, cacert, copyPathsToStore }:
{ name, manifest, rev ? "HEAD", sha256 { name, manifest, rev ? "HEAD", sha256
# Optional parameters: # Optional parameters:
@ -9,7 +9,7 @@
assert repoRepoRev != "" -> repoRepoURL != ""; assert repoRepoRev != "" -> repoRepoURL != "";
assert createMirror -> !useArchive; assert createMirror -> !useArchive;
with stdenvNoCC.lib; with lib;
let let
extraRepoInitFlags = [ extraRepoInitFlags = [

4
pkgs/build-support/fetchs3/default.nix
View file

@ -1,4 +1,4 @@
{ stdenvNoCC, runCommand, awscli }: { lib, stdenvNoCC, runCommand, awscli }:
{ s3url { s3url
, name ? builtins.baseNameOf s3url , name ? builtins.baseNameOf s3url
@ -16,7 +16,7 @@ let
AWS_SESSION_TOKEN = session_token; AWS_SESSION_TOKEN = session_token;
}; };
credentialAttrs = stdenvNoCC.lib.optionalAttrs (credentials != null) (mkCredentials credentials); credentialAttrs = lib.optionalAttrs (credentials != null) (mkCredentials credentials);
in runCommand name ({ in runCommand name ({
nativeBuildInputs = [ awscli ]; nativeBuildInputs = [ awscli ];

8
pkgs/build-support/fetchsvn/default.nix
View file

@ -1,4 +1,4 @@
{ stdenvNoCC, buildPackages { lib, stdenvNoCC, buildPackages
, subversion, glibcLocales, sshSupport ? true, openssh ? null , subversion, glibcLocales, sshSupport ? true, openssh ? null
}: }:
@ -10,7 +10,7 @@
assert sshSupport -> openssh != null; assert sshSupport -> openssh != null;
let let
repoName = with stdenvNoCC.lib; repoName = with lib;
let let
fst = head; fst = head;
snd = l: head (tail l); snd = l: head (tail l);
@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation {
name = name_; name = name_;
builder = ./builder.sh; builder = ./builder.sh;
nativeBuildInputs = [ subversion glibcLocales ] nativeBuildInputs = [ subversion glibcLocales ]
++ stdenvNoCC.lib.optional sshSupport openssh; ++ lib.optional sshSupport openssh;
SVN_SSH = if sshSupport then "${buildPackages.openssh}/bin/ssh" else null; SVN_SSH = if sshSupport then "${buildPackages.openssh}/bin/ssh" else null;
@ -49,6 +49,6 @@ stdenvNoCC.mkDerivation {
inherit url rev ignoreExternals ignoreKeywords; inherit url rev ignoreExternals ignoreKeywords;
impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars; impureEnvVars = lib.fetchers.proxyImpureEnvVars;
inherit preferLocalBuild; inherit preferLocalBuild;
} }

2
pkgs/build-support/kernel/make-initrd.nix
View file

@ -83,7 +83,7 @@ in stdenvNoCC.mkDerivation rec {
builder = ./make-initrd.sh; builder = ./make-initrd.sh;
nativeBuildInputs = [ perl cpio ] nativeBuildInputs = [ perl cpio ]
++ stdenvNoCC.lib.optional makeUInitrd ubootTools; ++ lib.optional makeUInitrd ubootTools;
compress = "${_compressorExecutable} ${lib.escapeShellArgs _compressorArgsReal}"; compress = "${_compressorExecutable} ${lib.escapeShellArgs _compressorArgsReal}";

10
pkgs/build-support/templaterpm/nix-template-rpm.py
View file

@ -229,26 +229,26 @@ class SPECTemplate(object):
@property @property
def meta(self): def meta(self):
out = ' meta = {\n' out = ' meta = with lib; {\n'
out += ' homepage = ' + self.spec.sourceHeader['url'] + ';\n' out += ' homepage = ' + self.spec.sourceHeader['url'] + ';\n'
out += ' description = "' + self.spec.sourceHeader['summary'] + '";\n' out += ' description = "' + self.spec.sourceHeader['summary'] + '";\n'
out += ' license = stdenv.lib.licenses.' + self.spec.sourceHeader['license'] + ';\n' out += ' license = lib.licenses.' + self.spec.sourceHeader['license'] + ';\n'
out += ' platforms = [ "i686-linux" "x86_64-linux" ];\n' out += ' platforms = [ "i686-linux" "x86_64-linux" ];\n'
out += ' maintainers = with stdenv.lib.maintainers; [ ' + self.maintainer + ' ];\n' out += ' maintainers = with lib.maintainers; [ ' + self.maintainer + ' ];\n'
out += ' };\n' out += ' };\n'
out += '}\n' out += '}\n'
return out return out
def __str__(self): def __str__(self):
head = '{stdenv, fetchurl, ' + ', '.join(self.getBuildInputs("ALL")) + '}:\n\n' head = '{lib, stdenv, fetchurl, ' + ', '.join(self.getBuildInputs("ALL")) + '}:\n\n'
head += 'stdenv.mkDerivation {\n' head += 'stdenv.mkDerivation {\n'
body = [ self.name, self.src, self.patch, self.buildInputs, self.configure, self.build, self.ocamlExtra, self.install, self.meta ] body = [ self.name, self.src, self.patch, self.buildInputs, self.configure, self.build, self.ocamlExtra, self.install, self.meta ]
return head + '\n'.join(body) return head + '\n'.join(body)
def getTemplate(self): def getTemplate(self):
head = '{stdenv, buildRoot, fetchurl, ' + ', '.join(self.getBuildInputs("ALL")) + '}:\n\n' head = '{lib, stdenv, buildRoot, fetchurl, ' + ', '.join(self.getBuildInputs("ALL")) + '}:\n\n'
head += 'let\n' head += 'let\n'
head += ' buildRootInput = (import "${buildRoot}/usr/share/buildroot/buildRootInput.nix") { fetchurl=fetchurl; buildRoot=buildRoot; };\n' head += ' buildRootInput = (import "${buildRoot}/usr/share/buildroot/buildRootInput.nix") { fetchurl=fetchurl; buildRoot=buildRoot; };\n'
head += 'in\n\n' head += 'in\n\n'

4
pkgs/development/compilers/chicken/4/fetchegg/default.nix
View file

@ -1,7 +1,7 @@
# Fetches a chicken egg from henrietta using `chicken-install -r' # Fetches a chicken egg from henrietta using `chicken-install -r'
# See: http://wiki.call-cc.org/chicken-projects/egg-index-4.html # See: http://wiki.call-cc.org/chicken-projects/egg-index-4.html
{ stdenvNoCC, chicken }: { lib, stdenvNoCC, chicken }:
{ name, version, md5 ? "", sha256 ? "" }: { name, version, md5 ? "", sha256 ? "" }:
if md5 != "" then if md5 != "" then
@ -20,6 +20,6 @@ stdenvNoCC.mkDerivation {
eggName = name; eggName = name;
impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars; impureEnvVars = lib.fetchers.proxyImpureEnvVars;
} }

4
pkgs/development/compilers/chicken/5/fetchegg/default.nix
View file

@ -1,7 +1,7 @@
# Fetches a chicken egg from henrietta using `chicken-install -r' # Fetches a chicken egg from henrietta using `chicken-install -r'
# See: http://wiki.call-cc.org/chicken-projects/egg-index-5.html # See: http://wiki.call-cc.org/chicken-projects/egg-index-5.html
{ stdenvNoCC, chicken }: { lib, stdenvNoCC, chicken }:
{ name, version, md5 ? "", sha256 ? "" }: { name, version, md5 ? "", sha256 ? "" }:
if md5 != "" then if md5 != "" then
@ -20,6 +20,6 @@ stdenvNoCC.mkDerivation {
eggName = name; eggName = name;
impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars; impureEnvVars = lib.fetchers.proxyImpureEnvVars;
} }

4
pkgs/development/compilers/open-watcom-bin/default.nix
View file

@ -1,4 +1,4 @@
{ stdenvNoCC, fetchurl, qemu, expect, writeScript, writeScriptBin, ncurses, bash, coreutils }: { lib, stdenvNoCC, fetchurl, qemu, expect, writeScript, writeScriptBin, ncurses, bash, coreutils }:
let let
@ -112,7 +112,7 @@ stdenvNoCC.mkDerivation rec {
done done
''; '';
meta = with stdenvNoCC.lib; { meta = with lib; {
description = "A C/C++ Compiler (binary distribution)"; description = "A C/C++ Compiler (binary distribution)";
homepage = "http://www.openwatcom.org/"; homepage = "http://www.openwatcom.org/";
license = licenses.watcom; license = licenses.watcom;

4
pkgs/development/libraries/gcc/libgcc/default.nix
View file

@ -1,4 +1,4 @@
{ stdenvNoLibs, buildPackages { lib, stdenvNoLibs, buildPackages
, gcc, glibc , gcc, glibc
, libiberty , libiberty
}: }:
@ -128,7 +128,7 @@ stdenvNoLibs.mkDerivation rec {
"--disable-vtable-verify" "--disable-vtable-verify"
"--with-system-zlib" "--with-system-zlib"
] ++ stdenvNoLibs.lib.optional (stdenvNoLibs.hostPlatform.libc == "glibc") ] ++ lib.optional (stdenvNoLibs.hostPlatform.libc == "glibc")
"--with-glibc-version=${glibc.version}"; "--with-glibc-version=${glibc.version}";
configurePlatforms = [ "build" "host" ]; configurePlatforms = [ "build" "host" ];

8
pkgs/development/libraries/relibc/default.nix
View file

@ -1,7 +1,7 @@
{ stdenvNoCC, buildPackages, makeRustPlatform }: { lib, stdenvNoCC, buildPackages, makeRustPlatform }:
let let
rpath = stdenvNoCC.lib.makeLibraryPath [ rpath = lib.makeLibraryPath [
buildPackages.stdenv.cc.libc buildPackages.stdenv.cc.libc
"$out" "$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 { redoxRustPlatform = buildPackages.makeRustPlatform {
@ -68,7 +68,7 @@ redoxRustPlatform.buildRustPackage rec {
cargoSha256 = "1fzz7ba3ga57x1cbdrcfrdwwjr70nh4skrpxp4j2gak2c3scj6rz"; cargoSha256 = "1fzz7ba3ga57x1cbdrcfrdwwjr70nh4skrpxp4j2gak2c3scj6rz";
meta = with stdenvNoCC.lib; { meta = with lib; {
homepage = "https://gitlab.redox-os.org/redox-os/relibc"; homepage = "https://gitlab.redox-os.org/redox-os/relibc";
description = "C Library in Rust for Redox and Linux"; description = "C Library in Rust for Redox and Linux";
license = licenses.mit; license = licenses.mit;

9
pkgs/development/libraries/science/math/mkl/default.nix
View file

@ -1,4 +1,5 @@
{ stdenv { lib
, stdenv
, callPackage , callPackage
, stdenvNoCC , stdenvNoCC
, fetchurl , 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/libcblas${shlibExt}
ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapack${shlibExt} ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapack${shlibExt}
ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapacke${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/libblas${shlibExt}".3"
ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libcblas${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" 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 # fixDarwinDylibName fails for libmkl_cdft_core.dylib because the
# larger updated load commands do not fit. Use install_name_tool # larger updated load commands do not fit. Use install_name_tool
# explicitly and ignore the error. # explicitly and ignore the error.
postFixup = stdenvNoCC.lib.optionalString stdenvNoCC.isDarwin '' postFixup = lib.optionalString stdenvNoCC.isDarwin ''
for f in $out/lib/*.dylib; do for f in $out/lib/*.dylib; do
install_name_tool -id $out/lib/$(basename $f) $f || true install_name_tool -id $out/lib/$(basename $f) $f || true
done done
@ -160,7 +161,7 @@ in stdenvNoCC.mkDerivation {
passthru.tests.pkg-config = callPackage ./test { }; passthru.tests.pkg-config = callPackage ./test { };
meta = with stdenvNoCC.lib; { meta = with lib; {
description = "Intel Math Kernel Library"; description = "Intel Math Kernel Library";
longDescription = '' longDescription = ''
Intel Math Kernel Library (Intel MKL) optimizes code with minimal effort Intel Math Kernel Library (Intel MKL) optimizes code with minimal effort

10
pkgs/development/lisp-modules/asdf/2.26.nix
View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, texinfo, texLive, perl}: {lib, stdenv, fetchurl, texinfo, texLive, perl}:
let let
s = # Generated upstream information s = # Generated upstream information
rec { rec {
@ -31,11 +31,11 @@ stdenv.mkDerivation {
cp -r doc/* "$out"/share/doc/asdf/ cp -r doc/* "$out"/share/doc/asdf/
ln -s "$out"/lib/common-lisp/{asdf/uiop,uiop} ln -s "$out"/lib/common-lisp/{asdf/uiop,uiop}
''; '';
meta = { meta = with lib; {
inherit (s) version; inherit (s) version;
description = "Standard software-system definition library for Common Lisp"; description = "Standard software-system definition library for Common Lisp";
license = stdenv.lib.licenses.mit ; license = licenses.mit;
maintainers = [stdenv.lib.maintainers.raskin]; maintainers = [maintainers.raskin];
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux;
}; };
} }

10
pkgs/development/lisp-modules/asdf/3.1.nix
View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, texinfo, texLive, perl}: {lib, stdenv, fetchurl, texinfo, texLive, perl}:
let let
s = # Generated upstream information s = # Generated upstream information
rec { rec {
@ -30,11 +30,11 @@ stdenv.mkDerivation {
cp -r doc/* "$out"/share/doc/asdf/ cp -r doc/* "$out"/share/doc/asdf/
ln -s "$out"/lib/common-lisp/{asdf/uiop,uiop} ln -s "$out"/lib/common-lisp/{asdf/uiop,uiop}
''; '';
meta = { meta = with lib; {
inherit (s) version; inherit (s) version;
description = "Standard software-system definition library for Common Lisp"; description = "Standard software-system definition library for Common Lisp";
license = stdenv.lib.licenses.mit ; license = licenses.mit ;
maintainers = [stdenv.lib.maintainers.raskin]; maintainers = [maintainers.raskin];
platforms = stdenv.lib.platforms.unix; platforms = platforms.unix;
}; };
} }

10
pkgs/development/lisp-modules/asdf/default.nix
View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, texinfo, texLive, perl}: {lib, stdenv, fetchurl, texinfo, texLive, perl}:
let let
s = # Generated upstream information s = # Generated upstream information
rec { rec {
@ -31,11 +31,11 @@ stdenv.mkDerivation {
cp -r doc/* "$out"/share/doc/asdf/ cp -r doc/* "$out"/share/doc/asdf/
ln -s "$out"/lib/common-lisp/{asdf/uiop,uiop} ln -s "$out"/lib/common-lisp/{asdf/uiop,uiop}
''; '';
meta = { meta = with lib; {
inherit (s) version; inherit (s) version;
description = "Standard software-system definition library for Common Lisp"; description = "Standard software-system definition library for Common Lisp";
license = stdenv.lib.licenses.mit ; license = licenses.mit ;
maintainers = [stdenv.lib.maintainers.raskin]; maintainers = [maintainers.raskin];
platforms = stdenv.lib.platforms.unix; platforms = platforms.unix;
}; };
} }

4
pkgs/development/lisp-modules/clwrapper/default.nix
View file

@ -1,4 +1,4 @@
{stdenv, asdf, which, bash, lisp ? null}: {lib, stdenv, asdf, which, bash, lisp ? null}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "cl-wrapper-script"; name = "cl-wrapper-script";
@ -52,6 +52,6 @@ stdenv.mkDerivation {
meta = { meta = {
description = "Script used to wrap Common Lisp implementations"; description = "Script used to wrap Common Lisp implementations";
maintainers = [stdenv.lib.maintainers.raskin]; maintainers = [lib.maintainers.raskin];
}; };
} }

4
pkgs/development/lisp-modules/define-package.nix
View file

@ -1,4 +1,4 @@
args @ {stdenv, clwrapper, baseName, packageName ? baseName args @ {lib, stdenv, clwrapper, baseName, packageName ? baseName
, parasites ? [] , parasites ? []
, buildSystems ? ([packageName] ++ parasites) , buildSystems ? ([packageName] ++ parasites)
, version ? "latest" , version ? "latest"
@ -89,7 +89,7 @@ basePackage = {
env -i \ env -i \
NIX_LISP="$NIX_LISP" \ NIX_LISP="$NIX_LISP" \
NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(progn NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(progn
${stdenv.lib.concatMapStrings (system: '' ${lib.concatMapStrings (system: ''
(asdf:compile-system :${system}) (asdf:compile-system :${system})
(asdf:load-system :${system}) (asdf:load-system :${system})
(asdf:operate (quote asdf::compile-bundle-op) :${system}) (asdf:operate (quote asdf::compile-bundle-op) :${system})

4
pkgs/development/lisp-modules/lisp-packages.nix
View file

@ -1,6 +1,6 @@
{stdenv, clwrapper, pkgs, sbcl, coreutils, nix, asdf}: {lib, stdenv, clwrapper, pkgs, sbcl, coreutils, nix, asdf}:
let lispPackages = rec { let lispPackages = rec {
inherit pkgs clwrapper stdenv; inherit lib pkgs clwrapper stdenv;
nixLib = pkgs.lib; nixLib = pkgs.lib;
callPackage = nixLib.callPackageWith lispPackages; callPackage = nixLib.callPackageWith lispPackages;

4
pkgs/development/lisp-modules/quicklisp-to-nix.nix
View file

@ -1,6 +1,6 @@
{stdenv, fetchurl, pkgs, clwrapper}: {lib, stdenv, fetchurl, pkgs, clwrapper}:
let quicklisp-to-nix-packages = rec { 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; callPackage = pkgs.lib.callPackageWith quicklisp-to-nix-packages;
buildLispPackage = callPackage ./define-package.nix; buildLispPackage = callPackage ./define-package.nix;

4
pkgs/development/misc/msp430/gcc-support.nix
View file

@ -1,4 +1,4 @@
{ stdenvNoCC, fetchzip }: { lib, stdenvNoCC, fetchzip }:
let let
mspgccVersion = "6_1_1_0"; mspgccVersion = "6_1_1_0";
@ -19,7 +19,7 @@ in stdenvNoCC.mkDerivation rec {
touch $out/lib/lib touch $out/lib/lib
''; '';
meta = with stdenvNoCC.lib; { meta = with lib; {
description = '' description = ''
Development headers and linker scripts for TI MSP430 microcontrollers Development headers and linker scripts for TI MSP430 microcontrollers
''; '';

2
pkgs/stdenv/adapters.nix
View file

@ -110,7 +110,7 @@ rec {
*/ */
replaceMaintainersField = stdenv: pkgs: maintainers: stdenv // replaceMaintainersField = stdenv: pkgs: maintainers: stdenv //
{ mkDerivation = args: { mkDerivation = args:
stdenv.lib.recursiveUpdate pkgs.lib.recursiveUpdate
(stdenv.mkDerivation args) (stdenv.mkDerivation args)
{ meta.maintainers = maintainers; }; { meta.maintainers = maintainers; };
}; };

4
pkgs/tools/security/proxmark3/proxmark3-rrg.nix
View file

@ -1,4 +1,4 @@
{ stdenv, mkDerivation, fetchFromGitHub, pkg-config, gcc-arm-embedded, bluez5 { lib, stdenv, mkDerivation, fetchFromGitHub, pkg-config, gcc-arm-embedded, bluez5
, readline , readline
, hardwarePlatform ? "PM3RDV4" , hardwarePlatform ? "PM3RDV4"
@ -29,7 +29,7 @@ mkDerivation rec {
install -Dt $out/firmware bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf install -Dt $out/firmware bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf
''; '';
meta = with stdenv.lib; { meta = with lib; {
description = "Client for proxmark3, powerful general purpose RFID tool"; description = "Client for proxmark3, powerful general purpose RFID tool";
homepage = "https://rfidresearchgroup.com/"; homepage = "https://rfidresearchgroup.com/";
license = licenses.gpl2Plus; license = licenses.gpl2Plus;

2
pkgs/top-level/all-packages.nix
View file

@ -25269,7 +25269,7 @@ in
}).overrideAttrs (oldAttrs: rec { }).overrideAttrs (oldAttrs: rec {
pname = "vim-darwin"; pname = "vim-darwin";
meta = { meta = {
platforms = stdenv.lib.platforms.darwin; platforms = lib.platforms.darwin;
}; };
}); });