From 75542a9b8781b58538ec3755fdc3816c67c7a166 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 12 Jul 2025 23:24:17 +0200 Subject: [PATCH] git-annex: apply workaround for test failure with git 2.50 The next haskellPackages bulk update will also resolve this, but picking the patch will prevent a broken git-annex until the next staging-next is merged into master. --- .../haskell-modules/configuration-common.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ed02a44461f8..be9ce186e3e3 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -561,6 +561,18 @@ 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 + + # Pick fix for git 2.50 related test suite failures from 10.20250630 + # https://git-annex.branchable.com/bugs/test_suite_fail_with_git_2.50/ + (pkgs.fetchpatch { + name = "git-annex-workaround-for-git-2.50.patch"; + url = "https://git.joeyh.name/index.cgi/git-annex.git/patch/?id=fb155b1e3e59cc1f9cf8a4fe7d47cba49d1c81af"; + sha256 = "sha256-w6eXW0JqshXTd0/tNPZ0fOW2SVmA90G5eFhsd9y05BI="; + excludes = [ + "doc/**" + "CHANGELOG" + ]; + }) ]; postPatch = ''