JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #117758 from cole-h/nix

Browse Source 
nixUnstable: pre20210317_8a5203d -> pre20210326_dd77f71
This commit is contained in:
Maximilian Bosch 2021-03-28 23:53:35 +02:00 committed by GitHub
commit 71489aa317
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/tools/package-management/nix/default.nix
View File

@ -142,11 +142,6 @@ common =
# socket path becomes too long otherwise # socket path becomes too long otherwise
preInstallCheck = lib.optionalString stdenv.isDarwin '' preInstallCheck = lib.optionalString stdenv.isDarwin ''
export TMPDIR=$NIX_BUILD_TOP export TMPDIR=$NIX_BUILD_TOP
'' +
# tests/ca/substitute.sh is flakey for some reason, so we skip it
# for now. https://github.com/NixOS/nix/issues/4667
lib.optionalString is24 ''
echo "exit 99" > tests/ca/substitute.sh
''; '';
separateDebugInfo = stdenv.isLinux; separateDebugInfo = stdenv.isLinux;
@ -219,13 +214,13 @@ in rec {
nixUnstable = lib.lowPrio (callPackage common rec { nixUnstable = lib.lowPrio (callPackage common rec {
name = "nix-2.4${suffix}"; name = "nix-2.4${suffix}";
suffix = "pre20210317_8a5203d"; suffix = "pre20210326_dd77f71";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NixOS"; owner = "NixOS";
repo = "nix"; repo = "nix";
rev = "8a5203d3b836497c2c5f157f85008aa8bcb6a1d2"; rev = "dd77f71afe6733e9790dd001125c423cb648b7ce";
sha256 = "IMzdmoWAX6Lerhslsf7h2814xjJolPnl2bICDixRgdk="; sha256 = "rVHzrsCtdiWjyLuHnDplG2mx+7dw5VyzZ9ReXxuCvHY=";
}; };
inherit storeDir stateDir confDir boehmgc; inherit storeDir stateDir confDir boehmgc;