@@ -193,10 +193,25 @@ common =
193193
194194 preBuild = "unset NIX_INDENT_MAKE";
195195 });
196+ inherit boehmgc;
196197 };
197198 };
198199 in nix;
199200
201+ boehmgc_nix = boehmgc.override {
202+ enableLargeConfig = true;
203+ };
204+
205+ boehmgc_nixUnstable = boehmgc_nix.overrideAttrs (drv: {
206+ patches = (drv.patches or []) ++ [
207+ # Part of the GC solution in https://github.com/NixOS/nix/pull/4944
208+ (fetchpatch {
209+ url = https://github.com/hercules-ci/nix/raw/5c58d84a76d96f269e3ff1e72c9c9ba5f68576af/boehmgc-coroutine-sp-fallback.diff;
210+ sha256 = "sha256-JvnWVTlkltmQUs/0qApv/LPZ690UX1/2hEP+LYRwKbI=";
211+ })
212+ ];
213+ });
214+
200215in rec {
201216
202217 nix = nixStable;
@@ -209,22 +224,26 @@ in rec {
209224 sha256 = "sha256-cToMnZU3+UpjeiiXnG3clz9zn8Xk+TbB7UbqmLMrlFk=";
210225 };
211226
212− inherit storeDir stateDir confDir boehmgc;
227+ boehmgc = boehmgc_nix;
228+
229+ inherit storeDir stateDir confDir;
213230 });
214231
215232 nixUnstable = lib.lowPrio (callPackage common rec {
216233 pname = "nix";
217234 version = "2.4${suffix}";
218− suffix = "pre20210601_5985b8b";
235+ suffix = "pre20210707_02dd6bb";
219236
220237 src = fetchFromGitHub {
221238 owner = "NixOS";
222239 repo = "nix";
223− rev = "5985b8b5275605ddd5e92e2f0a7a9f494ac6e35d";
224− sha256 = "sha256-2So7ZsD8QJlOXCYqdoj8naNgBw6O4Vw1MM2ORsaqlXc=";
240+ rev = "02dd6bb610e55a009cd7a4c83639698d3a7acaa2";
241+ sha256 = "sha256-ARRiLrDOK+JQtvVXsYegspENYimQzilvdTfO7eiBuaA=";
225242 };
226243
227− inherit storeDir stateDir confDir boehmgc;
244+ boehmgc = boehmgc_nixUnstable;
245+
246+ inherit storeDir stateDir confDir;
228247
229248 });
230249