From 12e0c5c76c4b6bcd6295096416f906bef3755f2c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 7 Jul 2021 13:20:37 -0700 Subject: [PATCH 1/3] nixUnstable: 2.4pre20210601_5985b8b -> 2.4pre20210707_02dd6bb (cherry picked from commit 2d1568561b80205b89a5b47e892e636441c26720) --- pkgs/tools/package-management/nix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 2658d4f44a8..8fb6692c490 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -211,13 +211,13 @@ in rec { nixUnstable = lib.lowPrio (callPackage common rec { pname = "nix"; version = "2.4${suffix}"; - suffix = "pre20210601_5985b8b"; + suffix = "pre20210707_02dd6bb"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "5985b8b5275605ddd5e92e2f0a7a9f494ac6e35d"; - sha256 = "sha256-2So7ZsD8QJlOXCYqdoj8naNgBw6O4Vw1MM2ORsaqlXc="; + rev = "02dd6bb610e55a009cd7a4c83639698d3a7acaa2"; + sha256 = "sha256-ARRiLrDOK+JQtvVXsYegspENYimQzilvdTfO7eiBuaA="; }; inherit storeDir stateDir confDir boehmgc; From 60370d7133072e1e9140bd444c464cc4bbb45a69 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 7 Jul 2021 22:49:18 +0200 Subject: [PATCH 2/3] nixUnstable: patch boehmgc (nix#4944) As has been done in https://github.com/NixOS/nix/pull/4944 This introduces the boehmgc_nix and boehmgc_nixUnstable attributes which are useful for external packages that link with Nix and its boehmgc. (cherry picked from commit 596ac242af767b38e48af9076887b206dc72e472) --- pkgs/tools/package-management/nix/default.nix | 11 ++++++++--- pkgs/top-level/all-packages.nix | 13 ++++++++++++- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 8fb6692c490..49da6f40dce 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -2,7 +2,8 @@ , storeDir ? "/nix/store" , stateDir ? "/nix/var" , confDir ? "/etc" -, boehmgc +, boehmgc_nix +, boehmgc_nixUnstable , Security }: @@ -205,7 +206,9 @@ in rec { sha256 = "sha256-cToMnZU3+UpjeiiXnG3clz9zn8Xk+TbB7UbqmLMrlFk="; }; - inherit storeDir stateDir confDir boehmgc; + boehmgc = boehmgc_nix; + + inherit storeDir stateDir confDir; }); nixUnstable = lib.lowPrio (callPackage common rec { @@ -220,7 +223,9 @@ in rec { sha256 = "sha256-ARRiLrDOK+JQtvVXsYegspENYimQzilvdTfO7eiBuaA="; }; - inherit storeDir stateDir confDir boehmgc; + boehmgc = boehmgc_nixUnstable; + + inherit storeDir stateDir confDir; }); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 91a0792812b..ace98e80db3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14274,6 +14274,18 @@ 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 { }; @@ -30440,7 +30452,6 @@ in inherit (callPackage ../tools/package-management/nix { storeDir = config.nix.storeDir or "/nix/store"; stateDir = config.nix.stateDir or "/nix/var"; - boehmgc = boehmgc.override { enableLargeConfig = true; }; inherit (darwin.apple_sdk.frameworks) Security; }) nix From 648f26faa4d2079e2edacf1bdc771b45b53d42b1 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 18 Jul 2021 00:00:00 +0200 Subject: [PATCH 3/3] boehmgc_{nix,nixUnstable}: Move into {nix,nixUnstable}.passthru 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) --- pkgs/tools/package-management/nix/default.nix | 18 ++++++++++++++++-- pkgs/top-level/all-packages.nix | 12 ------------ 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 49da6f40dce..2b369527b1f 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ace98e80db3..e30789efd85 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };