From ec9926f478bed0acafb6e69a83b8d0a2a28a2898 Mon Sep 17 00:00:00 2001 From: slotThe Date: Fri, 5 Nov 2021 07:22:52 +0100 Subject: [PATCH] git-annex: update to 8.20211028 --- srcpkgs/git-annex/files/stack.yaml | 32 ------------------------ srcpkgs/git-annex/patches/ghc8.8.3.patch | 18 ------------- srcpkgs/git-annex/template | 6 ++--- 3 files changed, 3 insertions(+), 53 deletions(-) delete mode 100644 srcpkgs/git-annex/files/stack.yaml delete mode 100644 srcpkgs/git-annex/patches/ghc8.8.3.patch diff --git a/srcpkgs/git-annex/files/stack.yaml b/srcpkgs/git-annex/files/stack.yaml deleted file mode 100644 index 5d457bebde8..00000000000 --- a/srcpkgs/git-annex/files/stack.yaml +++ /dev/null @@ -1,32 +0,0 @@ -flags: - git-annex: - production: true - assistant: true - pairing: true - torrentparser: true - webapp: true - magicmime: false - dbus: false - debuglocks: false - benchmark: false - networkbsd: false - gitlfs: true - httpclientrestricted: true -packages: -- '.' -extra-deps: - - IfElse-0.85 - - aws-0.22 - - bloomfilter-2.0.1.0 - - filepath-bytestring-1.4.2.1.6 - - git-lfs-1.1.0 - - http-client-restricted-0.0.3 - - network-multicast-0.3.2 - - sandi-0.5 - - torrent-10000.1.1 - - bencode-0.6.1.1 - - network-3.1.0.1 -explicit-setup-deps: - git-annex: true -resolver: lts-17.5 -allow-newer: true diff --git a/srcpkgs/git-annex/patches/ghc8.8.3.patch b/srcpkgs/git-annex/patches/ghc8.8.3.patch deleted file mode 100644 index 27a1739c111..00000000000 --- a/srcpkgs/git-annex/patches/ghc8.8.3.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/git-annex.cabal 2020-04-01 21:09:23.653315424 +0200 -+++ b/git-annex.cabal 2020-04-01 20:50:23.080838029 +0200 -@@ -304,6 +304,7 @@ - Build-Depends: - base (>= 4.11.1.0 && < 5.0), - network-uri (>= 2.6), -+ network-bsd, - optparse-applicative (>= 0.14.1), - containers (>= 0.5.8), - exceptions (>= 0.6), -@@ -404,3 +404,3 @@ if flag(NetworkBSD) - Build-Depends: network-bsd, network (>= 3.0.0.0) - else -- Build-Depends: network (< 3.0.0.0), network (>= 2.6.3.0) -+ Build-Depends: network (< 3.2.0.0), network (>= 2.6.3.0) - - if flag(S3) - Build-Depends: aws (>= 0.20) diff --git a/srcpkgs/git-annex/template b/srcpkgs/git-annex/template index cdcd6bb0f83..1cf2ab14789 100644 --- a/srcpkgs/git-annex/template +++ b/srcpkgs/git-annex/template @@ -1,10 +1,10 @@ # Template file for 'git-annex' pkgname=git-annex -version=8.20210330 +version=8.20211028 revision=1 build_style=haskell-stack makedepends="curl file-devel gnupg2 gnutls-devel gsasl-devel libxml2-devel - lsof rsync git" + lsof rsync git ncurses-devel" # depends are utilities required by git-annex depends="git rsync curl lsof gnupg2" short_desc="Git addon for managing large files" @@ -12,7 +12,7 @@ maintainer="Evan Deaubl " 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="http://git-annex.branchable.com" distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz" -checksum=17109144b2aadfab79fa0e193df3e0c02fd80f738a5ed6eccb0d11692bedb01d +checksum=cf5efe15e68d467daad673bec10037a27a78da7e4af9b4a85e10980bd90ace2d nopie_files="/usr/bin/git-annex" nocross=yes