From 6c558485869425e86a67d0c19a57193d160e7f87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 10 Sep 2024 16:00:25 +0200 Subject: [PATCH] nixVersions.git: disable test on aarch64-linux (cherry picked from commit 74787857f812116406bf53c56b16ba2c1df55ace) --- pkgs/tools/package-management/nix/common.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index 74287df14275..7e29dec5fddf 100644 --- a/pkgs/tools/package-management/nix/common.nix +++ b/pkgs/tools/package-management/nix/common.nix @@ -243,6 +243,12 @@ self = stdenv.mkDerivation { # See https://github.com/NixOS/nix/issues/5687 + lib.optionalString (atLeast25 && stdenv.isDarwin) '' echo "exit 99" > tests/gc-non-blocking.sh + '' # TODO: investigate why this broken + + lib.optionalString (atLeast25 && stdenv.hostPlatform.system == "aarch64-linux") '' + echo "exit 0" > tests/functional/flakes/show.sh + '' + '' + # nixStatic otherwise does not find its man pages in tests. + export MANPATH=$man/share/man:$MANPATH ''; separateDebugInfo = stdenv.isLinux && (atLeast24 -> !enableStatic);