diff --git a/srcpkgs/git-annex/files/stack.yaml b/srcpkgs/git-annex/files/stack.yaml index 2677f723a47..5e4e21d6084 100644 --- a/srcpkgs/git-annex/files/stack.yaml +++ b/srcpkgs/git-annex/files/stack.yaml @@ -1,15 +1,15 @@ -resolver: lts-12.4 +resolver: lts-13.30 packages: - . extra-deps: - IfElse-0.85 -- aws-0.20 +- aws-0.21.1 - bloomfilter-2.0.1.0 -- tasty-rerun-1.1.12 -- github: bitemyapp/esqueleto - commit: 434f81ed41795e3dd0754dbc5c75c4ed098631b3 +- tasty-rerun-1.1.14 +- sandi-0.5 flags: git-annex: magicmime: false dbus: false torrentparser: false + networkbsd: false diff --git a/srcpkgs/git-annex/template b/srcpkgs/git-annex/template index e002135c8d5..46c202eda65 100644 --- a/srcpkgs/git-annex/template +++ b/srcpkgs/git-annex/template @@ -1,8 +1,7 @@ # Template file for 'git-annex' pkgname=git-annex -version=6.20180719 +version=7.20190730 revision=1 -nocross=yes build_style=haskell-stack hostmakedepends="pkg-config ghc stack" makedepends="curl file-devel gnupg2 gnutls-devel gsasl-devel libxml2-devel @@ -11,11 +10,12 @@ makedepends="curl file-devel gnupg2 gnutls-devel gsasl-devel libxml2-devel depends="git rsync curl lsof gnupg2" short_desc="Git addon for managing large files" maintainer="Evan Deaubl " -license="GPL-3" +license="AGPL-3.0-or-later" homepage="http://git-annex.branchable.com" distfiles="https://git.joeyh.name/index.cgi/${pkgname}.git/snapshot/${pkgname}-${version}.tar.gz" -checksum=6ff3cc7b6bf1f279643c811adba859ee5e9930570d0af651b52456f433b8e627 +checksum=d711c3e57a1625da63b94551a1a88c63817b6f8a2da1274f19ca779bdfd6aa7b 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