about summary refs log tree commit diff
path: root/pkgs/tools/package-management
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2024-03-11 12:31:14 +0200
committerGitHub <noreply@github.com>2024-03-11 12:31:14 +0200
commitb2211920487890748920fcc83f9b769494bfa2d6 (patch)
treec9beeefd4d10fd3e913556804737f8b2d51fae0a /pkgs/tools/package-management
parent74ae883522840dd7481040b22179e80947853470 (diff)
parentd7f68859379f632513c18852163da4547ddf25e4 (diff)
Merge pull request #294932 from a-n-n-a-l-e-e/nix_2_3_serial
nixVersions.nix_2_3: disable parallel checking
Diffstat (limited to 'pkgs/tools/package-management')
-rw-r--r--pkgs/tools/package-management/nix/default.nix8
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 92c988ea5d087..7f5564c986219 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -162,7 +162,7 @@ let
     pkg;
 
 in lib.makeExtensible (self: ({
-  nix_2_3 = (common {
+  nix_2_3 = ((common {
     version = "2.3.17";
     hash = "sha256-EK0pgHDekJFqr0oMj+8ANIjq96WPjICe2s0m4xkUdH4=";
     patches = [
@@ -170,7 +170,11 @@ in lib.makeExtensible (self: ({
       ./patches/2_3/CVE-2024-27297.patch
     ];
     maintainers = with lib.maintainers; [ flokli raitobezarius ];
-  }).override { boehmgc = boehmgc-nix_2_3; };
+  }).override { boehmgc = boehmgc-nix_2_3; }).overrideAttrs {
+    # https://github.com/NixOS/nix/issues/10222
+    # spurious test/add.sh failures
+    enableParallelChecking = false;
+  };
 
   nix_2_10 = common {
     version = "2.10.3";