forge/ayaports
1
0
Fork 0
Code Issues 44 Pull requests 15 Projects Releases Packages Wiki Activity Actions

user/git-annex: upgrade to 10.20230321

Browse source
This commit is contained in:
Antoine Martin 2023-03-23 16:09:42 -04:00
parent ad9d0ca3fb
commit b1199b9e4c
Signed by: forge
GPG key ID: D62A472A4AA7D541
3 changed files with 51 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
user/git-annex/APKBUILD
View file

@ -1,10 +1,10 @@
# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
pkgname=git-annex
pkgver=10.20230214
pkgver=10.20230321
_bloomfilterver=2.0.1.0
_gitlfsver=1.2.0
pkgrel=1
pkgrel=0
pkgdesc="Manage files with git, without checking their contents into git"
url="http://git-annex.branchable.com"
arch="x86_64 aarch64" # limited by ghc
@ -60,8 +60,6 @@ _cabal_home="$srcdir/dist"
_cabal_config="git-annex git-lfs"
cabal_update() {
cabal_depends
msg "Freezing $pkgname dependencies"
# Resolve deps and generate fresh cabal.config with version constraints.
@ -77,12 +75,26 @@ 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
}
cabal_depends() {
prepare() {
default_prepare
if [ "$(head -n 1 "$srcdir/git-annex.config")" != "--$pkgver" ]; then
die "Requirements file is outdated, run 'abuild cabal_update'"
fi
for i in $_cabal_config; do
cd "$srcdir"/$i*
ln -sf "$srcdir/$i.config" cabal.config
done
# ghc version path
export PATH="$PATH:/usr/lib/llvm14/bin"
@ -100,21 +112,6 @@ cabal_depends() {
HOME="$_cabal_home" cabal v1-install
}
prepare() {
default_prepare
if [ "$(head -n 1 "$srcdir/git-annex.config")" != "--$pkgver" ]; then
die "Requirements file is outdated, run 'abuild cabal_update'"
fi
for i in $_cabal_config; do
cd "$srcdir"/$i*
ln -sf "$srcdir/$i.config" cabal.config
done
cabal_depends
}
build() {
# ghc version path
export PATH="$PATH:/usr/lib/llvm14/bin"
@ -137,12 +134,13 @@ check() {
package() {
HOME="$_cabal_home" make DESTDIR="$pkgdir" install
}
sha512sums="
60047137c1b72d9d9161275063028af020016aa87b8929164ec35e53bb6d2eac1067896cc81e14bcd46ee1a3621319c9928658d94e80d2b88188242dce79bd10 git-annex-10.20230214.tar.gz
b7bcb67643cdd3cca272c017cfb5388a0eb0922311a2129317212f74bf851075ce74209e5caeaabc43ce6a55d65ce534715fc8387e59c2a8dea40688ebb26e85 git-annex-10.20230321.tar.gz
1031cc28c5e5c1b7687355b709d436ebab1956ffd7591a010fa3852a1bc7412925a365f99937feeacf4b1a5d3c7b34bc0370707ad6e4533280dcac4ea3fa7c21 bloomfilter-2.0.1.0.tar.gz
13d8c3c7c9844e935af278b4b6dc477b4ef069a3b61a5fea5bf28aadbd3ca4b475aa23701fe7be8a9468af78771d1fabda3e74c5d4b9a3fbb77ee8b803198f65 git-lfs-1.2.0.tar.gz
e7589b54b3b50b233c12ca0d5d4b94b82087067b2e1c40ed3678663c21f18723afc738571ec846e944aed946612894df6597ae81e4232e1053df8021df313ee2 git-annex.config
dceb863b2839fa6ec01390c1806f6da17fc2468f54a45b354da56f6d5412bc83292a456c387b6374aadb4aec1a490aac4f0373843d114ca33fb858f382a472ec git-lfs.config
e293bb41162adcbefeb9bd81af5fadad29c4f3d1e902dbd87147a20fd3e4cd0a05c7bc44077cfdbe6cda4e44bf1802ad8051738cbfbfdac82700ed7ce1601e92 git-annex.config
c6885dd97f4559262da15220ea9c9ca27f4dbc6255a603d820e752726f8dede13af08f807c754e7ccb9400d070cbd5d5a336d24bb532944c7ad5231ced79ba33 git-lfs.config
500ebfd84e5771ed62ad2491b3f484d9a049091cd9bced072f34e64d81fd4db8aff2cfd9a0b2278335ac86198bfca551aec6ce3a2bd07d4484393a4288d3af35 bloomfilter-ghc9.2.diff
923d9e93380238115841f2dfbe61d34bf4bf8b3806f898d259125f31f5e4c6147840b1da737385aaa96a425d0dd4bacb2ab846ec3ea608ec6de243484fdded2e git-lfs-depend-update.diff
178be26bc808f6a5c065957b04e3a32b02f0a6b5eb8c422c9d8960b6e9a1f90d689360c5ad491156783b25e80f4c2f9861e9ccff5091c302be713fa3063df670 fix-makefile.patch

54
user/git-annex/git-annex.config
View file

@ -1,4 +1,4 @@
--10.20230214
--10.20230321
constraints: Cabal ==3.8.1.0,
Cabal-syntax ==3.8.1.0,
DAV ==1.3.4,
@ -13,7 +13,8 @@ constraints: Cabal ==3.8.1.0,
adjunctions ==4.4.2,
aeson ==2.1.0.0,
alex ==3.2.7.1,
ansi-terminal ==0.11.4,
ansi-terminal ==0.11.5,
ansi-terminal-types ==0.11.5,
ansi-wl-pprint ==0.6.9,
appar ==0.1.8,
array ==0.5.4.0,
@ -36,8 +37,8 @@ constraints: Cabal ==3.8.1.0,
bencode ==0.6.1.1,
bifunctors ==5.5.14,
binary ==0.8.9.1,
binary-orphans ==1.0.3,
bitvec ==1.1.3.0,
binary-orphans ==1.0.4.1,
bitvec ==1.1.4.0,
blaze-builder ==0.4.2.2,
blaze-html ==0.9.1.2,
blaze-markup ==0.8.2.8,
@ -88,18 +89,18 @@ constraints: Cabal ==3.8.1.0,
disk-free-space ==0.1.0.1,
distributive ==0.6.2.1,
dlist ==1.0,
easy-file ==0.2.2,
easy-file ==0.2.3,
edit-distance ==0.2.2.1,
email-validate ==2.3.2.18,
entropy ==0.4.1.10,
exceptions ==0.10.5,
fast-logger ==3.1.2,
fast-logger ==3.2.1,
fdo-notify ==0.3.1,
feed ==1.3.2.1,
file-embed ==0.0.15.0,
filepath ==1.4.2.2,
filepath-bytestring ==1.4.2.1.12,
free ==5.1.10,
free ==5.2,
generically ==0.1,
ghc-bignum ==1.3,
ghc-boot-th ==9.4.4,
@ -112,24 +113,24 @@ constraints: Cabal ==3.8.1.0,
hjsmin ==0.2.1,
hourglass ==0.2.12,
hsc2hs ==0.68.9,
http-api-data ==0.5,
http-api-data ==0.5.1,
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-date ==0.0.11,
http-types ==0.12.3,
http2 ==4.0.0,
http2 ==4.1.0,
indexed-traversable ==0.1.2,
indexed-traversable-instances ==0.1.1.1,
integer-gmp ==1.1,
integer-logarithms ==1.0.3.1,
invariant ==0.6,
invariant ==0.6.1,
iproute ==1.7.12,
js-chart ==2.9.4.1,
kan-extensions ==5.2.5,
language-javascript ==0.7.1.0,
lens ==5.2,
lens ==5.2.2,
libyaml ==0.1.2,
lift-type ==0.1.1.1,
lifted-base ==0.2.3.12,
@ -160,7 +161,7 @@ constraints: Cabal ==3.8.1.0,
parsec ==3.1.15.0,
path-pieces ==0.2.1,
pem ==0.2.4,
persistent ==2.14.4.4,
persistent ==2.14.5.0,
persistent-sqlite ==2.13.1.1,
persistent-template ==2.12.0.0,
pretty ==1.1.3.6,
@ -170,7 +171,7 @@ constraints: Cabal ==3.8.1.0,
psqueues ==0.2.7.3,
random ==1.2.1.1,
recv ==0.1.0,
reflection ==2.1.6,
reflection ==2.1.7,
regex-base ==0.94.0.2,
regex-tdfa ==1.3.2,
resource-pool ==0.4.0.0,
@ -194,10 +195,10 @@ constraints: Cabal ==3.8.1.0,
splitmix ==0.1.0.4,
statistics ==0.16.1.2,
stm ==2.5.1.0,
stm-chans ==3.0.0.6,
stm-chans ==3.0.0.9,
streaming-commons ==0.2.2.5,
strict ==0.4.0.1,
syb ==0.7.2.2,
syb ==0.7.2.3,
tagged ==0.8.7,
tagsoup ==0.14.8,
tasty ==1.4.3,
@ -205,13 +206,13 @@ constraints: Cabal ==3.8.1.0,
tasty-quickcheck ==0.10.2,
tasty-rerun ==1.1.18,
template-haskell ==2.19.0.0,
terminal-size ==0.3.3,
terminal-size ==0.3.4,
terminfo ==0.4.1.5,
text ==2.0.1,
text-short ==0.1.5,
th-abstraction ==0.4.5.0,
th-compat ==0.1.4,
th-lift ==0.8.2,
th-lift ==0.8.3,
th-lift-instances ==0.1.20,
these ==1.1.1.1,
time ==1.12.2,
@ -220,15 +221,15 @@ constraints: Cabal ==3.8.1.0,
time-manager ==0.0.0,
tls ==1.6.0,
tls-session-manager ==0.0.4,
torrent ==10000.1.1,
torrent ==10000.1.3,
transformers ==0.5.6.2,
transformers-base ==0.4.6,
transformers-compat ==0.7.2,
typed-process ==0.2.10.1,
typed-process ==0.2.11.0,
unix ==2.7.3,
unix-compat ==0.6,
unix-time ==0.4.8,
unliftio ==0.2.23.0,
unix-time ==0.4.9,
unliftio ==0.2.24.0,
unliftio-core ==0.2.1.0,
unordered-containers ==0.2.19.1,
utf8-string ==1.0.2,
@ -245,23 +246,24 @@ constraints: Cabal ==3.8.1.0,
wai-app-static ==3.1.7.4,
wai-extra ==3.1.13.0,
wai-logger ==2.4.0,
warp ==3.3.24,
warp-tls ==3.3.5,
warp ==3.3.25,
warp-tls ==3.3.6,
witherable ==0.4.2,
word8 ==0.1.3,
x509 ==1.7.7,
x509-store ==1.6.9,
x509-system ==1.6.7,
x509-validation ==1.6.12,
xml-conduit ==1.9.1.1,
xml-conduit ==1.9.1.2,
xml-hamlet ==0.5.0.2,
xml-types ==0.3.8,
xss-sanitize ==0.3.7.1,
yaml ==0.11.10.0,
yaml ==0.11.11.0,
yesod ==1.6.2.1,
yesod-core ==1.6.24.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

3
user/git-annex/git-lfs.config
View file

@ -1,4 +1,4 @@
--10.20230214
--10.20230321
constraints: OneTuple ==0.3.1,
QuickCheck ==2.14.2,
StateVar ==1.2.2,
@ -78,3 +78,4 @@ constraints: OneTuple ==0.3.1,
witherable ==0.4.2,
z-attoparsec-z-attoparsec-internal ==0.14.4,
zlib ==0.6.3.0
nix: disable