[main/git-annex] Downgraded to official version 8.20211123

apk/v3.15/main/git-annex/0001-fix-build-with-ghc-9.0.1.patch

@@ -0,0 +1,76 @@
+From 4b19626a3624ebb23b86df8195e1ec0509b70f24 Mon Sep 17 00:00:00 2001
+From: Joey Hess <joeyh@joeyh.name>
+Date: Wed, 8 Dec 2021 15:08:02 -0400
+Subject: Fix build with ghc 9.0.1
+
+Continuing along the same lines as commit
+2739adc25814633b18174982977e00e809cb789e, it seems that
+while Remote -> Retriever expands to the same data type this changes
+it to, ghc 9.0.1 refuses to consider them equiviant. I guess it has
+something to do with the forall?
+
+The rest of the build all succeeds, although the stack build then crashes:
+Linking .stack-work/dist/x86_64-linux-tinfo6/Cabal-3.4.0.0/build/git-annex/git-annex ...
+Completed 233 action(s).
+Prelude.chr: bad argument: 2214592520
+This issue seems likely to be about it:
+https://github.com/commercialhaskell/stack/pull/5508
+I'm building with stack from debian, version 2.3.3, so a newer stack
+probably avoids that. Anyway, despite that stack problem,
+the git-annex binary is built, and works.
+
+The stack.yaml I used for this build was patched as follows:
+
+diff --git a/stack.yaml b/stack.yaml
+index 8dac87c15..62c4b5b9d 100644
+--- a/stack.yaml
++++ b/stack.yaml
+@@ -1,6 +1,6 @@
+ flags:
+   git-annex:
+-    production: true
++    production: false
+     assistant: true
+     pairing: true
+     torrentparser: true
+@@ -14,7 +14,7 @@ flags:
+     httpclientrestricted: true
+ packages:
+ - '.'
+-resolver: lts-18.13
++resolver: nightly-2021-09-07
+ extra-deps:
+ - IfElse-0.85
+ - aws-0.22
+
+Sponsored-by: Graham Spencer on Patreon
+---
+ CHANGELOG                                                  | 1 +
+ Remote/Glacier.hs                                          | 3 ++-
+ 3 files changed, 4 insertions(+), 1 deletion(-)
+
+
+diff --git a/Remote/Glacier.hs b/Remote/Glacier.hs
+index eaf0a5cc8..37d4f1e44 100644
+--- a/Remote/Glacier.hs
++++ b/Remote/Glacier.hs
+@@ -28,6 +28,7 @@ import Utility.Metered
+ import Annex.UUID
+ import Utility.Env
+ import Types.ProposedAccepted
++import Utility.Hash (IncrementalVerifier)
+ 
+ type Vault = String
+ type Archive = FilePath
+@@ -175,7 +176,7 @@ store' r k b p = go =<< glacierEnv c gc u
+ 		forceSuccessProcess cmd pid
+ 	go' _ _ _ _ _ = error "internal"
+ 
+-retrieve :: Remote -> Retriever
++retrieve :: forall a. Remote -> Key -> MeterUpdate -> Maybe IncrementalVerifier -> (ContentSource -> Annex a) -> Annex a
+ retrieve = byteRetriever . retrieve'
+ 
+ retrieve' :: forall a. Remote -> Key -> (L.ByteString -> Annex a) -> Annex a
+-- 
+cgit v1.2.3
+

apk/v3.15/main/git-annex/APKBUILD

@@ -5,7 +5,7 @@
 #
 
 pkgname=git-annex
-pkgver=8.20211208
+pkgver=8.20211123
 pkgrel=0
 pkgdesc="Manage files with git, without checking their contents into git"
 url="http://git-annex.branchable.com"
@@ -13,10 +13,11 @@ arch="x86 x86_64"
 license="GPL3"
 depends="git lsof rsync curl gmp zlib gnupg file gnutls libxml2 openssh util-linux libidn libgsasl"
 makedepends="cabal ghc zlib-dev file-dev gnutls-dev libxml2-dev libgsasl-dev ncurses-dev libffi-dev dbus-dev alex happy"
-_gittag=7eef6ac7037bfa7aa33e84950cc1a9e29eb6d179
+_gittag=$pkgver
 _giturl=https://git.joeyh.name/index.cgi/git-annex.git
 source="
 	$_giturl/snapshot/$pkgname-$_gittag.tar.gz
+	0001-fix-build-with-ghc-9.0.1.patch
 "
 subpackages="$pkgname-doc $pkgname-bash-completion $pkgname-zsh-completion"
 builddir="$srcdir/$pkgname-$_gittag"
@@ -163,5 +164,6 @@ package() {
 
 
 sha512sums="
-9d01209d444e78f37d325f467fea2da25e2b6a9d81365508d2e08f18afb11dd999f898630bc7d037485118952e8d83aae732e95ced34385613cb955b5cfd759b  git-annex-7eef6ac7037bfa7aa33e84950cc1a9e29eb6d179.tar.gz
+cd5eb30e71bd580867b9a92d33dc2338f239919765a7c03f5caf1b772cf9059d6d4b6899087a62d141968546d1a6187dbac11858fe93ba7fabcaa543be863613  git-annex-8.20211123.tar.gz
+af9b1764f4ae70d84afe2cda28c4799b6b8ac807bded9ceb5bc65e3c6d6c6b8d7eef1a02ea8081f7e68fe9a56ff50cd6615b1991ca339f1b2f917b9a66dbdb85  0001-fix-build-with-ghc-9.0.1.patch
 "