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

[Felix Yan]

    Date: Wednesday, October 17, 2018 @ 20:01:05
  Author: felixonmars
Revision: 395071

upgpkg: stack 1.9.1-1

Modified:
  stack/trunk/PKGBUILD

----------+
 PKGBUILD |   21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-17 18:56:59 UTC (rev 395070)
+++ PKGBUILD	2018-10-17 20:01:05 UTC (rev 395071)
@@ -2,8 +2,8 @@
 # Contributor: Arch Haskell Team <arch-haskell at haskell.org>
 
 pkgname=stack
-pkgver=1.7.1
-pkgrel=166
+pkgver=1.9.1
+pkgrel=1
 pkgdesc="The Haskell Tool Stack"
 url="https://github.com/commercialhaskell/stack"
 license=("custom:BSD3")
@@ -12,7 +12,7 @@
          'haskell-async' 'haskell-attoparsec' 'haskell-base64-bytestring' '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-gitrev' 'haskell-hackage-security'
+         'haskell-fsnotify' 'haskell-generic-deriving' 'haskell-githash' 'haskell-hackage-security'
          'haskell-hashable' 'haskell-hpack' 'haskell-hpc' 'haskell-http-client'
          'haskell-http-client-tls' 'haskell-http-conduit' 'haskell-http-types' 'haskell-memory'
          'haskell-microlens' 'haskell-mintty' 'haskell-monad-logger' 'haskell-mono-traversable'
@@ -26,23 +26,22 @@
          'haskell-unicode-transforms' 'haskell-unix-compat' 'haskell-unliftio'
          'haskell-unordered-containers' 'haskell-vector' 'haskell-yaml' 'haskell-zip-archive'
          'haskell-zlib' 'haskell-bindings-uname')
-makedepends=('ghc' 'haskell-quickcheck' 'haskell-hspec' 'haskell-smallcheck')
+makedepends=('ghc' 'git' 'haskell-quickcheck' 'haskell-hspec' 'haskell-smallcheck')
 checkdepends=('cabal-install')
 conflicts=('haskell-stack')
 replaces=('haskell-stack')
 install="stack.install"
-source=("$pkgname-$pkgver.tar.gz::https://github.com/commercialhaskell/stack/archive/v$pkgver.tar.gz")
-sha512sums=('786c116b4717f6e0f5ac0b5397db4834486610f511eafefe2356574545f97093fe3203824b7a3cabb2e0562e5c0443af3d93defe83751a9982727d88cafe78a7')
+source=("git+https://github.com/commercialhaskell/stack.git#tag=v$pkgver")
+sha512sums=('SKIP')
 
 prepare() {
-  cd $pkgname-$pkgver
-  sed -i '54d;55d;56d;57d;58d' src/test/Stack/StoreSpec.hs
+  cd $pkgname
   hpack
   sed -i '/semigroups/d' $pkgname.cabal
 }
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname
 
   runhaskell Setup configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \
     --prefix=/usr --docdir="/usr/share/doc/${pkgname}" --enable-tests \
@@ -56,7 +55,7 @@
 }
 
 check() {
-  cd $pkgname-$pkgver
+  cd $pkgname
   # cabal update
   LD_LIBRARY_PATH="$PWD"/dist/build PATH="$PWD"/dist/build/stack:"$PATH" runhaskell Setup test
   # Integration tests will result in 4 failures on Arch currently
@@ -63,7 +62,7 @@
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname
 
   install -D -m744 register.sh   "${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
   install -D -m744 unregister.sh "${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"