Skip to content

Commit

Permalink
nixVersions.nix_2_3: backport tests/check.sh / tests/add.sh race fix
Browse files Browse the repository at this point in the history
Without the change the evals fail frequently against `staging` when
`stdenv` rebbuilds `nix-2.3`. Recent example is NixOS#284542

Let's backport the patch until new `nix-2.3` release is cut.
  • Loading branch information
trofi committed Jan 29, 2024
1 parent 3b02018 commit 922cca2
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions pkgs/tools/package-management/nix/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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; };
Expand Down

0 comments on commit 922cca2

Please sign in to comment.