Subject: [PATCH] gnu: git-annex: Update to 8.20211123.
From: Kyle Meyer <[email-masked]>
To: [email-masked]
Date: Tue, 23 Nov 2021 20:15:20 -0500
List-Id: <debbugs-submit.debbugs.gnu.org>

* gnu/packages/haskell-apps.scm (git-annex): Update to 8.20211123.
---
        
   Note: git-annex's build started to fail [*] when Guix's Git was updated to
   2.34.0 due to incompatibilities with the Git's new default merge strategy.
   This release resolves that issue.
   
     [*] example: https://ci.guix.gnu.org/build/1651455/log/raw

 gnu/packages/haskell-apps.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm
index 5dcf6c1cb2..2a07aa547d 100644
--- a/gnu/packages/haskell-apps.scm
+++ b/gnu/packages/haskell-apps.scm
@@ -316,14 +316,14 @@ (define-public ghcid
 (define-public git-annex
   (package
     (name "git-annex")
-    (version "8.20211028")
+    (version "8.20211123")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://hackage.haskell.org/package/"
                            "git-annex/git-annex-" version ".tar.gz"))
        (sha256
-        (base32 "0bff1bchp60hbslb9yaagvd7hym26w0c3gkkssm7sildwqazwpng"))))
+        (base32 "0i9dhh601axv0b1i56yzn6jnfp160z530fp9pd557kpq4nbvg5kl"))))
     (build-system haskell-build-system)
     (arguments
      `(#:configure-flags

base-commit: d48b404cf577cbfcd29b294e193a4db0c3e580b1
-- 
2.33.1