diff options
author | Parnell Springmeyer <parnell@digitalmentat.com> | 2017-01-26 02:00:04 -0800 |
---|---|---|
committer | Parnell Springmeyer <parnell@digitalmentat.com> | 2017-01-26 02:00:04 -0800 |
commit | a26a796d5c7fa305e007c2b5229e0521c8b3fb0f (patch) | |
tree | 6c35defae305b0da581f757b72b461a8f6052620 /pkgs/build-support | |
parent | ad8fde5e5d9bc25a54ac238f485e28b37d6d185a (diff) | |
parent | 142696de884213e01cc518af813a20d2e2ece3cc (diff) |
Merging against master - updating smokingpig, rebase was going to be messy
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 3 | ||||
-rw-r--r-- | pkgs/build-support/fetchbower/default.nix | 3 | ||||
-rw-r--r-- | pkgs/build-support/fetchurl/write-mirror-list.sh | 2 | ||||
-rw-r--r-- | pkgs/build-support/vm/default.nix | 12 |
4 files changed, 9 insertions, 11 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index c8e3d8b4cc82..95e0b360937a 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -281,9 +281,6 @@ stdenv.mkDerivation { crossAttrs = { shell = shell.crossDrv + shell.crossDrv.shellPath; libc = stdenv.ccCross.libc; - coreutils = coreutils.crossDrv; - binutils = binutils.crossDrv; - cc = cc.crossDrv; # # This is not the best way to do this. I think the reference should be # the style in the gcc-cross-wrapper, but to keep a stable stdenv now I diff --git a/pkgs/build-support/fetchbower/default.nix b/pkgs/build-support/fetchbower/default.nix index 11d88ae10e9f..835fbec6bf0e 100644 --- a/pkgs/build-support/fetchbower/default.nix +++ b/pkgs/build-support/fetchbower/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, bower2nix }: +{ stdenv, lib, bower2nix, cacert }: let bowerVersion = version: let @@ -9,6 +9,7 @@ let fetchbower = name: version: target: outputHash: stdenv.mkDerivation { name = "${name}-${bowerVersion version}"; + SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; buildCommand = '' fetch-bower --quiet --out=$PWD/out "${name}" "${target}" "${version}" # In some cases, the result of fetchBower is different depending diff --git a/pkgs/build-support/fetchurl/write-mirror-list.sh b/pkgs/build-support/fetchurl/write-mirror-list.sh index 55508742dd36..2dabd2e722be 100644 --- a/pkgs/build-support/fetchurl/write-mirror-list.sh +++ b/pkgs/build-support/fetchurl/write-mirror-list.sh @@ -1,4 +1,4 @@ source $stdenv/setup # !!! this is kinda hacky. -set | grep '^[a-zA-Z]\+=.*://' > $out +set | grep -E '^[a-zA-Z]+=.*://' > $out diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index d03265c089a7..36cb068d93d6 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1886,22 +1886,22 @@ rec { }; debian8i386 = { - name = "debian-8.6-jessie-i386"; - fullName = "Debian 8.6 Jessie (i386)"; + name = "debian-8.7-jessie-i386"; + fullName = "Debian 8.7 Jessie (i386)"; packagesList = fetchurl { url = mirror://debian/dists/jessie/main/binary-i386/Packages.xz; - sha256 = "b915c936233609af3ecf9272cd53fbdb2144d463e8472a30507aa112ef5e6a6b"; + sha256 = "71cacb934dc4ab2e67a5ed215ccbc9836cf8d95687edec7e7fe8d3916e3b3fe8"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; }; debian8x86_64 = { - name = "debian-8.6-jessie-amd64"; - fullName = "Debian 8.6 Jessie (amd64)"; + name = "debian-8.7-jessie-amd64"; + fullName = "Debian 8.7 Jessie (amd64)"; packagesList = fetchurl { url = mirror://debian/dists/jessie/main/binary-amd64/Packages.xz; - sha256 = "8b80b6608a8fc72509b949efe1730077f0e8383b29c6aed5f86d9f9b51a631d8"; + sha256 = "b4cfbaaef31f05ce1726d00f0a173f5b6f33a9192513302319a49848884a17f3"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; |