Date: Sunday, June 6, 2021 @ 11:40:43 Author: felixonmars Revision: 956232
upgpkg: dhall-lsp-server 1.0.15-1: rebuild with dhall 1.39.0, dhall-bash 1.0.37, dhall-docs 1.0.6, dhall-json 1.7.7, dhall-lsp-server 1.0.15, dhall-yaml 1.2.7 Modified: dhall-lsp-server/trunk/PKGBUILD Deleted: dhall-lsp-server/trunk/tasty-hspec-1.1.7.patch -------------------------+ PKGBUILD | 17 +++++------------ tasty-hspec-1.1.7.patch | 41 ----------------------------------------- 2 files changed, 5 insertions(+), 53 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-06-06 11:39:47 UTC (rev 956231) +++ PKGBUILD 2021-06-06 11:40:43 UTC (rev 956232) @@ -1,8 +1,8 @@ # Maintainer: Felix Yan <[email protected]> pkgname=dhall-lsp-server -pkgver=1.0.14 -pkgrel=35 +pkgver=1.0.15 +pkgrel=1 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") @@ -12,18 +12,11 @@ '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' +makedepends=('ghc' 'haskell-quickcheck' 'haskell-doctest' 'haskell-hspec' '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') +source=("https://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz";) +sha512sums=('7988ecea64b4e309fd7a10143ad1097c65280ec22ff342943f2b18f108073af4f05e66f024d21398f8b96cc535f8805b9534b620b7423ac92140b3e19a041875') -prepare() { - patch -d $pkgname-$pkgver -p2 < tasty-hspec-1.1.7.patch - uusi -u tasty-hspec $pkgname-$pkgver/$pkgname.cabal -} - build() { cd $pkgname-$pkgver Deleted: tasty-hspec-1.1.7.patch =================================================================== --- tasty-hspec-1.1.7.patch 2021-06-06 11:39:47 UTC (rev 956231) +++ tasty-hspec-1.1.7.patch 2021-06-06 11:40:43 UTC (rev 956232) @@ -1,41 +0,0 @@ -commit 606d137afc1afc2ab5e9c4949ce1c78bec1848fe -Author: Felix Yan <[email protected]> -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 -
