community/git-annex: lint

community/git-annex/APKBUILD

@@ -1,9 +1,8 @@
 # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
 # Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
 pkgname=git-annex
-pkgver=10.20230407
+pkgver=10.20230626
 _bloomfilterver=2.0.1.0
-_gitlfsver=1.2.0
 pkgrel=0
 pkgdesc="Manage files with git, without checking their contents into git"
 url="http://git-annex.branchable.com"
@@ -32,11 +31,9 @@ makedepends="
 source="
 	https://git.joeyh.name/index.cgi/git-annex.git/snapshot/git-annex-$pkgver.tar.gz
 	https://hackage.haskell.org/package/bloomfilter-$_bloomfilterver/bloomfilter-$_bloomfilterver.tar.gz
-	https://hackage.haskell.org/package/git-lfs-$_gitlfsver/git-lfs-$_gitlfsver.tar.gz
 	git-annex.config
-	git-lfs.config
+	git-annex-block-crypton.patch
 	bloomfilter-ghc9.2.diff
-	git-lfs-depend-update.diff
 	fix-makefile.patch
 	"
 subpackages="$pkgname-doc $pkgname-bash-completion $pkgname-fish-completion $pkgname-zsh-completion"
@@ -57,11 +54,17 @@ _feature_flags="
 	-fHttpClientRestricted \
 	"
 _cabal_home="$srcdir/dist"
