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

[Felix Yan]

    Date: Wednesday, June 16, 2021 @ 21:30:06
  Author: felixonmars
Revision: 964329

upgpkg: haskell-what4 1.2-1: rebuild with what4 1.2

Modified:
  haskell-what4/trunk/PKGBUILD

----------+
 PKGBUILD |   28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-16 21:29:12 UTC (rev 964328)
+++ PKGBUILD	2021-06-16 21:30:06 UTC (rev 964329)
@@ -2,8 +2,8 @@
 
 _hkgname=what4
 pkgname=haskell-what4
-pkgver=1.1
-pkgrel=30
+pkgver=1.2
+pkgrel=1
 pkgdesc="Solver-agnostic symbolic values support for issuing queries"
 url="https://github.com/GaloisInc/what4"
 license=('BSD')
@@ -16,21 +16,24 @@
          'haskell-temporary' 'haskell-th-abstraction' 'haskell-th-lift' 'haskell-th-lift-instances'
          'haskell-unordered-containers' 'haskell-utf8-string' 'haskell-vector' 'haskell-versions'
          'haskell-zenc')
-makedepends=('ghc' 'uusi' 'haskell-hedgehog' 'haskell-quickcheck' 'haskell-tasty' 'haskell-tasty-hedgehog'
-             'haskell-tasty-hunit' 'haskell-tasty-quickcheck')
+makedepends=('ghc' 'uusi' 'haskell-contravariant' 'haskell-exceptions' 'haskell-hedgehog'
+             'haskell-lumberjack' 'haskell-quickcheck' 'haskell-tasty' 'haskell-tasty-checklist'
+             'haskell-tasty-hedgehog' 'haskell-tasty-hunit' 'haskell-tasty-quickcheck'
+             'haskell-tasty-sugar')
 checkdepends=('cvc4' 'yices' 'z3')
 optdepends=('cvc4' 'yices' 'z3')
-source=(https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-sha512sums=('b29565389cb21b524250be1808b626521fe856fc8d948464482efece3fa2607cf78372e609a4761a71ad9ff46da6e1af18dd85a2d0fbd4857e1144b4b4319cba')
+# https://github.com/GaloisInc/what4/pull/135
+#source=(https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+source=(https://github.com/GaloisInc/what4/archive/v$pkgver/$pkgname-$pkgver.tar.gz)
+sha512sums=('c2b29b7cf0d78f606f5cebebf9661b5863e6dc926724ce073757705754fa67b39422659d27dc806101988e6b373dcea71b8f4525e403983cda011f66de7877d1')
 
 prepare() {
-    cd $_hkgname-$pkgver
+    cd $_hkgname-$pkgver/$_hkgname
     gen-setup
-    uusi -u versions $_hkgname.cabal
 }
 
 build() {
-    cd $_hkgname-$pkgver    
+    cd $_hkgname-$pkgver/$_hkgname
     
     runhaskell Setup configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \
         --prefix=/usr --docdir=/usr/share/doc/$pkgname --enable-tests \
@@ -43,13 +46,12 @@
 }
 
 check() {
-    cd $_hkgname-$pkgver
-    # https://github.com/GaloisInc/what4/issues/132
-    runhaskell Setup test --show-details=direct || echo "Tests failed"
+    cd $_hkgname-$pkgver/$_hkgname
+    runhaskell Setup test --show-details=direct
 }
 
 package() {
-    cd $_hkgname-$pkgver
+    cd $_hkgname-$pkgver/$_hkgname
     
     install -D -m744 register.sh "$pkgdir"/usr/share/haskell/register/$pkgname.sh
     install -D -m744 unregister.sh "$pkgdir"/usr/share/haskell/unregister/$pkgname.sh