[arch-commits] Commit in stack/trunk (PKGBUILD)

[Felix Yan]

    Date: Wednesday, July 26, 2017 @ 09:18:26
  Author: felixonmars
Revision: 246417

upgpkg: stack 1.5.0-1

Modified:
  stack/trunk/PKGBUILD

----------+
 PKGBUILD |   49 ++++++++++++++++++++++++-------------------------
 1 file changed, 24 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-07-26 08:23:30 UTC (rev 246416)
+++ PKGBUILD	2017-07-26 09:18:26 UTC (rev 246417)
@@ -3,8 +3,8 @@
 # Contributor: Arch Haskell Team <arch-haskell at haskell.org>
 
 pkgname=stack
-pkgver=1.4.0
-pkgrel=114
+pkgver=1.5.0
+pkgrel=1
 pkgdesc="The Haskell Tool Stack"
 url="https://github.com/commercialhaskell/stack"
 license=("custom:BSD3")
@@ -12,41 +12,40 @@
 depends=('ghc' "haskell-aeson" "haskell-annotated-wl-pprint" "haskell-ansi-terminal"
          "haskell-async" "haskell-attoparsec" "haskell-base-compat" "haskell-base64-bytestring"
          "haskell-binary-tagged" "haskell-blaze-builder" "haskell-clock" "haskell-conduit"
-         "haskell-conduit-extra" "haskell-cryptonite" "haskell-cryptonite-conduit"
+         "haskell-conduit-extra" "haskell-cryptonite" "haskell-cryptonite-conduit" "haskell-echo"
          "haskell-either" "haskell-errors" "haskell-exceptions" "haskell-extra"
          "haskell-fast-logger" "haskell-file-embed" "haskell-filelock" "haskell-fsnotify"
-         "haskell-generic-deriving" "haskell-gitrev" "haskell-hackage-security"
-         "haskell-hashable" "haskell-hastache" "haskell-hit" "haskell-http-client"
-         "haskell-http-client-tls" "haskell-http-conduit" "haskell-http-types" "haskell-hpack"
-         "haskell-lifted-async" "haskell-lifted-base" "haskell-memory" "haskell-microlens"
-         "haskell-microlens-mtl" "haskell-monad-control" "haskell-monad-logger"
-         "haskell-monad-unlift" "haskell-mtl" "haskell-network-uri" "haskell-open-browser"
-         "haskell-optparse-applicative" "haskell-optparse-simple" "haskell-path"
-         "haskell-path-io" "haskell-persistent" "haskell-persistent-sqlite"
-         "haskell-persistent-template" "haskell-pid1" "haskell-project-template"
-         "haskell-regex-applicative-text" "haskell-resourcet" "haskell-retry" "haskell-safe"
-         "haskell-safe-exceptions" "haskell-semigroups" "haskell-split" "haskell-stm"
-         "haskell-store" "haskell-streaming-commons" "haskell-tar" "haskell-temporary"
-         "haskell-text" "haskell-text-binary" "haskell-text-metrics" "haskell-tls"
-         "haskell-transformers-base" "haskell-unicode-transforms" "haskell-unix-compat"
-         "haskell-unordered-containers" "haskell-vector" "haskell-vector-binary-instances"
-         "haskell-yaml" "haskell-zip-archive" "haskell-zlib")
+         "haskell-generic-deriving" "haskell-gitrev" "haskell-hackage-security" "haskell-hashable"
+         "haskell-hastache" "haskell-http-client" "haskell-http-client-tls" "haskell-http-conduit"
+         "haskell-http-types" "haskell-hpack" "haskell-lifted-async" "haskell-lifted-base"
+         "haskell-memory" "haskell-microlens" "haskell-microlens-mtl" "haskell-mintty"
+         "haskell-monad-control" "haskell-monad-logger" "haskell-monad-unlift" "haskell-mtl"
+         "haskell-network-uri" "haskell-open-browser" "haskell-optparse-applicative"
+         "haskell-optparse-simple" "haskell-path" "haskell-path-io" "haskell-persistent"
+         "haskell-persistent-sqlite" "haskell-persistent-template" "haskell-pid1"
+         "haskell-project-template" "haskell-regex-applicative-text" "haskell-resourcet"
+         "haskell-retry" "haskell-safe" "haskell-safe-exceptions" "haskell-semigroups"
+         "haskell-split" "haskell-stm" "haskell-store" "haskell-store-core"
+         "haskell-streaming-commons" "haskell-tar" "haskell-temporary" "haskell-text"
+         "haskell-text-binary" "haskell-text-metrics" "haskell-tls" "haskell-transformers-base"
+         "haskell-unicode-transforms" "haskell-unix-compat" "haskell-unordered-containers"
+         "haskell-vector" "haskell-vector-binary-instances" "haskell-yaml" "haskell-zip-archive"
+         "haskell-zlib")
 conflicts=('haskell-stack')
 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"
         path-0.6.1.patch)
-sha256sums=('595d311ad117e41ad908b7065743917542b40f343d1334673e98171ee74d36e6'
-            'cf41cad2ce75f05e302d3670d19d6574f8c86ab81abbefde9e2ec498807cb660'
+sha256sums=('2ffead80e9cc3b72480e9130bb639aaa8a6a684d8f6098a3843fe88803c8e478'
             '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
+
+    sed -e 's/cryptonite >= 0.19 && < 0.24/cryptonite >= 0.19 \&\& < 0.25/' \
+        -e 's/, path >= 0.5.8 && < 0.6/, path >= 0.5.8 \&\& < 0.7/' \
+        -i stack.cabal
 }
 
 build() {