cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

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.
This commit is contained in:
Robert Hensing 2021-07-18 00:00:00 +02:00 committed by Jonathan Ringer
parent 596ac242af
commit 2c2e1db91d
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" , storeDir ? "/nix/store"
, stateDir ? "/nix/var" , stateDir ? "/nix/var"
, confDir ? "/etc" , confDir ? "/etc"
, boehmgc_nix , boehmgc
, boehmgc_nixUnstable
, Security , Security
}: }:
@ -194,10 +193,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;

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

@ -14669,18 +14669,6 @@ in
boehmgc = callPackage ../development/libraries/boehm-gc { }; boehmgc = callPackage ../development/libraries/boehm-gc { };
boehmgc_766 = callPackage ../development/libraries/boehm-gc/7.6.6.nix { }; 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 { }; boolstuff = callPackage ../development/libraries/boolstuff { };