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

[Felix Yan]

    Date: Monday, February 10, 2020 @ 12:38:18
  Author: felixonmars
Revision: 565874

upgpkg: stack 2.1.3.20200209-1

Modified:
  stack/trunk/PKGBUILD

----------+
 PKGBUILD |   54 +++++++++++++++++++++++++++---------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-02-10 12:37:01 UTC (rev 565873)
+++ PKGBUILD	2020-02-10 12:38:18 UTC (rev 565874)
@@ -2,32 +2,32 @@
 # Contributor: Arch Haskell Team <arch-haskell at haskell.org>
 
 pkgname=stack
-pkgver=2.1.3
-pkgrel=109
+pkgver=2.1.3.20200209
+_commit=35f5d869558c4ac8c50e33c4930b0b72cb173b8b
+pkgrel=1
 pkgdesc="The Haskell Tool Stack"
 url="https://github.com/commercialhaskell/stack"
 license=("BSD")
 arch=('x86_64')
 depends=('ghc-libs' 'haskell-aeson' 'haskell-annotated-wl-pprint' 'haskell-ansi-terminal'
-         'haskell-async' 'haskell-attoparsec' 'haskell-base64-bytestring' 'haskell-colour'
-         'haskell-conduit' 'haskell-conduit-extra' 'haskell-cryptonite' 'haskell-cryptonite-conduit'
-         'haskell-echo' 'haskell-exceptions' 'haskell-extra' 'haskell-file-embed' 'haskell-filelock'
-         'haskell-fsnotify' 'haskell-generic-deriving' 'haskell-githash' 'haskell-hackage-security'
-         'haskell-hashable' 'haskell-hi-file-parser' 'haskell-hpack' 'haskell-http-client'
-         'haskell-http-client-tls' 'haskell-http-conduit' 'haskell-http-download'
-         'haskell-http-types' 'haskell-memory' 'haskell-microlens' 'haskell-mintty'
-         'haskell-mono-traversable' 'haskell-mustache' 'haskell-neat-interpolation'
-         'haskell-network-uri' 'haskell-open-browser' 'haskell-optparse-applicative'
-         'haskell-optparse-generic' 'haskell-optparse-simple' 'haskell-pantry' 'haskell-path'
-         'haskell-path-io' 'haskell-persistent' 'haskell-persistent-sqlite'
-         'haskell-persistent-template' 'haskell-primitive' 'haskell-project-template'
-         'haskell-regex-applicative-text' 'haskell-resource-pool' 'haskell-resourcet'
-         'haskell-retry' 'haskell-rio' 'haskell-rio-prettyprint' 'haskell-split'
-         'haskell-streaming-commons' 'haskell-tar' 'haskell-temporary' 'haskell-terminal-size'
-         'haskell-text-metrics' 'haskell-th-reify-many' 'haskell-tls' 'haskell-typed-process'
-         'haskell-unicode-transforms' 'haskell-unix-compat' 'haskell-unliftio'
-         'haskell-unordered-containers' 'haskell-vector' 'haskell-yaml' 'haskell-zip-archive'
-         'haskell-zlib' 'haskell-bindings-uname')
+         'haskell-async' 'haskell-attoparsec' 'haskell-base64-bytestring' 'haskell-casa-client'
+         'haskell-casa-types' 'haskell-colour' 'haskell-conduit' 'haskell-conduit-extra'
+         'haskell-cryptonite' 'haskell-cryptonite-conduit' 'haskell-echo' 'haskell-exceptions'
+         'haskell-extra' 'haskell-file-embed' 'haskell-filelock' 'haskell-fsnotify'
+         'haskell-generic-deriving' 'haskell-githash' 'haskell-hackage-security' 'haskell-hashable'
+         'haskell-hi-file-parser' 'haskell-hpack' 'haskell-http-client' 'haskell-http-client-tls'
+         'haskell-http-conduit' 'haskell-http-download' 'haskell-http-types' 'haskell-memory'
+         'haskell-microlens' 'haskell-mintty' 'haskell-mono-traversable' 'haskell-mustache'
+         'haskell-neat-interpolation' 'haskell-network-uri' 'haskell-open-browser'
+         'haskell-optparse-applicative' 'haskell-optparse-generic' 'haskell-optparse-simple'
+         'haskell-pantry' 'haskell-path' 'haskell-path-io' 'haskell-persistent'
+         'haskell-persistent-sqlite' 'haskell-persistent-template' 'haskell-primitive'
+         'haskell-project-template' 'haskell-regex-applicative-text' 'haskell-retry' 'haskell-rio'
+         'haskell-rio-prettyprint' 'haskell-split' 'haskell-streaming-commons' 'haskell-tar'
+         'haskell-temporary' 'haskell-terminal-size' 'haskell-text-metrics' 'haskell-th-reify-many'
+         'haskell-tls' 'haskell-typed-process' 'haskell-unicode-transforms' 'haskell-unix-compat'
+         'haskell-unliftio' 'haskell-unordered-containers' 'haskell-vector' 'haskell-yaml'
+         'haskell-zip-archive' 'haskell-zlib')
 makedepends=('ghc' 'git' 'haskell-quickcheck' 'haskell-hspec' 'haskell-raw-strings-qq'
              'haskell-smallcheck')
 checkdepends=('cabal-install')
@@ -34,18 +34,18 @@
 conflicts=('haskell-stack')
 replaces=('haskell-stack')
 install="stack.install"
-source=("git+https://github.com/commercialhaskell/stack.git#tag=v$pkgver"
-        https://github.com/commercialhaskell/stack/commit/62c24fa0552dc722260f1cee75325145e837ab6a.patch)
-sha512sums=('SKIP'
-            '99bb04cf6581a8d712413822f834856b036b37ab2ae41307e82a7064b12cdfa43c6ccc60adfa870057f9ba197e1ae4eda144a7088306630400c0798a2b60d9c6')
+source=("git+https://github.com/commercialhaskell/stack.git#commit=$_commit")
+sha512sums=('SKIP')
 
 prepare() {
   cd $pkgname
-  patch -p1 -i ../62c24fa0552dc722260f1cee75325145e837ab6a.patch || :
   hpack
   sed -i -e '/semigroups/d' $pkgname.cabal
 
-  sed -i '1i {-# LANGUAGE UndecidableInstances #-}' src/Stack/Storage/{User,Project}.hs
+  sed -i -e 's/fail $ "Invalid package name:/error $ "Invalid package name:/' \
+         -e 's/fail $ "Invalid CabalConfigKey/error $ "Invalid CabalConfigKey/' \
+            src/Stack/Types/Config.hs
+  sed -i -e 's/fail \$$/error $/' src/Stack/Coverage.hs
 }
 
 build() {