mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-10-30 14:11:21 +00:00
treewide: stdenvNoCC.lib -> lib
This commit is contained in:
parent
db4cede416
commit
02ee14b9d5
@ -1,6 +1,6 @@
|
||||
{stdenvNoCC, git, git-lfs, cacert}: let
|
||||
{lib, stdenvNoCC, git, git-lfs, cacert}: let
|
||||
urlToName = url: rev: let
|
||||
inherit (stdenvNoCC.lib) removeSuffix splitString last;
|
||||
inherit (lib) removeSuffix splitString last;
|
||||
base = last (splitString ":" (baseNameOf (removeSuffix "/" url)));
|
||||
|
||||
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.
|
||||
|
||||
nativeBuildInputs = [ git ]
|
||||
++ stdenvNoCC.lib.optionals fetchLFS [ git-lfs ];
|
||||
++ lib.optionals fetchLFS [ git-lfs ];
|
||||
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
@ -66,7 +66,7 @@ stdenvNoCC.mkDerivation {
|
||||
|
||||
GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";
|
||||
|
||||
impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars ++ [
|
||||
impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [
|
||||
"GIT_PROXY_COMMAND" "SOCKS_SERVER"
|
||||
];
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenvNoCC, mercurial }:
|
||||
{ lib, stdenvNoCC, mercurial }:
|
||||
{ name ? null
|
||||
, url
|
||||
, rev ? null
|
||||
@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation {
|
||||
builder = ./builder.sh;
|
||||
nativeBuildInputs = [mercurial];
|
||||
|
||||
impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars;
|
||||
impureEnvVars = lib.fetchers.proxyImpureEnvVars;
|
||||
|
||||
subrepoClause = if fetchSubrepos then "S" else "";
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
# 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
|
||||
# each is an url for sync
|
||||
|
||||
@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation {
|
||||
dbs = defaultDBMirrors ++ dbs;
|
||||
inherit branch cacheDB name selector;
|
||||
|
||||
impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars;
|
||||
impureEnvVars = lib.fetchers.proxyImpureEnvVars;
|
||||
|
||||
}
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenvNoCC, gitRepo, cacert, copyPathsToStore }:
|
||||
{ lib, stdenvNoCC, gitRepo, cacert, copyPathsToStore }:
|
||||
|
||||
{ name, manifest, rev ? "HEAD", sha256
|
||||
# Optional parameters:
|
||||
@ -9,7 +9,7 @@
|
||||
assert repoRepoRev != "" -> repoRepoURL != "";
|
||||
assert createMirror -> !useArchive;
|
||||
|
||||
with stdenvNoCC.lib;
|
||||
with lib;
|
||||
|
||||
let
|
||||
extraRepoInitFlags = [
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenvNoCC, runCommand, awscli }:
|
||||
{ lib, stdenvNoCC, runCommand, awscli }:
|
||||
|
||||
{ s3url
|
||||
, name ? builtins.baseNameOf s3url
|
||||
@ -16,7 +16,7 @@ let
|
||||
AWS_SESSION_TOKEN = session_token;
|
||||
};
|
||||
|
||||
credentialAttrs = stdenvNoCC.lib.optionalAttrs (credentials != null) (mkCredentials credentials);
|
||||
credentialAttrs = lib.optionalAttrs (credentials != null) (mkCredentials credentials);
|
||||
in runCommand name ({
|
||||
nativeBuildInputs = [ awscli ];
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenvNoCC, buildPackages
|
||||
{ lib, stdenvNoCC, buildPackages
|
||||
, subversion, glibcLocales, sshSupport ? true, openssh ? null
|
||||
}:
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
assert sshSupport -> openssh != null;
|
||||
|
||||
let
|
||||
repoName = with stdenvNoCC.lib;
|
||||
repoName = with lib;
|
||||
let
|
||||
fst = head;
|
||||
snd = l: head (tail l);
|
||||
@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation {
|
||||
name = name_;
|
||||
builder = ./builder.sh;
|
||||
nativeBuildInputs = [ subversion glibcLocales ]
|
||||
++ stdenvNoCC.lib.optional sshSupport openssh;
|
||||
++ lib.optional sshSupport openssh;
|
||||
|
||||
SVN_SSH = if sshSupport then "${buildPackages.openssh}/bin/ssh" else null;
|
||||
|
||||
@ -49,6 +49,6 @@ stdenvNoCC.mkDerivation {
|
||||
|
||||
inherit url rev ignoreExternals ignoreKeywords;
|
||||
|
||||
impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars;
|
||||
impureEnvVars = lib.fetchers.proxyImpureEnvVars;
|
||||
inherit preferLocalBuild;
|
||||
}
|
||||
|
@ -83,7 +83,7 @@ in stdenvNoCC.mkDerivation rec {
|
||||
builder = ./make-initrd.sh;
|
||||
|
||||
nativeBuildInputs = [ perl cpio ]
|
||||
++ stdenvNoCC.lib.optional makeUInitrd ubootTools;
|
||||
++ lib.optional makeUInitrd ubootTools;
|
||||
|
||||
compress = "${_compressorExecutable} ${lib.escapeShellArgs _compressorArgsReal}";
|
||||
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
'';
|
||||
|
Loading…
Reference in New Issue
Block a user