Date: Saturday, May 28, 2016 @ 05:41:40 Author: fyan Revision: 177357
upgpkg: git-annex 6.20160527-1 Modified: git-annex/trunk/PKGBUILD Deleted: git-annex/trunk/ghc8.patch ------------+ PKGBUILD | 28 ++++++++++------------------ ghc8.patch | 33 --------------------------------- 2 files changed, 10 insertions(+), 51 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-05-28 03:06:44 UTC (rev 177356) +++ PKGBUILD 2016-05-28 03:41:40 UTC (rev 177357) @@ -3,17 +3,17 @@ # Contributor: Arch Haskell Team <[email protected]> pkgname=git-annex -pkgver=6.20160511 -pkgrel=4 +pkgver=6.20160527 +pkgrel=1 pkgdesc="Manage files with git, without checking their contents into git" url="http://git-annex.branchable.com/"; license=("AGPL3") arch=('i686' 'x86_64') depends=('git' 'rsync' 'libxml2' 'gsasl' 'file') -makedepends=("ghc=8.0.1" "haskell-aeson" "haskell-async" "haskell-aws" "haskell-blaze-builder" - "haskell-bloomfilter" "haskell-byteable" "haskell-case-insensitive" - "haskell-clientsession" "haskell-concurrent-output" "haskell-conduit" - "haskell-conduit-extra" "haskell-crypto-api" "haskell-cryptonite" +makedepends=("ghc=8.0.1" "git" "haskell-aeson" "haskell-async" "haskell-aws" + "haskell-blaze-builder" "haskell-bloomfilter" "haskell-byteable" + "haskell-case-insensitive" "haskell-clientsession" "haskell-concurrent-output" + "haskell-conduit" "haskell-conduit-extra" "haskell-crypto-api" "haskell-cryptonite" "haskell-data-default" "haskell-dav" "haskell-dbus" "haskell-disk-free-space" "haskell-dlist" "haskell-dns" "haskell-edit-distance" "haskell-esqueleto" "haskell-exceptions" "haskell-fdo-notify" "haskell-feed" "haskell-gnutls" @@ -31,19 +31,11 @@ "haskell-utf8-string" "haskell-uuid" "haskell-wai" "haskell-wai-extra" "haskell-warp" "haskell-warp-tls" "haskell-xml-types" "haskell-yesod" "haskell-yesod-core" "haskell-yesod-default" "haskell-yesod-form" "haskell-yesod-static") -source=("http://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"; - ghc8.patch) -sha256sums=('85fc8853166fe57d91dc2776d5df4acb5911a91815f8aa12881928a1afe8ba01' - '311282f6df5f10488ed0bd0e093757f6fd4c1b8d31c937ddceaa8c4303183542') +source=("git+https://github.com/joeyh/git-annex.git#tag=$pkgver";) +sha256sums=('SKIP') -prepare() { - sed -i 's/base (>= 4.5 && < 4.9),/base (>= 4.5 \&\& < 4.10),/' ${pkgname}-${pkgver}/${pkgname}.cabal - cd $pkgname-$pkgver - patch -p1 -i ../ghc8.patch -} - build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}" runhaskell Setup configure -O --prefix=/usr --docdir="/usr/share/doc/${pkgname}" \ -fcryptonite -fnetwork-uri -f-ekg -fconcurrentoutput -ftorrentparser \ @@ -53,7 +45,7 @@ } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}" runhaskell Setup copy --destdir="${pkgdir}" install -Dm644 bash-completion.bash "${pkgdir}/usr/share/bash-completion/completions/git-annex" Deleted: ghc8.patch =================================================================== --- ghc8.patch 2016-05-28 03:06:44 UTC (rev 177356) +++ ghc8.patch 2016-05-28 03:41:40 UTC (rev 177357) @@ -1,33 +0,0 @@ -From fe944a96d3e2b8c755970bd28641925617f19613 Mon Sep 17 00:00:00 2001 -From: ilovezfs <[email protected]> -Date: Mon, 23 May 2016 00:53:07 -0700 -Subject: [PATCH] git-annex: GHC compatibility - ---- - Remote/Bup.hs | 13 +++++++------ - 1 file changed, 7 insertions(+), 6 deletions(-) - -diff --git a/Remote/Bup.hs b/Remote/Bup.hs -index ac3cc09..a481504 100644 ---- a/Remote/Bup.hs -+++ b/Remote/Bup.hs -@@ -133,12 +133,13 @@ store r buprepo = byteStorer $ \k b p -> do - showOutput -- make way for bup output - let cmd = proc "bup" (toCommand params) - quiet <- commandProgressDisabled -- let runner = if quiet -- then feedWithQuietOutput -- else withHandle StdinHandle -- liftIO $ runner createProcessSuccess cmd $ \h -> do -- meteredWrite p h b -- return True -+ if quiet -+ then liftIO $ feedWithQuietOutput createProcessSuccess cmd $ \h -> do -+ meteredWrite p h b -+ return True -+ else liftIO $ withHandle StdinHandle createProcessSuccess cmd $ \h -> do -+ meteredWrite p h b -+ return True - - retrieve :: BupRepo -> Retriever - retrieve buprepo = byteRetriever $ \k sink -> do
