From 922cca2e0093dab10ecfeaa32cd3ca3175325f9a Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Mon, 29 Jan 2024 10:46:48 +0000
Subject: [PATCH] nixVersions.nix_2_3: backport tests/check.sh / tests/add.sh
 race fix

Without the change the evals fail frequently against `staging` when
`stdenv` rebbuilds `nix-2.3`. Recent example is https://github.com/NixOS/nixpkgs/pull/284542

Let's backport the patch until new `nix-2.3` release is cut.
---
 pkgs/tools/package-management/nix/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index c3f970f78fb39..a34366ba51ed8 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -156,6 +156,16 @@ in lib.makeExtensible (self: ({
     hash = "sha256-EK0pgHDekJFqr0oMj+8ANIjq96WPjICe2s0m4xkUdH4=";
     patches = [
       patch-monitorfdhup
+
+      (fetchpatch2 {
+        # Backport the fix for race between:
+        # - tests/check.sh: write 'dummy'
+        # - tests/add.sh: reads 'dummy'
+        # TODO: drop on next nix-2.3 release.
+        name = "fix-check-test-race.patch";
+        url = "https://github.com/NixOS/nix/commit/0776aa11c9e5864e8666dc9dfa670b55e9d6764f.patch";
+        hash = "sha256-nOFyRtkTNgSt6vmHDAuAvm6aCfqRQBLhX/WGY8bQttU=";
+      })
     ];
     maintainers = with lib.maintainers; [ flokli raitobezarius ];
   }).override { boehmgc = boehmgc-nix_2_3; };