···33# tag="<tagname>" (get version by tag name)
44# If you don't specify neither one date="NOW" will be used (get latest)
5566-{stdenv, cvs}:
66+{stdenvNoCC, cvs}:
7788{cvsRoot, module, tag ? null, date ? null, sha256}:
991010-stdenv.mkDerivation {
1010+stdenvNoCC.mkDerivation {
1111 name = "cvs-export";
1212 builder = ./builder.sh;
1313 nativeBuildInputs = [cvs];
+2-2
pkgs/build-support/fetchdarcs/default.nix
···11-{stdenv, darcs, nix, cacert}:
11+{stdenvNoCC, darcs, nix, cacert}:
2233{url, rev ? null, context ? null, md5 ? "", sha256 ? ""}:
4455if md5 != "" then
66 throw "fetchdarcs does not support md5 anymore, please use sha256"
77else
88-stdenv.mkDerivation {
88+stdenvNoCC.mkDerivation {
99 name = "fetchdarcs";
1010 NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
1111 builder = ./builder.sh;
+3-3
pkgs/build-support/fetchegg/default.nix
···11# Fetches a chicken egg from henrietta using `chicken-install -r'
22# See: http://wiki.call-cc.org/chicken-projects/egg-index-4.html
3344-{ stdenv, chicken }:
44+{ stdenvNoCC, chicken }:
55{ name, version, md5 ? "", sha256 ? "" }:
6677if md5 != "" then
88 throw "fetchegg does not support md5 anymore, please use sha256"
99else
1010-stdenv.mkDerivation {
1010+stdenvNoCC.mkDerivation {
1111 name = "chicken-${name}-export";
1212 builder = ./builder.sh;
1313 nativeBuildInputs = [ chicken ];
···20202121 eggName = name;
22222323- impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars;
2323+ impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars;
2424}
2525
+4-4
pkgs/build-support/fetchgit/default.nix
···11-{stdenv, git, cacert}: let
11+{stdenvNoCC, git, cacert}: let
22 urlToName = url: rev: let
33- inherit (stdenv.lib) removeSuffix splitString last;
33+ inherit (stdenvNoCC.lib) removeSuffix splitString last;
44 base = last (splitString ":" (baseNameOf (removeSuffix "/" url)));
5566 matched = builtins.match "(.*).git" base;
···4848if md5 != "" then
4949 throw "fetchgit does not support md5 anymore, please use sha256"
5050else
5151-stdenv.mkDerivation {
5151+stdenvNoCC.mkDerivation {
5252 inherit name;
5353 builder = ./builder.sh;
5454 fetcher = "${./nix-prefetch-git}"; # This must be a string to ensure it's called with bash.
···62626363 GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";
64646565- impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars ++ [
6565+ impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars ++ [
6666 "GIT_PROXY_COMMAND" "SOCKS_SERVER"
6767 ];
6868
···11-{ stdenv, curl }: # Note that `curl' may be `null', in case of the native stdenv.
11+{ stdenvNoCC, curl }: # Note that `curl' may be `null', in case of the native stdenvNoCC.
2233let
44···1010 # resulting store derivations (.drv files) much smaller, which in
1111 # turn makes nix-env/nix-instantiate faster.
1212 mirrorsFile =
1313- stdenv.mkDerivation ({
1313+ stdenvNoCC.mkDerivation ({
1414 name = "mirrors-list";
1515 builder = ./write-mirror-list.sh;
1616 preferLocalBuild = true;
···2020 # "gnu", etc.).
2121 sites = builtins.attrNames mirrors;
22222323- impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars ++ [
2323+ impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars ++ [
2424 # This variable allows the user to pass additional options to curl
2525 "NIX_CURL_FLAGS"
2626···103103in
104104105105if md5 != "" then throw "fetchurl does not support md5 anymore, please use sha256 or sha512"
106106-else if (!hasHash) then throw "Specify hash for fetchurl fixed-output derivation: ${stdenv.lib.concatStringsSep ", " urls_}"
107107-else stdenv.mkDerivation {
106106+else if (!hasHash) then throw "Specify hash for fetchurl fixed-output derivation: ${stdenvNoCC.lib.concatStringsSep ", " urls_}"
107107+else stdenvNoCC.mkDerivation {
108108 name =
109109 if showURLs then "urls"
110110 else if name != "" then name
+2-2
pkgs/stdenv/darwin/default.nix
···118118 initialPath = [ bootstrapTools ];
119119120120 fetchurlBoot = import ../../build-support/fetchurl {
121121- stdenv = stage0.stdenv;
122122- curl = bootstrapTools;
121121+ stdenvNoCC = stage0.stdenv;
122122+ curl = bootstrapTools;
123123 };
124124125125 # The stdenvs themselves don't use mkDerivation, so I need to specify this here
+1-1
pkgs/top-level/all-packages.nix
···180180181181 # `fetchurl' downloads a file from the network.
182182 fetchurl = import ../build-support/fetchurl {
183183- inherit stdenv;
183183+ inherit stdenvNoCC;
184184 # On darwin, libkrb5 needs bootstrap_cmds which would require
185185 # converting many packages to fetchurl_boot to avoid evaluation cycles.
186186 curl = buildPackages.curl.override (lib.optionalAttrs stdenv.isDarwin { gssSupport = false; });