From be7bf6173d9f668403e29c97942f555f00d67592 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 2 Jan 2018 18:23:23 +0100 Subject: [PATCH] git-annex: update to 6.20171214. --- srcpkgs/git-annex/files/stack.yaml | 7 ++++++- srcpkgs/git-annex/template | 8 ++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/srcpkgs/git-annex/files/stack.yaml b/srcpkgs/git-annex/files/stack.yaml index 5642d1210b9..b25c6eba91a 100644 --- a/srcpkgs/git-annex/files/stack.yaml +++ b/srcpkgs/git-annex/files/stack.yaml @@ -21,6 +21,11 @@ extra-deps: - bloomfilter-2.0.1.0 - torrent-10000.0.0 - yesod-default-1.2.0 +- conduit-extra-1.1.17 +- time-1.6.0.1 +- xml-conduit-1.5.1 +- happy-1.19.8 +- alex-3.2.3 explicit-setup-deps: git-annex: true -resolver: lts-8.13 +resolver: lts-10.2 diff --git a/srcpkgs/git-annex/template b/srcpkgs/git-annex/template index 8de0ee06a5b..d2494ab0559 100644 --- a/srcpkgs/git-annex/template +++ b/srcpkgs/git-annex/template @@ -1,10 +1,10 @@ # Template file for 'git-annex' pkgname=git-annex -version=6.20171026 +version=6.20171214 revision=1 nocross=yes build_style=haskell-stack -stackage="lts-8.13" +stackage="lts-10.2" hostmakedepends="pkg-config ghc stack" makedepends="gsasl-devel gnutls-devel libxml2-devel rsync curl lsof gnupg2 file-devel" # depends are utilities required by git-annex @@ -14,8 +14,8 @@ maintainer="Evan Deaubl " license="GPL-3" homepage="http://git-annex.branchable.com" distfiles="https://git.joeyh.name/index.cgi/${pkgname}.git/snapshot/${pkgname}-${version}.tar.gz" -checksum=77b9845bb37ebb9d1a361f9a15d2794a8eee9c04db108c706a3f71ef5718e7d3 -nopie=yes +checksum=9a9b12d460aed25ddbed1a928511eb1c221969aa664872d9562db6c8caa0dd0d +nopie_files="/usr/bin/git-annex" # These install steps are pulled from the install target in the # git-annex Makefile. The target can't be called directly because it is