Date: Thursday, June 3, 2021 @ 22:26:27 Author: felixonmars Revision: 955795
archrelease: copy trunk to community-staging-x86_64 Added: dhall-lsp-server/repos/community-staging-x86_64/ dhall-lsp-server/repos/community-staging-x86_64/PKGBUILD (from rev 955794, dhall-lsp-server/trunk/PKGBUILD) dhall-lsp-server/repos/community-staging-x86_64/tasty-hspec-1.1.7.patch (from rev 955794, dhall-lsp-server/trunk/tasty-hspec-1.1.7.patch) -------------------------+ PKGBUILD | 56 ++++++++++++++++++++++++++++++++++++++++++++++ tasty-hspec-1.1.7.patch | 41 +++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+) Copied: dhall-lsp-server/repos/community-staging-x86_64/PKGBUILD (from rev 955794, dhall-lsp-server/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2021-06-03 22:26:27 UTC (rev 955795) @@ -0,0 +1,56 @@ +# Maintainer: Felix Yan <felixonm...@archlinux.org> + +pkgname=dhall-lsp-server +pkgver=1.0.14 +pkgrel=35 +pkgdesc="Language Server Protocol (LSP) server for Dhall" +url="https://github.com/dhall-lang/dhall-haskell/tree/master/dhall-lsp-server#readme" +license=("custom:MIT") +arch=('x86_64') +depends=('ghc-libs' 'haskell-aeson' 'haskell-aeson-pretty' 'haskell-data-default' 'dhall' + 'dhall-json' 'haskell-lsp0' 'haskell-hslogger' 'haskell-lens' 'haskell-lens-family-core' + 'haskell-megaparsec' 'haskell-network-uri' 'haskell-optparse-applicative' + 'haskell-prettyprinter' 'haskell-rope-utf16-splay' 'haskell-unordered-containers' + 'haskell-uri-encode') +makedepends=('ghc' 'uusi' 'haskell-quickcheck' 'haskell-doctest' 'haskell-lsp0-types' + 'haskell-lsp0-test' 'haskell-tasty' 'haskell-tasty-hspec') +source=("https://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz" + tasty-hspec-1.1.7.patch) +sha512sums=('4f4a2c054a269e5f086ff4108dafe4e44f09b6f8c71772136578b4eafe99d724721b71016f821dc4a7dc073b75871bf328851f95e725904f6383ef49014834c1' + '58df1172db4cf75957590a85a28c588c15830d3c48862383e669f2b6d60f10dece8abcd002c9c8cb2909143ad513509afd5239293926a1a10fd6a1a2bea79f71') + +prepare() { + patch -d $pkgname-$pkgver -p2 < tasty-hspec-1.1.7.patch + uusi -u tasty-hspec $pkgname-$pkgver/$pkgname.cabal +} + +build() { + cd $pkgname-$pkgver + + 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' + + runhaskell Setup build $MAKEFLAGS + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh +} + +check() { + cd $pkgname-$pkgver + LD_LIBRARY_PATH="$PWD/dist/build" PATH="$PWD/dist/build/dhall-lsp-server:$PATH" runhaskell Setup test --show-details=direct +} + +package() { + cd $pkgname-$pkgver + + install -D -m744 register.sh "$pkgdir"/usr/share/haskell/register/$pkgname.sh + install -D -m744 unregister.sh "$pkgdir"/usr/share/haskell/unregister/$pkgname.sh + runhaskell Setup copy --destdir="$pkgdir" + install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE + rm -f "$pkgdir"/usr/share/doc/$pkgname/LICENSE +} Copied: dhall-lsp-server/repos/community-staging-x86_64/tasty-hspec-1.1.7.patch (from rev 955794, dhall-lsp-server/trunk/tasty-hspec-1.1.7.patch) =================================================================== --- community-staging-x86_64/tasty-hspec-1.1.7.patch (rev 0) +++ community-staging-x86_64/tasty-hspec-1.1.7.patch 2021-06-03 22:26:27 UTC (rev 955795) @@ -0,0 +1,41 @@ +commit 606d137afc1afc2ab5e9c4949ce1c78bec1848fe +Author: Felix Yan <felixonm...@archlinux.org> +Date: Sat May 15 07:57:55 2021 +0800 + + Fix compatibility with tasty-hspec 1.1.7 + + tasty-hspec no longer re-exports Test.Hspec since 1.1.7. Let's import + it ourselves. + +diff --git a/dhall-lsp-server/dhall-lsp-server.cabal b/dhall-lsp-server/dhall-lsp-server.cabal +index 9c407256..2e23e615 100644 +--- a/dhall-lsp-server/dhall-lsp-server.cabal ++++ b/dhall-lsp-server/dhall-lsp-server.cabal +@@ -104,6 +104,7 @@ Test-Suite tests + Build-Depends: + base , + haskell-lsp-types >= 0.19.0 && < 0.25 , ++ hspec >= 2.7 && < 2.9 , + lsp-test >= 0.9 && < 0.13 , + tasty >= 0.11.2 && < 1.5 , + tasty-hspec >= 1.1 && < 1.2 , +diff --git a/dhall-lsp-server/tests/Main.hs b/dhall-lsp-server/tests/Main.hs +index 401bc0b2..5d6b548f 100644 +--- a/dhall-lsp-server/tests/Main.hs ++++ b/dhall-lsp-server/tests/Main.hs +@@ -1,3 +1,4 @@ ++{-# LANGUAGE CPP #-} + {-# LANGUAGE DuplicateRecordFields #-} + {-# LANGUAGE OverloadedStrings #-} + +@@ -17,6 +18,10 @@ import Language.Haskell.LSP.Types + import Test.Tasty + import Test.Tasty.Hspec + ++#if MIN_VERSION_tasty_hspec(1,1,7) ++import Test.Hspec ++#endif ++ + import qualified Data.Text as T + import qualified GHC.IO.Encoding +