CVS commit: pkgsrc/devel/hs-hls-plugin-api

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel/hs-hls-plugin-api
From: "Masatake Daimon" <pho%netbsd.org@localhost>
Date: Sat, 4 May 2024 10:42:24 +0000

Module Name:    pkgsrc
Committed By:   pho
Date:           Sat May  4 10:42:24 UTC 2024

Modified Files:
        pkgsrc/devel/hs-hls-plugin-api: Makefile PLIST buildlink3.mk distinfo
Added Files:
        pkgsrc/devel/hs-hls-plugin-api/patches: patch-src_Ide_Plugin_Resolve.hs

Log Message:
devel/hs-hls-plugin-api: Update to 2.7.0.0

Upstream provides no release notes.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/hs-hls-plugin-api/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/hs-hls-plugin-api/PLIST \
    pkgsrc/devel/hs-hls-plugin-api/distinfo
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/hs-hls-plugin-api/buildlink3.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/hs-hls-plugin-api/patches/patch-src_Ide_Plugin_Resolve.hs

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/hs-hls-plugin-api/Makefile
diff -u pkgsrc/devel/hs-hls-plugin-api/Makefile:1.9 pkgsrc/devel/hs-hls-plugin-api/Makefile:1.10
--- pkgsrc/devel/hs-hls-plugin-api/Makefile:1.9 Thu Nov  2 06:36:39 2023
+++ pkgsrc/devel/hs-hls-plugin-api/Makefile     Sat May  4 10:42:24 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2023/11/02 06:36:39 pho Exp $
+# $NetBSD: Makefile,v 1.10 2024/05/04 10:42:24 pho Exp $
 
-DISTNAME=      hls-plugin-api-2.4.0.0
-PKGREVISION=   1
+DISTNAME=      hls-plugin-api-2.7.0.0
 CATEGORIES=    devel
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -9,7 +8,8 @@ COMMENT=        Haskell Language Server API for
 LICENSE=       apache-2.0
 
 HASKELL_UNRESTRICT_DEPENDENCIES+=      \
-       Diff
+       Diff    \
+       lsp
 
 .include "../../converters/hs-aeson/buildlink3.mk"
 .include "../../sysutils/hs-co-log-core/buildlink3.mk"
@@ -29,7 +29,6 @@ HASKELL_UNRESTRICT_DEPENDENCIES+=     \
 .include "../../devel/hs-optparse-applicative/buildlink3.mk"
 .include "../../textproc/hs-prettyprinter/buildlink3.mk"
 .include "../../textproc/hs-regex-tdfa/buildlink3.mk"
-.include "../../devel/hs-row-types/buildlink3.mk"
 .include "../../devel/hs-unliftio/buildlink3.mk"
 .include "../../devel/hs-unordered-containers/buildlink3.mk"
 .include "../../devel/hs-hw-fingertree/buildlink3.mk"

Index: pkgsrc/devel/hs-hls-plugin-api/PLIST
diff -u pkgsrc/devel/hs-hls-plugin-api/PLIST:1.3 pkgsrc/devel/hs-hls-plugin-api/PLIST:1.4
--- pkgsrc/devel/hs-hls-plugin-api/PLIST:1.3    Tue Oct 31 09:07:04 2023
+++ pkgsrc/devel/hs-hls-plugin-api/PLIST        Sat May  4 10:42:24 2024
@@ -1,6 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2023/10/31 09:07:04 pho Exp $
-lib/hls-plugin-api-${PKGVERSION}/${HS_VERSION}/package-description
-lib/hls-plugin-api-${PKGVERSION}/${HS_VERSION}/package-id
+@comment $NetBSD: PLIST,v 1.4 2024/05/04 10:42:24 pho Exp $
 ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Ide/Logger.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Ide/Logger.hi
 ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Ide/Logger.p_hi
@@ -13,6 +11,9 @@ ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKG
 ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Ide/Plugin/Error.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Ide/Plugin/Error.hi
 ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Ide/Plugin/Error.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Ide/Plugin/HandleRequestTypes.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Ide/Plugin/HandleRequestTypes.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Ide/Plugin/HandleRequestTypes.p_hi
 ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Ide/Plugin/Properties.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Ide/Plugin/Properties.hi
 ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Ide/Plugin/Properties.p_hi
@@ -31,11 +32,14 @@ ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKG
 lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
 ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
 ${PLIST.shlibs}lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
