From 11475a1789c8a9120a65740f55e9e1512cb9958a Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 11 Apr 2023 21:07:46 -0400 Subject: [PATCH] user/git-annex: upgrade to 10.20230407 --- user/git-annex/APKBUILD | 13 +++++-------- user/git-annex/git-annex.config | 16 ++++++++-------- user/git-annex/git-lfs.config | 2 +- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/user/git-annex/APKBUILD b/user/git-annex/APKBUILD index c27bbb4..a25a941 100644 --- a/user/git-annex/APKBUILD +++ b/user/git-annex/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Antoine Martin (ayakael) # Contributor: Antoine Martin (ayakael) pkgname=git-annex -pkgver=10.20230329 +pkgver=10.20230407 _bloomfilterver=2.0.1.0 _gitlfsver=1.2.0 pkgrel=0 @@ -57,7 +57,7 @@ _feature_flags=" -fHttpClientRestricted \ " _cabal_home="$srcdir/dist" -_cabal_config="git-annex git-lfs" +_cabal_config="git-lfs git-annex" cabal_update() { msg "Freezing $pkgname dependencies" @@ -75,9 +75,6 @@ cabal_update() { cd "$startdir" done - # git-annex is not compatible with unix-compat-0.7 - sed -i 's|unix-compat.*|unix-compat ==0.6,|' git-annex.config - if ! abuild checksum; then die "Failed to update checksum, run 'abuild checksum' manually" fi @@ -136,11 +133,11 @@ package() { } sha512sums=" -b0b35f16030109341121f10977d507c64d49913ac033949b4444d94b7bec592de6ca617993cd5e0be3774e48ce0394e248d6f691c387b073db3ed7ec24c4a759 git-annex-10.20230329.tar.gz +3e2749fe94d8243501ce2cd705a25d519d4a3eb887fdf7088a306fc9e5caf3cca9619332563486f2ed5df3c67ab8c9798b3cd1c0b4ab2ae51db456f00b549846 git-annex-10.20230407.tar.gz 1031cc28c5e5c1b7687355b709d436ebab1956ffd7591a010fa3852a1bc7412925a365f99937feeacf4b1a5d3c7b34bc0370707ad6e4533280dcac4ea3fa7c21 bloomfilter-2.0.1.0.tar.gz 13d8c3c7c9844e935af278b4b6dc477b4ef069a3b61a5fea5bf28aadbd3ca4b475aa23701fe7be8a9468af78771d1fabda3e74c5d4b9a3fbb77ee8b803198f65 git-lfs-1.2.0.tar.gz -37c238e1290fe239298e78e950ed28e363cde44319dcb548030bb73d68c96649a98787cd902867fd677ffcaf011efb5088801e61b96eccd0f484c10b2914a5f1 git-annex.config -3f255b3cc534257fba11647d79718009861b6462f19c90acb790a8a8107de1b9a882538b5ccba44cbd0c100d3032cb4ee09f69427040f0015acad07f9fa81354 git-lfs.config +0ab66e49ce9ac2b0ce222a6362935ff58a5bece4aec0a868c80b410d07ecbfb5a092322309d524d6c8ae0145ed895e1dc705060d54a863298397e118e479a548 git-annex.config +747b8efb987243295a34386faabb2928dbe61594475a559d34af48ca9acdea4f17a6a7151ce7d1d2fb65ad0ae4331d4fce702c0fc26c49ed49d9dcfe744c1a47 git-lfs.config 500ebfd84e5771ed62ad2491b3f484d9a049091cd9bced072f34e64d81fd4db8aff2cfd9a0b2278335ac86198bfca551aec6ce3a2bd07d4484393a4288d3af35 bloomfilter-ghc9.2.diff 923d9e93380238115841f2dfbe61d34bf4bf8b3806f898d259125f31f5e4c6147840b1da737385aaa96a425d0dd4bacb2ab846ec3ea608ec6de243484fdded2e git-lfs-depend-update.diff 178be26bc808f6a5c065957b04e3a32b02f0a6b5eb8c422c9d8960b6e9a1f90d689360c5ad491156783b25e80f4c2f9861e9ccff5091c302be713fa3063df670 fix-makefile.patch diff --git a/user/git-annex/git-annex.config b/user/git-annex/git-annex.config index 8d70d33..3ede950 100644 --- a/user/git-annex/git-annex.config +++ b/user/git-annex/git-annex.config @@ -1,4 +1,4 @@ ---10.20230329 +--10.20230407 constraints: Cabal ==3.8.1.0, Cabal-syntax ==3.8.1.0, DAV ==1.3.4, @@ -12,7 +12,7 @@ constraints: Cabal ==3.8.1.0, StateVar ==1.2.2, adjunctions ==4.4.2, aeson ==2.1.0.0, - alex ==3.2.7.1, + alex ==3.2.7.3, ansi-terminal ==0.11.5, ansi-terminal-types ==0.11.5, ansi-wl-pprint ==0.6.9, @@ -82,7 +82,7 @@ constraints: Cabal ==3.8.1.0, data-default-instances-dlist ==0.0.1, data-default-instances-old-locale ==0.0.1, data-fix ==0.3.2, - dbus ==1.2.27, + dbus ==1.2.28, deepseq ==1.4.8.0, dense-linear-algebra ==0.1.0.0, directory ==1.3.7.1, @@ -120,7 +120,7 @@ constraints: Cabal ==3.8.1.0, http-conduit ==2.3.8, http-date ==0.0.11, http-types ==0.12.3, - http2 ==4.1.0, + http2 ==4.1.2, indexed-traversable ==0.1.2, indexed-traversable-instances ==0.1.1.1, integer-gmp ==1.1, @@ -138,7 +138,7 @@ constraints: Cabal ==3.8.1.0, math-functions ==0.3.4.2, memory ==0.18.0, microlens ==0.4.13.1, - microlens-th ==0.4.3.11, + microlens-th ==0.4.3.12, microstache ==1.0.2.3, mime-types ==0.1.1.0, monad-control ==1.0.3.1, @@ -186,14 +186,14 @@ constraints: Cabal ==3.8.1.0, semigroupoids ==5.3.7, semigroups ==0.20, setenv ==0.1.1.3, - shakespeare ==2.0.30, + shakespeare ==2.1.0, silently ==1.2.5.3, simple-sendfile ==0.2.30, skein ==1.0.9.4, socks ==0.6.1, split ==0.2.3.5, splitmix ==0.1.0.4, - statistics ==0.16.1.2, + statistics ==0.16.2.0, stm ==2.5.1.0, stm-chans ==3.0.0.9, streaming-commons ==0.2.2.5, @@ -257,7 +257,7 @@ constraints: Cabal ==3.8.1.0, xml-conduit ==1.9.1.2, xml-hamlet ==0.5.0.2, xml-types ==0.3.8, - xss-sanitize ==0.3.7.1, + xss-sanitize ==0.3.7.2, yaml ==0.11.11.0, yesod ==1.6.2.1, yesod-core ==1.6.24.2, diff --git a/user/git-annex/git-lfs.config b/user/git-annex/git-lfs.config index 1d0e470..8be1b82 100644 --- a/user/git-annex/git-lfs.config +++ b/user/git-annex/git-lfs.config @@ -1,4 +1,4 @@ ---10.20230329 +--10.20230407 constraints: OneTuple ==0.3.1, QuickCheck ==2.14.2, StateVar ==1.2.2,