From d7c8cbba1d5a83f91201e82a5afccc0cf5147e41 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 8 Jan 2025 20:37:29 +0100 Subject: [PATCH] git-annex: update to 10.20250102. Switch to using cabal. 32-bit is unsupported upstream. --- srcpkgs/git-annex/files/stack.yaml | 30 -------------------------- srcpkgs/git-annex/template | 34 +++++++++++++++++------------- 2 files changed, 19 insertions(+), 45 deletions(-) delete mode 100644 srcpkgs/git-annex/files/stack.yaml diff --git a/srcpkgs/git-annex/files/stack.yaml b/srcpkgs/git-annex/files/stack.yaml deleted file mode 100644 index acc592054f7091..00000000000000 --- a/srcpkgs/git-annex/files/stack.yaml +++ /dev/null @@ -1,30 +0,0 @@ -flags: - git-annex: - production: true - assistant: true - pairing: true - torrentparser: true - magicmime: false - dbus: false - debuglocks: false - benchmark: true - gitlfs: true -packages: - - '.' -resolver: lts-19.0 -extra-deps: - - IfElse-0.85 - - aws-0.22 - - bloomfilter-2.0.1.0 - - git-lfs-1.2.0 - - http-client-restricted-0.0.4 - - network-multicast-0.3.2 - - sandi-0.5 - - torrent-10000.1.1 - - base16-bytestring-0.1.1.7 - - base64-bytestring-1.0.0.3 - - bencode-0.6.1.1 - - aeson-1.5.6.0@sha256:5003bb6fd260d2e2d5a51dee2bf5c8e8f29e4e0e0288fef805c22dcc80ecab06,6788 - - http-client-0.7.11@sha256:3f59ac8ffe2a3768846cdda040a0d1df2a413960529ba61c839861c948871967,5756 -explicit-setup-deps: - git-annex: true diff --git a/srcpkgs/git-annex/template b/srcpkgs/git-annex/template index 91d714a327ac3d..93de68e3a73a3f 100644 --- a/srcpkgs/git-annex/template +++ b/srcpkgs/git-annex/template @@ -1,32 +1,36 @@ # Template file for 'git-annex' pkgname=git-annex -version=10.20221103 +version=10.20250102 revision=1 -build_style=haskell-stack +build_style=gnu-makefile +make_use_env=yes +hostmakedepends="ghc cabal-install pkg-config" makedepends="curl file-devel gnupg gnutls-devel gsasl-devel libxml2-devel - lsof rsync git ncurses-devel bup borg nocache git-remote-gcrypt" + lsof rsync git ncurses-devel bup borg nocache git-remote-gcrypt dbus-devel + zlib-devel" # depends are utilities required by git-annex depends="git rsync curl lsof gnupg>=2" short_desc="Git addon for managing large files" -maintainer="Evan Deaubl " +maintainer="Orphaned " license="AGPL-3.0-or-later, MIT, BSD-2-Clause, GPL-3.0-or-later, custom:Expat, custom:MIT-twitter, GPL-2.0-only, custom:icon-license" homepage="https://git-annex.branchable.com" changelog="https://git.joeyh.name/index.cgi/git-annex.git/plain/CHANGELOG" -distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz" -checksum=f549c31264d6da3bb544755795e7fc29882ebec45014905bc2ea0ade28398f3b +distfiles="https://git.joeyh.name/index.cgi/git-annex.git/snapshot/git-annex-${version}.tar.gz" +checksum=65ed59d25334891a054f000c3f668b2e31ff2fb48863cd3a9406a3a5d8206476 nopie_files="/usr/bin/git-annex" nocross=yes -# These install steps are pulled from the install target in the -# git-annex Makefile. The target can't be called directly because it is -# comingled with the Cabal build, and we're using Stackage instead -# Make sure they are in sync with each version upgrade -post_install() { - ln -sf git-annex ${DESTDIR}/usr/bin/git-annex-shell - ln -sf git-annex ${DESTDIR}/usr/bin/git-remote-tor-annex +# https://github.com/yesodweb/yesod/issues/1854 +export BUILDEROPTIONS="--constraint 'wai-extra<3.1.17'" + +if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then + broken="unsupported upstream" +fi - vmkdir usr/share/man/man1 - vcopy man/*.1 usr/share/man/man1 +pre_build() { + cabal update +} +post_install() { vlicense doc/license/AGPL }