+lib/hls-plugin-api-${PKGVERSION}/${HS_VERSION}/package-description
+lib/hls-plugin-api-${PKGVERSION}/${HS_VERSION}/package-id
 share/doc/${HS_PLATFORM}/hls-plugin-api-${PKGVERSION}/LICENSE
 ${PLIST.doc}share/doc/${HS_PLATFORM}/hls-plugin-api-${PKGVERSION}/html/Ide-Logger.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/hls-plugin-api-${PKGVERSION}/html/Ide-Plugin-Config.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/hls-plugin-api-${PKGVERSION}/html/Ide-Plugin-ConfigUtils.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/hls-plugin-api-${PKGVERSION}/html/Ide-Plugin-Error.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/hls-plugin-api-${PKGVERSION}/html/Ide-Plugin-HandleRequestTypes.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/hls-plugin-api-${PKGVERSION}/html/Ide-Plugin-Properties.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/hls-plugin-api-${PKGVERSION}/html/Ide-Plugin-RangeMap.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/hls-plugin-api-${PKGVERSION}/html/Ide-Plugin-Resolve.html
@@ -65,12 +69,10 @@ ${PLIST.doc}share/doc/${HS_PLATFORM}/hls
 ${PLIST.doc}share/doc/${HS_PLATFORM}/hls-plugin-api-${PKGVERSION}/html/doc-index-V.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/hls-plugin-api-${PKGVERSION}/html/doc-index-W.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/hls-plugin-api-${PKGVERSION}/html/doc-index.html
-${PLIST.doc}share/doc/${HS_PLATFORM}/hls-plugin-api-${PKGVERSION}/html/doc-index.json
 ${PLIST.doc}share/doc/${HS_PLATFORM}/hls-plugin-api-${PKGVERSION}/html/haddock-bundle.min.js
 ${PLIST.doc}share/doc/${HS_PLATFORM}/hls-plugin-api-${PKGVERSION}/html/hls-plugin-api.haddock
 ${PLIST.doc}share/doc/${HS_PLATFORM}/hls-plugin-api-${PKGVERSION}/html/index.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/hls-plugin-api-${PKGVERSION}/html/linuwial.css
 ${PLIST.doc}share/doc/${HS_PLATFORM}/hls-plugin-api-${PKGVERSION}/html/meta.json
 ${PLIST.doc}share/doc/${HS_PLATFORM}/hls-plugin-api-${PKGVERSION}/html/quick-jump.css
-${PLIST.doc}share/doc/${HS_PLATFORM}/hls-plugin-api-${PKGVERSION}/html/quick-jump.min.js
 ${PLIST.doc}share/doc/${HS_PLATFORM}/hls-plugin-api-${PKGVERSION}/html/synopsis.png
Index: pkgsrc/devel/hs-hls-plugin-api/distinfo
diff -u pkgsrc/devel/hs-hls-plugin-api/distinfo:1.3 pkgsrc/devel/hs-hls-plugin-api/distinfo:1.4
--- pkgsrc/devel/hs-hls-plugin-api/distinfo:1.3 Tue Oct 31 09:07:04 2023
+++ pkgsrc/devel/hs-hls-plugin-api/distinfo     Sat May  4 10:42:24 2024
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2023/10/31 09:07:04 pho Exp $
+$NetBSD: distinfo,v 1.4 2024/05/04 10:42:24 pho Exp $
 
-BLAKE2s (hls-plugin-api-2.4.0.0.tar.gz) = 221dc085d5ccc1f92c2840c6ca9f7c7ec56e00ee43fb7d2c6b445f3cfd8d7de9
-SHA512 (hls-plugin-api-2.4.0.0.tar.gz) = f72ab893945ccb1f58533014c3e3d522aedf9384ead3c3d8388040cff0844aba763a8d4e5482f36c6ac793c355c39e19515b38ce5d856808d00be07df2653660
-Size (hls-plugin-api-2.4.0.0.tar.gz) = 37910 bytes
+BLAKE2s (hls-plugin-api-2.7.0.0.tar.gz) = 08582f770f315b31389685107fbf933db279ab1b2a0736aac6d167a400b44a46
+SHA512 (hls-plugin-api-2.7.0.0.tar.gz) = 5b9a69bd6a439d068549693dcb1385b1ebec12daa44efae8c6b80199061f9077b154c5a00ebb9d3526fa2d5a51b6162179c28fa9edb0001e2c6c81bb98b70a67
+Size (hls-plugin-api-2.7.0.0.tar.gz) = 41742 bytes
+SHA1 (patch-src_Ide_Plugin_Resolve.hs) = 6d872de06ebe3ff0fb19605592485dd525d6a852

