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

boehmgc_{nix,nixUnstable}: Move into {nix,nixUnstable}.passthru

Browse Source 
Do not pollute top-level, but do provide allow the derivations to
be accessed for debugging and reuse if necessary.

(cherry picked from commit 2c2e1db91db465d7a83593d9322aa204c0fa4b43)
This commit is contained in:
Robert Hensing 2021-07-18 00:00:00 +02:00 committed by github-actions[bot]
parent 60370d7133
commit 648f26faa4
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,8 +2,7 @@
, storeDir ? "/nix/store"
, stateDir ? "/nix/var"
, confDir ? "/etc"
, boehmgc_nix
, boehmgc_nixUnstable
, boehmgc
, Security
}:
@ -190,10 +189,25 @@ common =
preBuild = "unset NIX_INDENT_MAKE";
});
inherit boehmgc;
};
};
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 {
nix = nixStable;

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

@ -14274,18 +14274,6 @@ in
boehmgc = callPackage ../development/libraries/boehm-gc { };
boehmgc_766 = callPackage ../development/libraries/boehm-gc/7.6.6.nix { };
boehmgc_nix = pkgs.boehmgc.override {
enableLargeConfig = true;
};
boehmgc_nixUnstable = pkgs.boehmgc_nix.overrideAttrs (drv: {
patches = (drv.patches or []) ++ [
# Part of the GC solution in https://github.com/NixOS/nix/pull/4944
(pkgs.fetchpatch {
url = https://github.com/hercules-ci/nix/raw/5c58d84a76d96f269e3ff1e72c9c9ba5f68576af/boehmgc-coroutine-sp-fallback.diff;
sha256 = "sha256-JvnWVTlkltmQUs/0qApv/LPZ690UX1/2hEP+LYRwKbI=";
})
];
});
boolstuff = callPackage ../development/libraries/boolstuff { };