From 9137f77959a209b580bc6be3d5bab36deb717fb6 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Sun, 7 Sep 2025 21:36:39 +0200 Subject: [PATCH] git-annex: patch another test failure https://git-annex.branchable.com/bugs/flaky_test_failure_add_dup/ https://hydra.nixos.org/build/306633277 similar to #438309 but applied on master due to failure for aarch64 Signed-off-by: Florian Brandes --- .../haskell-modules/configuration-common.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4bff79f95d7a..a485ab7196e7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -563,6 +563,16 @@ with haskellLib; # TODO(@sternenseemann): submit upstreamable patch resolving this # (this should be possible by also taking PREFIX into account). ./patches/git-annex-no-usr-prefix.patch + # https://git-annex.branchable.com/bugs/flaky_test_failure_add_dup/ + (pkgs.fetchpatch { + name = "git-annex-workaround-for-git-2.50_bis.patch"; + url = "https://git.joeyh.name/index.cgi/git-annex.git/patch/?id=cf449837ea9ab7687d8a157f21cad31ddf5bbfb6"; + sha256 = "sha256-HmNJ85dLht5Hy85AUkjACnET9YLPP2MshYHsApUax+I="; + excludes = [ + "doc/**" + "CHANGELOG" + ]; + }) ]; postPatch = ''