about summary refs log tree commit diff
path: root/pkgs/applications/version-management
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2022-10-13 19:46:20 +0200
committerVladimír Čunát <v@cunat.cz>2022-10-13 22:53:09 +0200
commit115a7e20e6f76e7c63b70af8af60ff28029a7a1f (patch)
treede5158868a99e0414915f5ab7623a7925c048874 /pkgs/applications/version-management
parent46c3ebfb40f01e7e1c00871e6971d06c35212d73 (diff)
parentd8cdbe829819d2ed0c714319e889f716203e99b7 (diff)
Merge #191423: git: Disable tests that fail on ZFS
...into staging
Diffstat (limited to 'pkgs/applications/version-management')
-rw-r--r--pkgs/applications/version-management/git-and-tools/git/default.nix4
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 441727ad5bccb..dd244b3687c15 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -339,6 +339,10 @@ stdenv.mkDerivation (finalAttrs: {
     disable_test t5319-multi-pack-index
     disable_test t6421-merge-partial-clone
 
+    # Fails reproducibly on ZFS on Linux with formD normalization
+    disable_test t0021-conversion
+    disable_test t3910-mac-os-precompose
+
     ${lib.optionalString (!perlSupport) ''
       # request-pull is a Bash script that invokes Perl, so it is not available
       # when NO_PERL=1, and the test should be skipped, but the test suite does