Date: Saturday, December 31, 2022 @ 00:24:04
  Author: felixonmars
Revision: 1372593

upgpkg: haskell-language-server 1.6.0.0-1: rebuild with ghcide 1.6.0.0, 
haskell-language-server 1.6.0.0, hls-alternate-number-format-plugin 1.0.1.0, 
hls-brittany-plugin 1.0.2.0, hls-call-hierarchy-plugin 1.0.2.0, 
hls-class-plugin 1.0.2.0, hls-eval-plugin 1.2.1.0, hls-explicit-imports-plugin 
1.0.2.0, hls-floskell-plugin 1.0.1.0, hls-fourmolu-plugin 1.0.2.0, hls-graph 
1.6.0.0, hls-haddock-comments-plugin 1.0.1.0, hls-hlint-plugin 1.0.3.0, 
hls-module-name-plugin 1.0.1.0, hls-ormolu-plugin 1.0.2.0, hls-pragmas-plugin 
1.0.2.0, hls-plugin-api 1.3.0.0, hls-qualify-imported-names-plugin 1.0.1.0, 
hls-refine-imports-plugin 1.0.1.0, hls-retrie-plugin 1.0.2.0, 
hls-selection-range-plugin 1.0.0.0, hls-splice-plugin 1.0.1.0, 
hls-stylish-haskell-plugin 1.0.1.0, hls-tactics-plugin 1.6.0.0, hls-test-utils 
1.2.0.0, lsp 1.4.0.0, lsp-test 0.14.0.2, lsp-types 1.4.0.1

Modified:
  haskell-language-server/trunk/PKGBUILD

----------+
 PKGBUILD |   44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2022-12-31 00:16:48 UTC (rev 1372592)
+++ PKGBUILD    2022-12-31 00:24:04 UTC (rev 1372593)
@@ -1,8 +1,8 @@
 # Maintainer: Felix Yan <[email protected]>
 
 pkgname=haskell-language-server
-pkgver=1.5.1.0
-pkgrel=27
+pkgver=1.6.0.0
+pkgrel=1
 pkgdesc="LSP server for GHC"
 url="https://github.com/haskell/haskell-language-server#readme";
 license=("Apache")
@@ -9,32 +9,30 @@
 arch=('x86_64')
 depends=('ghc-libs' 'haskell-aeson' 'haskell-aeson-pretty' 'haskell-async'
          'haskell-base16-bytestring' 'haskell-cryptohash-sha1' 
'haskell-data-default'
-         'haskell-extra' 'haskell-ghc' 'haskell-ghc-api-compat' 
'haskell-ghc-paths' 'haskell-gitrev'
-         'haskell-hashable' 'haskell-hie-bios' 'haskell-hiedb' 
'haskell-hls-call-hierarchy-plugin'
-         'haskell-hls-eval-plugin' 'haskell-hls-explicit-imports-plugin'
-         'haskell-hls-floskell-plugin' 'haskell-hls-fourmolu-plugin' 
'haskell-hls-ormolu-plugin'
-         'haskell-hls-graph' 'haskell-hls-haddock-comments-plugin' 
'haskell-hls-hlint-plugin'
+         'haskell-extra' 'haskell-ghc' 'haskell-ghc-api-compat' 
'haskell-ghc-paths' 'haskell-ghcide'
+         'haskell-githash' 'haskell-gitrev' 'haskell-hashable' 
'haskell-hie-bios' 'haskell-hiedb' 
+         'haskell-hls-alternate-number-format-plugin' 
'haskell-hls-brittany-plugin'
+         'haskell-hls-call-hierarchy-plugin' 'haskell-hls-class-plugin' 
'haskell-hls-eval-plugin'
+         'haskell-hls-explicit-imports-plugin' 'haskell-hls-floskell-plugin'
+         'haskell-hls-fourmolu-plugin' 'haskell-hls-ormolu-plugin' 
'haskell-hls-graph'
+         'haskell-hls-haddock-comments-plugin' 'haskell-hls-hlint-plugin'
          'haskell-hls-module-name-plugin' 'haskell-hls-ormolu-plugin' 
'haskell-hls-plugin-api'
-         'haskell-hls-pragmas-plugin' 'haskell-hls-retrie-plugin'
-         'haskell-hls-stylish-haskell-plugin' 'haskell-hslogger' 
'haskell-lens' 'haskell-lens-aeson'
-         'haskell-lsp' 'haskell-optparse-applicative' 
'haskell-optparse-simple' 'haskell-regex-tdfa'
-         'haskell-safe-exceptions' 'haskell-sqlite-simple' 'haskell-temporary'
-         'haskell-unordered-containers')
-# Disabled due to not compatible with GHC 9:
-# 'haskell-hls-brittany-plugin' 'haskell-hls-class-plugin' 
'haskell-hls-splice-plugin' 'haskell-hls-tactics-plugin' 
'haskell-hls-refine-imports-plugin'
+         'haskell-hls-pragmas-plugin' 
'haskell-hls-qualify-imported-names-plugin'
+         'haskell-hls-refine-imports-plugin' 'haskell-hls-retrie-plugin'
+         'haskell-hls-selection-range-plugin' 'haskell-hls-splice-plugin'
+         'haskell-hls-stylish-haskell-plugin' 'haskell-hls-tactics-plugin' 
'haskell-hslogger'
+         'haskell-lens' 'haskell-lens-aeson' 'haskell-lsp' 
'haskell-optparse-applicative'
+         'haskell-optparse-simple' 'haskell-regex-tdfa' 
'haskell-safe-exceptions'
+         'haskell-sqlite-simple' 'haskell-temporary' 
'haskell-unordered-containers')
 makedepends=('ghc' 'uusi' 'haskell-hls-test-utils' 
'haskell-hspec-expectations' 'haskell-lsp-test'
              'haskell-lsp-types')
 checkdepends=('cabal-install')
