lol

treewide: Fetchers should use `stdenvNoCC`.

+43 -43
+2 -2
pkgs/build-support/fetchbower/default.nix
··· 1 - { stdenv, lib, bower2nix, cacert }: 1 + { stdenvNoCC, lib, bower2nix, cacert }: 2 2 let 3 3 bowerVersion = version: 4 4 let ··· 9 9 10 10 cleanName = name: lib.replaceStrings ["/" ":"] ["-" "-"] name; 11 11 12 - fetchbower = name: version: target: outputHash: stdenv.mkDerivation { 12 + fetchbower = name: version: target: outputHash: stdenvNoCC.mkDerivation { 13 13 name = "${cleanName name}-${bowerVersion version}"; 14 14 SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; 15 15 buildCommand = ''
+2 -2
pkgs/build-support/fetchbzr/default.nix
··· 1 - { stdenv, bazaar }: 1 + { stdenvNoCC, bazaar }: 2 2 { url, rev, sha256 }: 3 3 4 - stdenv.mkDerivation { 4 + stdenvNoCC.mkDerivation { 5 5 name = "bzr-export"; 6 6 7 7 builder = ./builder.sh;
+2 -2
pkgs/build-support/fetchcvs/default.nix
··· 3 3 # tag="<tagname>" (get version by tag name) 4 4 # If you don't specify neither one date="NOW" will be used (get latest) 5 5 6 - {stdenv, cvs}: 6 + {stdenvNoCC, cvs}: 7 7 8 8 {cvsRoot, module, tag ? null, date ? null, sha256}: 9 9 10 - stdenv.mkDerivation { 10 + stdenvNoCC.mkDerivation { 11 11 name = "cvs-export"; 12 12 builder = ./builder.sh; 13 13 nativeBuildInputs = [cvs];
+2 -2
pkgs/build-support/fetchdarcs/default.nix
··· 1 - {stdenv, darcs, nix, cacert}: 1 + {stdenvNoCC, darcs, nix, cacert}: 2 2 3 3 {url, rev ? null, context ? null, md5 ? "", sha256 ? ""}: 4 4 5 5 if md5 != "" then 6 6 throw "fetchdarcs does not support md5 anymore, please use sha256" 7 7 else 8 - stdenv.mkDerivation { 8 + stdenvNoCC.mkDerivation { 9 9 name = "fetchdarcs"; 10 10 NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; 11 11 builder = ./builder.sh;
+3 -3
pkgs/build-support/fetchegg/default.nix
··· 1 1 # Fetches a chicken egg from henrietta using `chicken-install -r' 2 2 # See: http://wiki.call-cc.org/chicken-projects/egg-index-4.html 3 3 4 - { stdenv, chicken }: 4 + { stdenvNoCC, chicken }: 5 5 { name, version, md5 ? "", sha256 ? "" }: 6 6 7 7 if md5 != "" then 8 8 throw "fetchegg does not support md5 anymore, please use sha256" 9 9 else 10 - stdenv.mkDerivation { 10 + stdenvNoCC.mkDerivation { 11 11 name = "chicken-${name}-export"; 12 12 builder = ./builder.sh; 13 13 nativeBuildInputs = [ chicken ]; ··· 20 20 21 21 eggName = name; 22 22 23 - impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; 23 + impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars; 24 24 } 25 25
+4 -4
pkgs/build-support/fetchgit/default.nix
··· 1 - {stdenv, git, cacert}: let 1 + {stdenvNoCC, git, cacert}: let 2 2 urlToName = url: rev: let 3 - inherit (stdenv.lib) removeSuffix splitString last; 3 + inherit (stdenvNoCC.lib) removeSuffix splitString last; 4 4 base = last (splitString ":" (baseNameOf (removeSuffix "/" url))); 5 5 6 6 matched = builtins.match "(.*).git" base; ··· 48 48 if md5 != "" then 49 49 throw "fetchgit does not support md5 anymore, please use sha256" 50 50 else 51 - stdenv.mkDerivation { 51 + stdenvNoCC.mkDerivation { 52 52 inherit name; 53 53 builder = ./builder.sh; 54 54 fetcher = "${./nix-prefetch-git}"; # This must be a string to ensure it's called with bash. ··· 62 62 63 63 GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; 64 64 65 - impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars ++ [ 65 + impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars ++ [ 66 66 "GIT_PROXY_COMMAND" "SOCKS_SERVER" 67 67 ]; 68 68
+2 -2
pkgs/build-support/fetchgx/default.nix
··· 1 - { stdenv, gx, gx-go, go, cacert }: 1 + { stdenvNoCC, gx, gx-go, go, cacert }: 2 2 3 3 { name, src, sha256 }: 4 4 5 - stdenv.mkDerivation { 5 + stdenvNoCC.mkDerivation { 6 6 name = "${name}-gxdeps"; 7 7 inherit src; 8 8
+3 -3
pkgs/build-support/fetchhg/default.nix
··· 1 - {stdenv, mercurial, nix}: {name ? null, url, rev ? null, md5 ? null, sha256 ? null, fetchSubrepos ? false}: 1 + {stdenvNoCC, mercurial, nix}: {name ? null, url, rev ? null, md5 ? null, sha256 ? null, fetchSubrepos ? false}: 2 2 3 3 if md5 != null then 4 4 throw "fetchhg does not support md5 anymore, please use sha256" 5 5 else 6 6 # TODO: statically check if mercurial as the https support if the url starts woth https. 7 - stdenv.mkDerivation { 7 + stdenvNoCC.mkDerivation { 8 8 name = "hg-archive" + (if name != null then "-${name}" else ""); 9 9 builder = ./builder.sh; 10 10 nativeBuildInputs = [mercurial]; 11 11 12 - impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; 12 + impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars; 13 13 14 14 subrepoClause = if fetchSubrepos then "S" else ""; 15 15
+3 -3
pkgs/build-support/fetchmtn/default.nix
··· 1 1 # You can specify some extra mirrors and a cache DB via options 2 - {stdenv, monotone, defaultDBMirrors ? [], cacheDB ? "./mtn-checkout.db"}: 2 + {stdenvNoCC, monotone, defaultDBMirrors ? [], cacheDB ? "./mtn-checkout.db"}: 3 3 # dbs is a list of strings 4 4 # each is an url for sync 5 5 ··· 8 8 {name ? "mtn-checkout", dbs ? [], sha256 9 9 , selector ? "h:" + branch, branch}: 10 10 11 - stdenv.mkDerivation { 11 + stdenvNoCC.mkDerivation { 12 12 builder = ./builder.sh; 13 13 nativeBuildInputs = [monotone]; 14 14 ··· 19 19 dbs = defaultDBMirrors ++ dbs; 20 20 inherit branch cacheDB name selector; 21 21 22 - impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; 22 + impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars; 23 23 24 24 } 25 25
+1 -1
pkgs/build-support/fetchnuget/default.nix
··· 1 - { stdenv, fetchurl, buildDotnetPackage, unzip }: 1 + { stdenvNoCC, fetchurl, buildDotnetPackage, unzip }: 2 2 3 3 attrs @ 4 4 { baseName
+3 -3
pkgs/build-support/fetchrepoproject/default.nix
··· 1 - { stdenv, gitRepo, cacert, copyPathsToStore }: 1 + { stdenvNoCC, gitRepo, cacert, copyPathsToStore }: 2 2 3 3 { name, manifest, rev ? "HEAD", sha256 4 4 # Optional parameters: ··· 9 9 assert repoRepoRev != "" -> repoRepoURL != ""; 10 10 assert createMirror -> !useArchive; 11 11 12 - with stdenv.lib; 12 + with stdenvNoCC.lib; 13 13 14 14 let 15 15 extraRepoInitFlags = [ ··· 28 28 29 29 local_manifests = copyPathsToStore localManifests; 30 30 31 - in stdenv.mkDerivation { 31 + in stdenvNoCC.mkDerivation { 32 32 inherit name; 33 33 34 34 inherit cacert manifest rev repoRepoURL repoRepoRev referenceDir; # TODO
+2 -2
pkgs/build-support/fetchs3/default.nix
··· 1 - { stdenv, runCommand, awscli }: 1 + { stdenvNoCC, runCommand, awscli }: 2 2 3 3 { s3url 4 4 , sha256 ··· 10 10 }: 11 11 12 12 let 13 - credentialAttrs = stdenv.lib.optionalAttrs (credentials != null) { 13 + credentialAttrs = stdenvNoCC.lib.optionalAttrs (credentials != null) { 14 14 AWS_ACCESS_KEY_ID = credentials.access_key_id; 15 15 AWS_SECRET_ACCESS_KEY = credentials.secret_access_key; 16 16 AWS_SESSION_TOKEN = credentials.session_token ? null;
+4 -4
pkgs/build-support/fetchsvn/default.nix
··· 1 - {stdenv, subversion, glibcLocales, sshSupport ? false, openssh ? null}: 1 + {stdenvNoCC, subversion, glibcLocales, sshSupport ? false, openssh ? null}: 2 2 {url, rev ? "HEAD", md5 ? "", sha256 ? "", 3 3 ignoreExternals ? false, ignoreKeywords ? false, name ? null}: 4 4 5 5 let 6 - repoName = with stdenv.lib; 6 + repoName = with stdenvNoCC.lib; 7 7 let 8 8 fst = head; 9 9 snd = l: head (tail l); ··· 28 28 if md5 != "" then 29 29 throw "fetchsvn does not support md5 anymore, please use sha256" 30 30 else 31 - stdenv.mkDerivation { 31 + stdenvNoCC.mkDerivation { 32 32 name = name_; 33 33 builder = ./builder.sh; 34 34 nativeBuildInputs = [ subversion glibcLocales ]; ··· 39 39 40 40 inherit url rev sshSupport openssh ignoreExternals ignoreKeywords; 41 41 42 - impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; 42 + impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars; 43 43 preferLocalBuild = true; 44 44 }
+2 -2
pkgs/build-support/fetchsvnssh/default.nix
··· 1 - {stdenv, subversion, sshSupport ? false, openssh ? null, expect}: 1 + {stdenvNoCC, subversion, sshSupport ? false, openssh ? null, expect}: 2 2 {username, password, url, rev ? "HEAD", md5 ? "", sha256 ? ""}: 3 3 4 4 5 5 if md5 != "" then 6 6 throw "fetchsvnssh does not support md5 anymore, please use sha256" 7 7 else 8 - stdenv.mkDerivation { 8 + stdenvNoCC.mkDerivation { 9 9 name = "svn-export-ssh"; 10 10 builder = ./builder.sh; 11 11 nativeBuildInputs = [subversion expect];
+5 -5
pkgs/build-support/fetchurl/default.nix
··· 1 - { stdenv, curl }: # Note that `curl' may be `null', in case of the native stdenv. 1 + { stdenvNoCC, curl }: # Note that `curl' may be `null', in case of the native stdenvNoCC. 2 2 3 3 let 4 4 ··· 10 10 # resulting store derivations (.drv files) much smaller, which in 11 11 # turn makes nix-env/nix-instantiate faster. 12 12 mirrorsFile = 13 - stdenv.mkDerivation ({ 13 + stdenvNoCC.mkDerivation ({ 14 14 name = "mirrors-list"; 15 15 builder = ./write-mirror-list.sh; 16 16 preferLocalBuild = true; ··· 20 20 # "gnu", etc.). 21 21 sites = builtins.attrNames mirrors; 22 22 23 - impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars ++ [ 23 + impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars ++ [ 24 24 # This variable allows the user to pass additional options to curl 25 25 "NIX_CURL_FLAGS" 26 26 ··· 103 103 in 104 104 105 105 if md5 != "" then throw "fetchurl does not support md5 anymore, please use sha256 or sha512" 106 - else if (!hasHash) then throw "Specify hash for fetchurl fixed-output derivation: ${stdenv.lib.concatStringsSep ", " urls_}" 107 - else stdenv.mkDerivation { 106 + else if (!hasHash) then throw "Specify hash for fetchurl fixed-output derivation: ${stdenvNoCC.lib.concatStringsSep ", " urls_}" 107 + else stdenvNoCC.mkDerivation { 108 108 name = 109 109 if showURLs then "urls" 110 110 else if name != "" then name
+2 -2
pkgs/stdenv/darwin/default.nix
··· 118 118 initialPath = [ bootstrapTools ]; 119 119 120 120 fetchurlBoot = import ../../build-support/fetchurl { 121 - stdenv = stage0.stdenv; 122 - curl = bootstrapTools; 121 + stdenvNoCC = stage0.stdenv; 122 + curl = bootstrapTools; 123 123 }; 124 124 125 125 # The stdenvs themselves don't use mkDerivation, so I need to specify this here
+1 -1
pkgs/top-level/all-packages.nix
··· 180 180 181 181 # `fetchurl' downloads a file from the network. 182 182 fetchurl = import ../build-support/fetchurl { 183 - inherit stdenv; 183 + inherit stdenvNoCC; 184 184 # On darwin, libkrb5 needs bootstrap_cmds which would require 185 185 # converting many packages to fetchurl_boot to avoid evaluation cycles. 186 186 curl = buildPackages.curl.override (lib.optionalAttrs stdenv.isDarwin { gssSupport = false; });