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

[Felix Yan]

    Date: Monday, May 10, 2021 @ 19:33:03
  Author: felixonmars
Revision: 929600

upgpkg: haskell-lsp-test 0.14.0.0-1

Modified:
  haskell-lsp-test/trunk/PKGBUILD

----------+
 PKGBUILD |   29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-10 19:26:29 UTC (rev 929599)
+++ PKGBUILD	2021-05-10 19:33:03 UTC (rev 929600)
@@ -2,10 +2,10 @@
 
 _hkgname=lsp-test
 pkgname=haskell-lsp-test
-pkgver=0.13.0.0
-pkgrel=20
+pkgver=0.14.0.0
+pkgrel=1
 pkgdesc="Functional test framework for LSP servers."
-url="https://github.com/bubba/lsp-test#readme"
+url="https://github.com/haskell/lsp/blob/master/lsp-test/README.md"
 license=("BSD")
 arch=('x86_64')
 depends=('ghc-libs' 'haskell-diff' 'haskell-glob' 'haskell-aeson' 'haskell-aeson-pretty'
@@ -15,26 +15,23 @@
          'haskell-unordered-containers')
 makedepends=('ghc' 'uusi' 'haskell-hspec')
 # https://github.com/bubba/lsp-test/issues/92
-source=("https://github.com/bubba/lsp-test/archive/$pkgver/$pkgname-$pkgver.tar.gz")
+source=("https://github.com/haskell/lsp/archive/refs/tags/lsp-test-$pkgver.tar.gz")
 #source=("https://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz")
-sha256sums=('4b9888d25aa749e1be37ac22c8a7c90e4dbb34983797f05a9be07ed775cf9a38')
+sha512sums=('8d45e3ac432a01ba38b5b79c5c1ed3173a4dbc8be55671e617be722f0760aed7179be595aa72d55fec37b1677746431d1f3e1a07df2916be34b7e3abfa823761')
 
 prepare() {
-  cd $_hkgname-$pkgver
+  cd lsp-$_hkgname-$pkgver/$_hkgname
   gen-setup
-  sed -i 's|dist-newstyle|dist/build/dummy-server|' test/Test.hs
 }
 
 build() {
-  cd $_hkgname-$pkgver
+  cd lsp-$_hkgname-$pkgver/$_hkgname
 
-  # We need to enable dummy-server here for tests, but it shouldn't be installed...
   runhaskell Setup configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \
     --prefix=/usr --docdir=/usr/share/doc/$pkgname --enable-tests \
     --dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid \
     --ghc-option=-optl-Wl\,-z\,relro\,-z\,now \
-    --ghc-option='-pie' \
-    -fdummyserver
+    --ghc-option='-pie'
 
   runhaskell Setup build $MAKEFLAGS
   runhaskell Setup register --gen-script
@@ -44,13 +41,12 @@
 }
 
 check() {
-  cd $_hkgname-$pkgver
-  # https://github.com/bubba/lsp-test/issues/93
-  runhaskell Setup test || echo "Tests failed"
+  cd lsp-$_hkgname-$pkgver/$_hkgname
+  runhaskell Setup test
 }
 
 package() {
-  cd $_hkgname-$pkgver
+  cd lsp-$_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
@@ -57,7 +53,4 @@
   runhaskell Setup copy --destdir="$pkgdir"
   install -D -m644 LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname/
   rm -f "$pkgdir"/usr/share/doc/$pkgname/LICENSE
-
-  # Remove dummy-server
-  rm -r "$pkgdir"/usr/libexec
 }