[arch-commits] Commit in stack/trunk (PKGBUILD path-0.6.1.patch)

[Felix Yan]

    Date: Saturday, July 1, 2017 @ 09:40:32
  Author: felixonmars
Revision: 241993

upgpkg: stack 1.4.0-98

rebuild with path,0.6.1

Added:
  stack/trunk/path-0.6.1.patch
Modified:
  stack/trunk/PKGBUILD

------------------+
 PKGBUILD         |    9 ++++++---
 path-0.6.1.patch |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-07-01 09:16:46 UTC (rev 241992)
+++ PKGBUILD	2017-07-01 09:40:32 UTC (rev 241993)
@@ -4,7 +4,7 @@
 
 pkgname=stack
 pkgver=1.4.0
-pkgrel=97
+pkgrel=98
 pkgdesc="The Haskell Tool Stack"
 url="https://github.com/commercialhaskell/stack"
 license=("custom:BSD3")
@@ -35,13 +35,16 @@
 replaces=('haskell-stack')
 install="stack.install"
 source=("$pkgname-$pkgver.tar.gz::https://github.com/commercialhaskell/stack/archive/v$pkgver.tar.gz"
-        "store-0.4.patch::https://github.com/commercialhaskell/stack/commit/d3637126b9045b266d2e53387e183915cb4a912d.patch")
+        "store-0.4.patch::https://github.com/commercialhaskell/stack/commit/d3637126b9045b266d2e53387e183915cb4a912d.patch"
+        path-0.6.1.patch)
 sha256sums=('595d311ad117e41ad908b7065743917542b40f343d1334673e98171ee74d36e6'
-            '63d0f620dcbde3a7f236aadab32f5fa3e2b93741dcf462392624bb30b6b49c16')
+            '63d0f620dcbde3a7f236aadab32f5fa3e2b93741dcf462392624bb30b6b49c16'
+            '2013b76677e62851248f26f8b77d0f37a52496b3380bf3107519d5a84e09808f')
 
 prepare() {
     cd "${srcdir}/${pkgname}-${pkgver}"
     patch -p1 -i ../store-0.4.patch
+    patch -p1 -i ../path-0.6.1.patch
     sed -i 's/PathException/InvalidPathException/' src/System/Process/Read.hs
     sed -i 's/, errors < 2.2/, errors < 2.3/' stack.cabal
 }

Added: path-0.6.1.patch
===================================================================
--- path-0.6.1.patch	                        (rev 0)
+++ path-0.6.1.patch	2017-07-01 09:40:32 UTC (rev 241993)
@@ -0,0 +1,49 @@
+commit 06c987c7564b2ee7359462587a55c11fdb3d4f84
+Author: Felix Yan <felixonmars at archlinux.org>
+Date:   Sat Jul 1 17:06:02 2017 +0800
+
+    Fix build with path 0.6.1
+
+diff --git a/src/Network/HTTP/Download/Verified.hs b/src/Network/HTTP/Download/Verified.hs
+index fad8236b..67f19f2b 100644
+--- a/src/Network/HTTP/Download/Verified.hs
++++ b/src/Network/HTTP/Download/Verified.hs
+@@ -55,7 +55,7 @@ import              Network.HTTP.Types.Header (hContentLength, hContentMD5)
+ import              Path
+ import              Prelude -- Fix AMP warning
+ import              System.Directory
+-import              System.FilePath ((<.>))
++import qualified    System.FilePath as FP ((<.>))
+ import              System.IO
+ 
+ -- | A request together with some checks to perform.
+@@ -243,7 +243,7 @@ verifiedDownload DownloadRequest{..} destpath progressSink = do
+         if p then m >> return True else return False
+ 
+     fp = toFilePath destpath
+-    fptmp = fp <.> "tmp"
++    fptmp = fp FP.<.> "tmp"
+     dir = toFilePath $ parent destpath
+ 
+     getShouldDownload = do
+diff --git a/src/Stack/Fetch.hs b/src/Stack/Fetch.hs
+index 1439d114..746b695d 100644
+--- a/src/Stack/Fetch.hs
++++ b/src/Stack/Fetch.hs
+@@ -75,7 +75,6 @@ import              Stack.Types.PackageIdentifier
+ import              Stack.Types.PackageIndex
+ import              Stack.Types.PackageName
+ import              Stack.Types.Version
+-import              System.FilePath ((<.>))
+ import qualified    System.FilePath as FP
+ import              System.IO
+ import              System.PosixCompat (setFileMode)
+@@ -561,7 +560,7 @@ fetchPackages' mdistDir toFetchAll = do
+                 let cabalFP =
+                         innerDest FP.</>
+                         packageNameString (packageIdentifierName ident)
+-                        <.> "cabal"
++                        FP.<.> "cabal"
+                 S.writeFile cabalFP $ tfCabal toFetch
+ 
+                 atomically $ modifyTVar outputVar $ Map.insert ident destDir