Date: Friday, December 30, 2022 @ 21:22:25 Author: felixonmars Revision: 1372517
upgpkg: haskell-lsp 1.4.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-types 1.4.0.1 Modified: haskell-lsp/trunk/PKGBUILD haskell-lsp/trunk/lsp-aeson-2.patch -------------------+ PKGBUILD | 15 +++++++-------- lsp-aeson-2.patch | 40 ---------------------------------------- 2 files changed, 7 insertions(+), 48 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-12-30 21:16:46 UTC (rev 1372516) +++ PKGBUILD 2022-12-30 21:22:25 UTC (rev 1372517) @@ -2,23 +2,22 @@ _hkgname=lsp pkgname=haskell-lsp -pkgver=1.2.0.1 -pkgrel=156 +pkgver=1.4.0.0 +pkgrel=1 pkgdesc="Haskell library for the Microsoft Language Server Protocol" url="https://github.com/haskell/lsp"; license=("MIT") arch=('x86_64') depends=('ghc-libs' 'haskell-aeson' 'haskell-async' 'haskell-attoparsec' 'haskell-data-default' - 'haskell-dependent-map' 'haskell-hashable' 'haskell-hslogger' - 'haskell-lens' 'haskell-lsp-types' 'haskell-network-uri' 'haskell-random' - 'haskell-scientific' 'haskell-sorted-list' 'haskell-unliftio-core' - 'haskell-unordered-containers' 'haskell-uuid' 'haskell-unliftio') + 'haskell-hashable' 'haskell-hslogger' 'haskell-lens' 'haskell-lsp-types' + 'haskell-network-uri' 'haskell-random' 'haskell-scientific' 'haskell-sorted-list' + 'haskell-unliftio-core' 'haskell-unordered-containers' 'haskell-uuid' 'haskell-unliftio') makedepends=('ghc' 'uusi' 'haskell-quickcheck' 'haskell-hspec' 'haskell-hspec-discover' 'haskell-quickcheck-instances' 'haskell-rope-utf16-splay') source=("https://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz"; lsp-aeson-2.patch) -sha512sums=('77c79d06cec9bf5fab707c9c1907ca8428ba15f763cad16c5a4b18fb4ee80a1b04770c2b9579d0f4ba31b16f71c2296501c2bd2d3da2475974b42e3c7daf3838' - '99fe0e6948f850731980f25138a7a8bdc649b8f1beb852756dc58f3208b66b8e46b3f472467a3d6140eab13a5734a2274cd0373e54facf93c862ae4021adb7b8') +sha512sums=('f190ef30a676f56dc759ebce8b162e8f6bcbee95d19f4ffa501bc476c42f136a6ae2ed763a74c068280c5eaaf53f93d3c2f5d01c3275c1e4e7a085a9404858bd' + 'c514fb46a9d20552fa7b63895e28bcec83c804087f3a84800a113aa579be4d18311e2d4fea43a800aa9c5fd403d808eae36bba54cc2c4be6c23ad060dcc7fbd8') prepare() { cd $_hkgname-$pkgver Modified: lsp-aeson-2.patch =================================================================== --- lsp-aeson-2.patch 2022-12-30 21:16:46 UTC (rev 1372516) +++ lsp-aeson-2.patch 2022-12-30 21:22:25 UTC (rev 1372517) @@ -1,43 +1,3 @@ -From b2353bc99d31dd41e3f4a03b993bc13b2e2f4802 Mon Sep 17 00:00:00 2001 -From: Michael Peyton Jones <[email protected]> -Date: Sat, 30 Oct 2021 18:08:23 +0100 -Subject: [PATCH] Aeson 2 compatibility - -We get compatibility with both <2 and >=2 by using only functions that -appear in both, which don't make assumptions about the structure of -objects. - -Fixes #356 ---- - lsp-types/src/Language/LSP/Types/Common.hs | 3 +- - lsp-types/src/Language/LSP/Types/Message.hs | 6 +-- - lsp-types/src/Language/LSP/Types/Parsing.hs | 56 +++++++++++---------- - lsp/example/Reactor.hs | 5 +- - 4 files changed, 35 insertions(+), 35 deletions(-) - -diff --git a/lsp/example/Reactor.hs b/lsp/example/Reactor.hs -index cbe7d796..a4c3a817 100644 ---- a/lsp/example/Reactor.hs -+++ b/lsp/example/Reactor.hs -@@ -30,7 +30,6 @@ import Control.Monad - import Control.Monad.IO.Class - import Control.Monad.STM - import qualified Data.Aeson as J --import qualified Data.HashMap.Strict as H - import qualified Data.Text as T - import GHC.Generics (Generic) - import Language.LSP.Server -@@ -263,8 +262,8 @@ handle = mconcat - cmd = "lsp-hello-command" - -- need 'file' and 'start_pos' - args = J.List -- [ J.Object $ H.fromList [("file", J.Object $ H.fromList [("textDocument",J.toJSON doc)])] -- , J.Object $ H.fromList [("start_pos",J.Object $ H.fromList [("position", J.toJSON start)])] -+ [ J.object [("file", J.object [("textDocument",J.toJSON doc)])] -+ , J.object [("start_pos",J.object [("position", J.toJSON start)])] - ] - cmdparams = Just args - makeCommand (J.Diagnostic _r _s _c _source _m _t _l) = [] From c974bb0eaa204791c5abb7d051fe5b92ee018d80 Mon Sep 17 00:00:00 2001 From: Kobayashi <[email protected]> Date: Tue, 4 Jan 2022 22:20:20 +0800
