summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorDaiderd Jordan <daiderd@gmail.com>2019-11-22 21:27:49 +0100
committerGitHub <noreply@github.com>2019-11-22 21:27:49 +0100
commit7da9844fde230adf3f35c800cfa86e655aa52841 (patch)
treef8b0ee0d508957eebad84b403341b03ca89e0c04 /pkgs/applications
parentc81e4f10c2fb8d63a0694a5c5661ed9ade050990 (diff)
parent185e30c664467f2b5411dbec2aa9a6f2e0867d85 (diff)
downloadnixpkgs-7da9844fde230adf3f35c800cfa86e655aa52841.tar
nixpkgs-7da9844fde230adf3f35c800cfa86e655aa52841.tar.gz
nixpkgs-7da9844fde230adf3f35c800cfa86e655aa52841.tar.bz2
nixpkgs-7da9844fde230adf3f35c800cfa86e655aa52841.tar.lz
nixpkgs-7da9844fde230adf3f35c800cfa86e655aa52841.tar.xz
nixpkgs-7da9844fde230adf3f35c800cfa86e655aa52841.tar.zst
nixpkgs-7da9844fde230adf3f35c800cfa86e655aa52841.zip
Merge pull request #73826 from LnL7/darwin-git
git: disable failing test on darwin
Diffstat (limited to 'pkgs/applications')
-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 a6b53561771..a8e284c6fec 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -298,6 +298,10 @@ stdenv.mkDerivation {
 
     # As of 2.19.0, t5562 refers to #!/usr/bin/perl
     patchShebangs t/t5562/invoke-with-content-length.pl
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    # XXX: Some tests added in 2.24.0 fail.
+    # Please try to re-enable on the next release.
+    disable_test t7816-grep-binary-pattern
   '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
     # Test fails (as of 2.17.0, musl 1.1.19)
     disable_test t3900-i18n-commit