-source=("https://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz";
-        haskell-language-server-aeson-2.patch)
-sha512sums=('555a2940ed1107bf8b3c1ad5c0b6fd71b3998173b18fdace1b1fdca110d8b445b223bb3c312621cd5fe1735302480c86d957df9e086e380855bcea6df11a13a0'
-            
'ef13dbef55343271d4bd5bd8ae3150597113c5b6503fb6bb39544e11345172f38798b1d9bb131c5734bce366a59d98387ae288c2d5b5a3f3740ee135b48bbf8f')
+source=("https://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz";)
+sha512sums=('753fcd49b1ff1b7a00bc766c23bcdb13500c5800cdb3eb5dad8affaf59f023b508db08f0b60d580ada8647c72d9f157bf2524397265facb94bb1ca2eb11387f4')
 
 prepare() {
   cd $pkgname-$pkgver
-  patch -p1 -i ../haskell-language-server-aeson-2.patch
   find test/testdata -name \*.cabal -exec uusi --add-options-all=-dynamic {} \;
-  uusi -u ghc-api-compat $pkgname.cabal
 }
 
 build() {
@@ -45,7 +43,7 @@
     --dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
     --ghc-option=-optl-Wl\,-z\,relro\,-z\,now \
     --ghc-option='-pie' \
-    -fignore-plugins-ghc-bounds -f-brittany -f-class -f-refineImports 
-f-tactic -f-splice
+    -fignore-plugins-ghc-bounds
 
   runhaskell Setup build $MAKEFLAGS
   runhaskell Setup register --gen-script
@@ -56,7 +54,9 @@
 
 check() {
   cd $pkgname-$pkgver
-  
PATH="$PWD/dist/build/haskell-language-server:$PWD/dist/build/haskell-language-server-wrapper:$PATH"
 LD_LIBRARY_PATH="$PWD/dist/build" runhaskell Setup test || echo "Tests failed"
+  
PATH="$PWD/dist/build/haskell-language-server:$PWD/dist/build/haskell-language-server-wrapper:$PATH"
 \
+  LD_LIBRARY_PATH="$PWD/dist/build" \
+  runhaskell Setup test || echo "Tests failed"
 }
 
 package() {

Reply via email to