From a240244ffa6aea6b6091be8f05a631036fce3c63 Mon Sep 17 00:00:00 2001
From: David Flatz <david@upcs.at>
Date: Mon, 22 May 2017 13:33:32 +0200
Subject: [PATCH] git-annex: update to 6.20170519

---
 srcpkgs/git-annex/files/stack.yaml | 10 ++--------
 srcpkgs/git-annex/template         | 14 +++++---------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/git-annex/files/stack.yaml b/srcpkgs/git-annex/files/stack.yaml
index 7d2bf11cbc..5642d1210b 100644
--- a/srcpkgs/git-annex/files/stack.yaml
+++ b/srcpkgs/git-annex/files/stack.yaml
@@ -4,7 +4,6 @@ flags:
     production: true
     assistant: true
     pairing: true
-    cryptonite: true
     network-uri: true
     s3: true
     testsuite: true
@@ -13,20 +12,15 @@ flags:
     webapp: true
     magicmime: false
     dbus: false
-    xmpp: false
     android: false
     androidsplice: false
 packages:
 - '.'
 extra-deps:
+- aws-0.16
 - bloomfilter-2.0.1.0
-- esqueleto-2.4.3
-- network-multicast-0.1.1
-- persistent-2.2.4.1
-- persistent-sqlite-2.2.1
-- persistent-template-2.1.8.1
 - torrent-10000.0.0
 - yesod-default-1.2.0
 explicit-setup-deps:
   git-annex: true
-resolver: lts-7.0
+resolver: lts-8.13
diff --git a/srcpkgs/git-annex/template b/srcpkgs/git-annex/template
index 99db15f15a..eda9d2d49f 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.20161210
+version=6.20170519
 revision=1
 nocross=yes
 build_style=haskell-stack
-stackage="lts-7.0"
+stackage="lts-8.13"
 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
@@ -13,21 +13,17 @@ short_desc="Git addon for managing large files"
 maintainer="Evan Deaubl <evan@deaubl.name>"
 license="GPL-3"
 homepage="http://git-annex.branchable.com"
-distfiles="http://github.com/joeyh/${pkgname}/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=6d985dc3dbb840629bca4e65e17564b68f4c403c7002c8b9155f120519680ed6
+distfiles="https://git.joeyh.name/index.cgi/${pkgname}.git/snapshot/${pkgname}-${version}.tar.gz"
+checksum=3ae5d427a766dab31c25c31adfc14b7e0ec7ff9c7e94a282bf222ea254dc5c66
 nopie=yes
 
-post_extract() {
-	# messes up stack dependency resolution
-	rm -rf standalone/android/tmp
-}
-
 # 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
 
 	vmkdir usr/share/man/man1
 	vcopy man/*.1 usr/share/man/man1