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

Merge pull request #130952 from NixOS/backport-129574-to-release-21.05

Browse Source 
[Backport release-21.05] nixUnstable: 2.4pre20210601_5985b8b -> 2.4pre20210707_02dd6bb
This commit is contained in:
Robert Hensing 2021-07-22 09:09:24 +02:00 committed by GitHub
commit 348a2aaee0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -189,10 +189,25 @@ common =
preBuild = "unset NIX_INDENT_MAKE"; preBuild = "unset NIX_INDENT_MAKE";
}); });
inherit boehmgc;
}; };
}; };
in nix; in nix;
boehmgc_nix = boehmgc.override {
enableLargeConfig = true;
};
boehmgc_nixUnstable = boehmgc_nix.overrideAttrs (drv: {
patches = (drv.patches or []) ++ [
# Part of the GC solution in https://github.com/NixOS/nix/pull/4944
(fetchpatch {
url = https://github.com/hercules-ci/nix/raw/5c58d84a76d96f269e3ff1e72c9c9ba5f68576af/boehmgc-coroutine-sp-fallback.diff;
sha256 = "sha256-JvnWVTlkltmQUs/0qApv/LPZ690UX1/2hEP+LYRwKbI=";
})
];
});
in rec { in rec {
nix = nixStable; nix = nixStable;
@ -205,22 +220,26 @@ in rec {
sha256 = "sha256-cToMnZU3+UpjeiiXnG3clz9zn8Xk+TbB7UbqmLMrlFk="; sha256 = "sha256-cToMnZU3+UpjeiiXnG3clz9zn8Xk+TbB7UbqmLMrlFk=";
}; };
inherit storeDir stateDir confDir boehmgc; boehmgc = boehmgc_nix;
inherit storeDir stateDir confDir;
}); });
nixUnstable = lib.lowPrio (callPackage common rec { nixUnstable = lib.lowPrio (callPackage common rec {
pname = "nix"; pname = "nix";
version = "2.4${suffix}"; version = "2.4${suffix}";
suffix = "pre20210601_5985b8b"; suffix = "pre20210707_02dd6bb";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NixOS"; owner = "NixOS";
repo = "nix"; repo = "nix";
rev = "5985b8b5275605ddd5e92e2f0a7a9f494ac6e35d"; rev = "02dd6bb610e55a009cd7a4c83639698d3a7acaa2";
sha256 = "sha256-2So7ZsD8QJlOXCYqdoj8naNgBw6O4Vw1MM2ORsaqlXc="; sha256 = "sha256-ARRiLrDOK+JQtvVXsYegspENYimQzilvdTfO7eiBuaA=";
}; };
inherit storeDir stateDir confDir boehmgc; boehmgc = boehmgc_nixUnstable;
inherit storeDir stateDir confDir;
}); });

1
pkgs/top-level/all-packages.nix
View File

@ -30442,7 +30442,6 @@ in
inherit (callPackage ../tools/package-management/nix { inherit (callPackage ../tools/package-management/nix {
storeDir = config.nix.storeDir or "/nix/store"; storeDir = config.nix.storeDir or "/nix/store";
stateDir = config.nix.stateDir or "/nix/var"; stateDir = config.nix.stateDir or "/nix/var";
boehmgc = boehmgc.override { enableLargeConfig = true; };
inherit (darwin.apple_sdk.frameworks) Security; inherit (darwin.apple_sdk.frameworks) Security;
}) })
nix nix