Index: pkgsrc/devel/hs-hls-plugin-api/buildlink3.mk
diff -u pkgsrc/devel/hs-hls-plugin-api/buildlink3.mk:1.10 pkgsrc/devel/hs-hls-plugin-api/buildlink3.mk:1.11
--- pkgsrc/devel/hs-hls-plugin-api/buildlink3.mk:1.10   Thu Nov  2 06:36:39 2023
+++ pkgsrc/devel/hs-hls-plugin-api/buildlink3.mk        Sat May  4 10:42:24 2024
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.10 2023/11/02 06:36:39 pho Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2024/05/04 10:42:24 pho Exp $
 
 BUILDLINK_TREE+=       hs-hls-plugin-api
 
 .if !defined(HS_HLS_PLUGIN_API_BUILDLINK3_MK)
 HS_HLS_PLUGIN_API_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.hs-hls-plugin-api+=      hs-hls-plugin-api>=2.4.0
-BUILDLINK_ABI_DEPENDS.hs-hls-plugin-api+=      hs-hls-plugin-api>=2.4.0.0nb1
+BUILDLINK_API_DEPENDS.hs-hls-plugin-api+=      hs-hls-plugin-api>=2.7.0
+BUILDLINK_ABI_DEPENDS.hs-hls-plugin-api+=      hs-hls-plugin-api>=2.7.0.0
 BUILDLINK_PKGSRCDIR.hs-hls-plugin-api?=                ../../devel/hs-hls-plugin-api
 
 .include "../../converters/hs-aeson/buildlink3.mk"
@@ -27,7 +27,6 @@ BUILDLINK_PKGSRCDIR.hs-hls-plugin-api?=       
 .include "../../devel/hs-optparse-applicative/buildlink3.mk"
 .include "../../textproc/hs-prettyprinter/buildlink3.mk"
 .include "../../textproc/hs-regex-tdfa/buildlink3.mk"
-.include "../../devel/hs-row-types/buildlink3.mk"
 .include "../../devel/hs-unliftio/buildlink3.mk"
 .include "../../devel/hs-unordered-containers/buildlink3.mk"
 .include "../../devel/hs-hw-fingertree/buildlink3.mk"

Added files:

Index: pkgsrc/devel/hs-hls-plugin-api/patches/patch-src_Ide_Plugin_Resolve.hs
diff -u /dev/null pkgsrc/devel/hs-hls-plugin-api/patches/patch-src_Ide_Plugin_Resolve.hs:1.1
--- /dev/null   Sat May  4 10:42:24 2024
+++ pkgsrc/devel/hs-hls-plugin-api/patches/patch-src_Ide_Plugin_Resolve.hs      Sat May  4 10:42:24 2024
@@ -0,0 +1,31 @@
+$NetBSD: patch-src_Ide_Plugin_Resolve.hs,v 1.1 2024/05/04 10:42:24 pho Exp $
+
+Upgrade to latest lsp / lsp-types / lsp-test
+https://github.com/haskell/haskell-language-server/pull/4166
+
+--- src/Ide/Plugin/Resolve.hs.orig     2024-05-04 10:37:07.495340141 +0000
++++ src/Ide/Plugin/Resolve.hs
+@@ -1,6 +1,5 @@
+ {-# LANGUAGE DisambiguateRecordFields #-}
+ {-# LANGUAGE LambdaCase               #-}
+-{-# LANGUAGE OverloadedLabels         #-}
+ {-# LANGUAGE OverloadedStrings        #-}
+ {-| This module currently includes helper functions to provide fallback support
+ to code actions that use resolve in HLS. The difference between the two
+@@ -26,7 +25,6 @@ import           Control.Monad.Trans.Exc
+ 
+ import qualified Data.Aeson                    as A
+ import           Data.Maybe                    (catMaybes)
+-import           Data.Row                      ((.!))
+ import qualified Data.Text                     as T
+ import           GHC.Generics                  (Generic)
+ import           Ide.Logger
+@@ -190,7 +188,7 @@ supportsCodeActionResolve :: ClientCapab
+ supportsCodeActionResolve caps =
+     caps ^? L.textDocument . _Just . L.codeAction . _Just . L.dataSupport . _Just == Just True
+     && case caps ^? L.textDocument . _Just . L.codeAction . _Just . L.resolveSupport . _Just of
+-        Just row -> "edit" `elem` row .! #properties
++        Just ClientCodeActionResolveOptions{_properties} -> "edit" `elem` _properties
+         _        -> False
+ 
+ internalError :: T.Text -> PluginError

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index