From 0b916cf8139b9b89a36fd9a5c1608dea9265fe48 Mon Sep 17 00:00:00 2001 From: Ivan Babrou Date: Fri, 10 Dec 2021 18:19:17 -0800 Subject: [PATCH] nixUnstable: disable broken test on darwin I think the expectation is that unstable would at least build and work for the most part, but the latter is not guaranteed. Currently it doesn't build. --- pkgs/tools/package-management/nix/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index c0a90f5388f0..59651c973c37 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -35,6 +35,7 @@ common = inherit pname version src patches; is24 = lib.versionAtLeast version "2.4pre"; + is25 = lib.versionAtLeast version "2.5pre"; VERSION_SUFFIX = suffix; @@ -145,6 +146,10 @@ common = # socket path becomes too long otherwise preInstallCheck = lib.optionalString stdenv.isDarwin '' export TMPDIR=$NIX_BUILD_TOP + '' + # See https://github.com/NixOS/nix/issues/5687 + + lib.optionalString (is25 && stdenv.isDarwin) '' + echo "exit 99" > tests/gc-non-blocking.sh ''; separateDebugInfo = stdenv.isLinux && (is24 -> !enableStatic);