-_cabal_config="git-lfs git-annex"
+_cabal_config="git-annex"
 
 cabal_update() {
+	default_prepare
 	msg "Freezing $pkgname dependencies"
 
+	msg "Installing dependency bloomfilter-$_bloomfilterver out-of-tree"
+	cd "$srcdir"/bloomfilter-*
+	patch -p1 -i "$srcdir"/bloomfilter-ghc9.2.diff
+	HOME="$_cabal_home" cabal v1-install
+
 	# Resolve deps and generate fresh cabal.config with version constraints.
 	HOME="$_cabal_home" cabal update
 	for i in $_cabal_config; do
@@ -102,11 +105,6 @@ prepare() {
 	cd "$srcdir"/bloomfilter-*
 	patch -p1 -i "$srcdir"/bloomfilter-ghc9.2.diff
 	HOME="$_cabal_home" cabal v1-install
-
-	msg "installing dependency git-lfs-$_gitlfsver out-of-tree"
-	cd "$srcdir"/git-lfs-*
-	patch -p1 -i "$srcdir"/git-lfs-depend-update.diff
-	HOME="$_cabal_home" cabal v1-install
 }
 
 build() {
@@ -117,6 +115,7 @@ build() {
 	HOME="$_cabal_home" cabal update
 	HOME="$_cabal_home" cabal v1-install \
 		--only-dependencies \
+		--allow-newer=feed:base-compat \
 		$_feature_flags
 	HOME="$_cabal_home" cabal v1-configure $_feature_flags
 	HOME="$_cabal_home" cabal v1-build -j
@@ -133,12 +132,10 @@ package() {
 }
 
 sha512sums="
-3e2749fe94d8243501ce2cd705a25d519d4a3eb887fdf7088a306fc9e5caf3cca9619332563486f2ed5df3c67ab8c9798b3cd1c0b4ab2ae51db456f00b549846  git-annex-10.20230407.tar.gz
+fdcf3e68f161d68f9b02194727c145d6212fa826ade15b5ee76dc0bb6f936e06972e832edddf2d8671d98609643c019aa04610111498b32721165105078bc432  git-annex-10.20230626.tar.gz
 1031cc28c5e5c1b7687355b709d436ebab1956ffd7591a010fa3852a1bc7412925a365f99937feeacf4b1a5d3c7b34bc0370707ad6e4533280dcac4ea3fa7c21  bloomfilter-2.0.1.0.tar.gz
-13d8c3c7c9844e935af278b4b6dc477b4ef069a3b61a5fea5bf28aadbd3ca4b475aa23701fe7be8a9468af78771d1fabda3e74c5d4b9a3fbb77ee8b803198f65  git-lfs-1.2.0.tar.gz
+368e9ae547c91f4cb2e6842d54d04c2cc4570abae847415a3d9420af0d16d9a09e761eaca695fda2a950ec6e37c6fe63286b8d088b853a357d360bdcf6b736ca  git-annex.config
-0ab66e49ce9ac2b0ce222a6362935ff58a5bece4aec0a868c80b410d07ecbfb5a092322309d524d6c8ae0145ed895e1dc705060d54a863298397e118e479a548  git-annex.config
+6c8b2055ddffc49a8572aec4880514808be01e00721617d157d51974131164e9663e656e8af7c81905e9b248a56ee4cfc7c048a5b55a09b9eab0c5827c75bd55  git-annex-block-crypton.patch
-747b8efb987243295a34386faabb2928dbe61594475a559d34af48ca9acdea4f17a6a7151ce7d1d2fb65ad0ae4331d4fce702c0fc26c49ed49d9dcfe744c1a47  git-lfs.config
 500ebfd84e5771ed62ad2491b3f484d9a049091cd9bced072f34e64d81fd4db8aff2cfd9a0b2278335ac86198bfca551aec6ce3a2bd07d4484393a4288d3af35  bloomfilter-ghc9.2.diff
-923d9e93380238115841f2dfbe61d34bf4bf8b3806f898d259125f31f5e4c6147840b1da737385aaa96a425d0dd4bacb2ab846ec3ea608ec6de243484fdded2e  git-lfs-depend-update.diff
 178be26bc808f6a5c065957b04e3a32b02f0a6b5eb8c422c9d8960b6e9a1f90d689360c5ad491156783b25e80f4c2f9861e9ccff5091c302be713fa3063df670  fix-makefile.patch
 "

community/git-annex/git-annex-block-crypton.patch

@@ -0,0 +1,14 @@
+diff --git a/git-annex.cabal.orig b/git-annex.cabal
+index e916003..cddc2d6 100644
+--- a/git-annex.cabal.orig
++++ b/git-annex.cabal
+@@ -381,7 +381,8 @@ Executable git-annex
+    aws (>= 0.20),
+    DAV (>= 1.0),
+    network (>= 3.0.0.0),
+-   network-bsd
++   network-bsd,
++   warp (< 3.3.26)
+   CC-Options: -Wall
+   GHC-Options: -Wall -fno-warn-tabs  -Wincomplete-uni-patterns
+   Default-Language: Haskell2010

community/git-annex/git-annex.config

@@ -1,41 +1,40 @@
---10.20230407
+--10.20230626
 constraints: Cabal ==3.8.1.0,
              Cabal-syntax ==3.8.1.0,
              DAV ==1.3.4,
              Glob ==0.10.2,
              HUnit ==1.6.2.0,
              IfElse ==0.85,
-             OneTuple ==0.3.1,
+             OneTuple ==0.4.1.1,
              Only ==0.1,
-             QuickCheck ==2.14.2,
+             QuickCheck ==2.14.3,
              SafeSemaphore ==0.10.1,
              StateVar ==1.2.2,
              adjunctions ==4.4.2,
-             aeson ==2.1.0.0,
+             aeson ==2.1.2.1,
-             alex ==3.2.7.3,
+             alex ==3.4.0.0,
-             ansi-terminal ==0.11.5,
+             ansi-terminal ==1.0,
              ansi-terminal-types ==0.11.5,
-             ansi-wl-pprint ==0.6.9,
              appar ==0.1.8,
              array ==0.5.4.0,
              asn1-encoding ==0.9.6,
              asn1-parse ==0.9.5,
              asn1-types ==0.3.4,
-             assoc ==1.0.2,
+             assoc ==1.1,
              async ==2.2.4,
              attoparsec ==0.14.4,
              attoparsec-iso8601 ==1.1.0.0,
              auto-update ==0.1.6,
-             aws ==0.24,
+             aws ==0.24.1,
              base ==4.17.0.0,
              base-compat ==0.12.2,
              base-compat-batteries ==0.12.2,
-             base-orphans ==0.8.7,
+             base-orphans ==0.9.0,
              base16-bytestring ==1.0.2.0,
              base64-bytestring ==1.2.1.0,
-             basement ==0.0.15,
+             basement ==0.0.16,
              bencode ==0.6.1.1,
-             bifunctors ==5.5.14,
+             bifunctors ==5.6.1,
              binary ==0.8.9.1,
              binary-orphans ==1.0.4.1,
              bitvec ==1.1.4.0,
@@ -58,15 +57,15 @@ constraints: Cabal ==3.8.1.0,
              code-page ==0.2.1,
              colour ==2.3.6,
              comonad ==5.0.8,
-             concurrent-output ==1.10.17,
+             concurrent-output ==1.10.18,
-             conduit ==1.3.4.3,
+             conduit ==1.3.5,
              conduit-extra ==1.3.6,
              connection ==0.3.1,
              containers ==0.6.6,
              contravariant ==1.5.5,
              cookie ==0.4.6,
              cprng-aes ==0.6.1,
-             criterion ==1.6.0.0,
+             criterion ==1.6.2.0,
              criterion-measurement ==0.2.1.0,
              crypto-api ==0.13.3,
              crypto-cipher-types ==0.0.9,
@@ -82,14 +81,14 @@ 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.28,
+             dbus ==1.2.29,
              deepseq ==1.4.8.0,
              dense-linear-algebra ==0.1.0.0,
              directory ==1.3.7.1,
              disk-free-space ==0.1.0.1,
              distributive ==0.6.2.1,
              dlist ==1.0,
-             easy-file ==0.2.3,
+             easy-file ==0.2.5,
              edit-distance ==0.2.2.1,
              email-validate ==2.3.2.18,
              entropy ==0.4.1.10,
@@ -99,13 +98,14 @@ constraints: Cabal ==3.8.1.0,
              feed ==1.3.2.1,
              file-embed ==0.0.15.0,
              filepath ==1.4.2.2,
-             filepath-bytestring ==1.4.2.1.12,
+             filepath-bytestring ==1.4.2.1.13,
+             foldable1-classes-compat ==0.1,
              free ==5.2,
-             generically ==0.1,
+             generically ==0.1.1,
              ghc-bignum ==1.3,
              ghc-boot-th ==9.4.4,
              ghc-prim ==0.9.0,
-             git-lfs ==1.2.0,
+             git-lfs ==1.2.1,
              happy ==1.20.1.1,
              hashable ==1.4.2.0,
              haskeline ==0.8.2,
@@ -117,12 +117,12 @@ constraints: Cabal ==3.8.1.0,
              http-client ==0.7.13.1,
              http-client-restricted ==0.0.5,
              http-client-tls ==0.3.6.1,
-             http-conduit ==2.3.8,
+             http-conduit ==2.3.8.2,
              http-date ==0.0.11,
              http-types ==0.12.3,
-             http2 ==4.1.2,
+             http2 ==4.1.4,
-             indexed-traversable ==0.1.2,
+             indexed-traversable ==0.1.2.1,
-             indexed-traversable-instances ==0.1.1.1,
+             indexed-traversable-instances ==0.1.1.2,
              integer-gmp ==1.1,
              integer-logarithms ==1.0.3.1,
              invariant ==0.6.1,
@@ -138,17 +138,17 @@ 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.12,
+             microlens-th ==0.4.3.13,
              microstache ==1.0.2.3,
              mime-types ==0.1.1.0,
              monad-control ==1.0.3.1,
-             monad-logger ==0.3.39,
+             monad-logger ==0.3.40,
              monad-loops ==0.4.3,
              mono-traversable ==1.0.15.3,
              mountpoints ==1.0.2,
              mtl ==2.2.2,
              mwc-random ==0.15.0.2,
-             network ==3.1.2.7,
+             network ==3.1.4.0,
              network-bsd ==2.8.1.0,
              network-byte-order ==0.1.6,
              network-info ==0.2.1,
@@ -156,7 +156,7 @@ constraints: Cabal ==3.8.1.0,
              network-uri ==2.6.4.2,
              old-locale ==1.0.0.7,
              old-time ==1.1.0.3,
-             optparse-applicative ==0.17.0.0,
+             optparse-applicative ==0.18.1.0,
              parallel ==3.2.2.0,
              parsec ==3.1.15.0,
              path-pieces ==0.2.1,
@@ -165,7 +165,9 @@ constraints: Cabal ==3.8.1.0,
              persistent-sqlite ==2.13.1.1,
              persistent-template ==2.12.0.0,
              pretty ==1.1.3.6,
-             primitive ==0.7.4.0,
+             prettyprinter ==1.7.1,
+             prettyprinter-ansi-terminal ==1.1.3,
+             primitive ==0.8.0.0,
              process ==1.6.16.0,
              profunctors ==5.6.2,
              psqueues ==0.2.7.3,
@@ -173,22 +175,22 @@ constraints: Cabal ==3.8.1.0,
              recv ==0.1.0,
              reflection ==2.1.7,
              regex-base ==0.94.0.2,
-             regex-tdfa ==1.3.2,
+             regex-tdfa ==1.3.2.1,
              resource-pool ==0.4.0.0,
-             resourcet ==1.2.6,
+             resourcet ==1.3.0,
              rts ==1.0.2,
              safe ==0.3.19,
-             safe-exceptions ==0.1.7.3,
+             safe-exceptions ==0.1.7.4,
              sandi ==0.5,
              scientific ==0.3.7.0,
              securemem ==0.1.10,
-             semialign ==1.2.0.1,
+             semialign ==1.3,
-             semigroupoids ==5.3.7,
+             semigroupoids ==6.0.0.1,
              semigroups ==0.20,
              setenv ==0.1.1.3,
              shakespeare ==2.1.0,
              silently ==1.2.5.3,
-             simple-sendfile ==0.2.30,
+             simple-sendfile ==0.2.32,
              skein ==1.0.9.4,
              socks ==0.6.1,
              split ==0.2.3.5,
@@ -196,8 +198,8 @@ constraints: Cabal ==3.8.1.0,
              statistics ==0.16.2.0,
              stm ==2.5.1.0,
              stm-chans ==3.0.0.9,
-             streaming-commons ==0.2.2.5,
+             streaming-commons ==0.2.2.6,
-             strict ==0.4.0.1,
+             strict ==0.5,
              syb ==0.7.2.3,
              tagged ==0.8.7,
              tagsoup ==0.14.8,
@@ -210,11 +212,11 @@ constraints: Cabal ==3.8.1.0,
              terminfo ==0.4.1.5,
              text ==2.0.1,
              text-short ==0.1.5,
-             th-abstraction ==0.4.5.0,
+             th-abstraction ==0.5.0.0,
              th-compat ==0.1.4,
              th-lift ==0.8.3,
              th-lift-instances ==0.1.20,
-             these ==1.1.1.1,
+             these ==1.2,
              time ==1.12.2,
              time-compat ==1.9.6.1,
              time-locale-compat ==0.1.1.5,
@@ -229,7 +231,7 @@ constraints: Cabal ==3.8.1.0,
              unix ==2.7.3,
              unix-compat ==0.6,
              unix-time ==0.4.9,
-             unliftio ==0.2.24.0,
+             unliftio ==0.2.25.0,
              unliftio-core ==0.2.1.0,
              unordered-containers ==0.2.19.1,
              utf8-string ==1.0.2,
@@ -254,16 +256,15 @@ constraints: Cabal ==3.8.1.0,
              x509-store ==1.6.9,
              x509-system ==1.6.7,
              x509-validation ==1.6.12,
-             xml-conduit ==1.9.1.2,
+             xml-conduit ==1.9.1.3,
              xml-hamlet ==0.5.0.2,
              xml-types ==0.3.8,
              xss-sanitize ==0.3.7.2,
-             yaml ==0.11.11.0,
+             yaml ==0.11.11.1,
              yesod ==1.6.2.1,
              yesod-core ==1.6.24.2,
              yesod-form ==1.7.4,
              yesod-persistent ==1.6.0.8,
              yesod-static ==1.6.1.0,
-             z-attoparsec-z-attoparsec-internal ==0.14.4,
              zlib ==0.6.3.0
 nix: disable

community/git-annex/git-lfs-depend-update.diff

@@ -1,18 +0,0 @@
-diff --git a/git-lfs.cabal b/git-lfs.cabal
-index c4a116993af..05aba2c5cf9 100644
---- a/git-lfs.cabal
-+++ b/git-lfs.cabal
-@@ -23,11 +23,11 @@ Library
-     base >= 4.5 && < 5,
-     http-client >= 0.5 && < 0.8,
-     http-types >= 0.7 && < 0.13,
--    aeson >= 1.3 && < 2.1,
-+    aeson >= 1.3 && <= 2.2,
-     network-uri >= 2.6 && < 2.8,
-     case-insensitive >= 1.2 && < 1.3,
-     containers >= 0.5 && < 0.7,
--    text >= 1.2 && < 1.3,
-+    text >= 1.2 && < 2.1,
-     bytestring >= 0.10 && < 0.12
- 
- source-repository head

community/git-annex/git-lfs.config

@@ -1,81 +0,0 @@
---10.20230407
-constraints: OneTuple ==0.3.1,
-             QuickCheck ==2.14.2,
-             StateVar ==1.2.2,
-             aeson ==2.1.0.0,
-             appar ==0.1.8,
-             array ==0.5.4.0,
-             assoc ==1.0.2,
-             async ==2.2.4,
-             attoparsec ==0.14.4,
-             base ==4.17.0.0,
-             base-compat ==0.12.2,
-             base-compat-batteries ==0.12.2,
-             base-orphans ==0.8.7,
-             base64-bytestring ==1.2.1.0,
-             bifunctors ==5.5.14,
-             binary ==0.8.9.1,
-             blaze-builder ==0.4.2.2,
-             byteorder ==1.0.4,
-             bytestring ==0.11.3.1,
-             case-insensitive ==1.2.1.0,
-             comonad ==5.0.8,
-             containers ==0.6.6,
-             contravariant ==1.5.5,
-             cookie ==0.4.6,
-             data-default-class ==0.1.2.0,
-             data-fix ==0.3.2,
-             deepseq ==1.4.8.0,
-             directory ==1.3.7.1,
-             distributive ==0.6.2.1,
-             dlist ==1.0,
-             exceptions ==0.10.5,
-             filepath ==1.4.2.2,
-             generically ==0.1,
-             ghc-bignum ==1.3,
-             ghc-boot-th ==9.4.4,
-             ghc-prim ==0.9.0,
-             hashable ==1.4.2.0,
-             http-client ==0.7.13.1,
-             http-types ==0.12.3,
-             indexed-traversable ==0.1.2,
-             indexed-traversable-instances ==0.1.1.1,
-             integer-logarithms ==1.0.3.1,
-             iproute ==1.7.12,
-             mime-types ==0.1.1.0,
-             mtl ==2.2.2,
-             network ==3.1.2.7,
-             network-uri ==2.6.4.2,
-             parsec ==3.1.15.0,
-             pretty ==1.1.3.6,
-             primitive ==0.7.4.0,
-             process ==1.6.16.0,
-             random ==1.2.1.1,
-             rts ==1.0.2,
-             scientific ==0.3.7.0,
-             semialign ==1.2.0.1,
-             semigroupoids ==5.3.7,
-             splitmix ==0.1.0.4,
-             stm ==2.5.1.0,
-             streaming-commons ==0.2.2.5,
-             strict ==0.4.0.1,
-             tagged ==0.8.7,
-             template-haskell ==2.19.0.0,
-             text ==2.0.1,
-             text-short ==0.1.5,
-             th-abstraction ==0.4.5.0,
-             th-compat ==0.1.4,
-             these ==1.1.1.1,
-             time ==1.12.2,
-             time-compat ==1.9.6.1,
-             transformers ==0.5.6.2,
-             transformers-compat ==0.7.2,
-             unix ==2.7.3,
-             unordered-containers ==0.2.19.1,
-             uuid-types ==1.0.5,
-             vector ==0.13.0.0,
-             vector-stream ==0.1.0.0,
-             witherable ==0.4.2,
-             z-attoparsec-z-attoparsec-internal ==0.14.4,
-             zlib ==0.6.3.0
-nix: disable