pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/devel/hs-ghcide
Module Name: pkgsrc
Committed By: pho
Date: Sat May 4 11:24:54 UTC 2024
Modified Files:
pkgsrc/devel/hs-ghcide: Makefile PLIST buildlink3.mk distinfo
Added Files:
pkgsrc/devel/hs-ghcide/patches:
patch-session-loader_Development_IDE_Session.hs
patch-src_Development_IDE_Core_PositionMapping.hs
patch-src_Development_IDE_Plugin_Completions_Logic.hs
Log Message:
devel/hs-ghcide: Update to 2.7.0.0
Upstream provides no release notes.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/hs-ghcide/Makefile \
pkgsrc/devel/hs-ghcide/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/hs-ghcide/PLIST \
pkgsrc/devel/hs-ghcide/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/devel/hs-ghcide/patches/patch-session-loader_Development_IDE_Session.hs \
pkgsrc/devel/hs-ghcide/patches/patch-src_Development_IDE_Core_PositionMapping.hs \
pkgsrc/devel/hs-ghcide/patches/patch-src_Development_IDE_Plugin_Completions_Logic.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-ghcide/Makefile
diff -u pkgsrc/devel/hs-ghcide/Makefile:1.14 pkgsrc/devel/hs-ghcide/Makefile:1.15
--- pkgsrc/devel/hs-ghcide/Makefile:1.14 Wed Nov 8 13:18:45 2023
+++ pkgsrc/devel/hs-ghcide/Makefile Sat May 4 11:24:53 2024
@@ -1,16 +1,20 @@
-# $NetBSD: Makefile,v 1.14 2023/11/08 13:18:45 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2024/05/04 11:24:53 pho Exp $
-DISTNAME= ghcide-2.4.0.0
-PKGREVISION= 2
+DISTNAME= ghcide-2.7.0.0
CATEGORIES= devel
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
COMMENT= The core of an IDE
LICENSE= apache-2.0
+HASKELL_DISABLE_LIBRARIES+= \
+ ghcide-test-utils
+
HASKELL_UNRESTRICT_DEPENDENCIES+= \
- Diff \
- implicit-hie
+ Diff \
+ hie-bios \
+ lsp \
+ lsp-types
CONFIGURE_ARGS+= -f-test-exe
CONFIGURE_ARGS+= -f-bench-exe
@@ -48,7 +52,6 @@ OPTPARSE_APPLICATIVE_EXECUTABLES+= ghcid
.include "../../devel/hs-hls-graph/buildlink3.mk"
.include "../../devel/hs-hls-plugin-api/buildlink3.mk"
.include "../../devel/hs-implicit-hie/buildlink3.mk"
-.include "../../devel/hs-implicit-hie-cradle/buildlink3.mk"
.include "../../devel/hs-lens/buildlink3.mk"
.include "../../devel/hs-list-t/buildlink3.mk"
.include "../../devel/hs-lsp/buildlink3.mk"
Index: pkgsrc/devel/hs-ghcide/buildlink3.mk
diff -u pkgsrc/devel/hs-ghcide/buildlink3.mk:1.14 pkgsrc/devel/hs-ghcide/buildlink3.mk:1.15
--- pkgsrc/devel/hs-ghcide/buildlink3.mk:1.14 Wed Nov 8 13:18:45 2023
+++ pkgsrc/devel/hs-ghcide/buildlink3.mk Sat May 4 11:24:53 2024
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.14 2023/11/08 13:18:45 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2024/05/04 11:24:53 pho Exp $
BUILDLINK_TREE+= hs-ghcide
.if !defined(HS_GHCIDE_BUILDLINK3_MK)
HS_GHCIDE_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.hs-ghcide+= hs-ghcide>=2.4.0
-BUILDLINK_ABI_DEPENDS.hs-ghcide+= hs-ghcide>=2.4.0.0nb2
+BUILDLINK_API_DEPENDS.hs-ghcide+= hs-ghcide>=2.7.0
+BUILDLINK_ABI_DEPENDS.hs-ghcide+= hs-ghcide>=2.7.0.0
BUILDLINK_PKGSRCDIR.hs-ghcide?= ../../devel/hs-ghcide
.include "../../converters/hs-aeson/buildlink3.mk"
@@ -36,7 +36,6 @@ BUILDLINK_PKGSRCDIR.hs-ghcide?= ../../d
.include "../../devel/hs-hls-graph/buildlink3.mk"
.include "../../devel/hs-hls-plugin-api/buildlink3.mk"
.include "../../devel/hs-implicit-hie/buildlink3.mk"
-.include "../../devel/hs-implicit-hie-cradle/buildlink3.mk"
.include "../../devel/hs-lens/buildlink3.mk"
.include "../../devel/hs-list-t/buildlink3.mk"
.include "../../devel/hs-lsp/buildlink3.mk"
Index: pkgsrc/devel/hs-ghcide/PLIST
diff -u pkgsrc/devel/hs-ghcide/PLIST:1.3 pkgsrc/devel/hs-ghcide/PLIST:1.4
--- pkgsrc/devel/hs-ghcide/PLIST:1.3 Tue Oct 31 09:23:32 2023
+++ pkgsrc/devel/hs-ghcide/PLIST Sat May 4 11:24:53 2024
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2023/10/31 09:23:32 pho Exp $
+@comment $NetBSD: PLIST,v 1.4 2024/05/04 11:24:53 pho Exp $
bin/ghcide
-lib/ghcide-${PKGVERSION}/${HS_VERSION}/package-description
-lib/ghcide-${PKGVERSION}/${HS_VERSION}/package-id
${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Concurrent/Strict.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Control/Concurrent/Strict.hi
${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Concurrent/Strict.p_hi
@@ -68,6 +66,9 @@ ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKG
${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Development/IDE/GHC/Compat.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Development/IDE/GHC/Compat.hi
${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Development/IDE/GHC/Compat.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Development/IDE/GHC/Compat/CmdLine.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Development/IDE/GHC/Compat/CmdLine.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Development/IDE/GHC/Compat/CmdLine.p_hi
${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Development/IDE/GHC/Compat/Core.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Development/IDE/GHC/Compat/Core.hi
${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Development/IDE/GHC/Compat/Core.p_hi
@@ -173,6 +174,9 @@ ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKG
${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Development/IDE/Session/Diagnostics.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Development/IDE/Session/Diagnostics.hi
${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Development/IDE/Session/Diagnostics.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Development/IDE/Session/Implicit.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Development/IDE/Session/Implicit.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Development/IDE/Session/Implicit.p_hi
${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Development/IDE/Session/VersionCheck.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Development/IDE/Session/VersionCheck.hi
${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Development/IDE/Session/VersionCheck.p_hi
@@ -227,6 +231,8 @@ ${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/ghcide-${PKGVERSION}/${HS_VERSION}/package-description
+lib/ghcide-${PKGVERSION}/${HS_VERSION}/package-id
share/doc/${HS_PLATFORM}/ghcide-${PKGVERSION}/LICENSE
${PLIST.doc}share/doc/${HS_PLATFORM}/ghcide-${PKGVERSION}/html/Control-Concurrent-Strict.html
${PLIST.doc}share/doc/${HS_PLATFORM}/ghcide-${PKGVERSION}/html/Development-IDE-Core-Actions.html
@@ -246,6 +252,7 @@ ${PLIST.doc}share/doc/${HS_PLATFORM}/ghc
${PLIST.doc}share/doc/${HS_PLATFORM}/ghcide-${PKGVERSION}/html/Development-IDE-Core-Shake.html
${PLIST.doc}share/doc/${HS_PLATFORM}/ghcide-${PKGVERSION}/html/Development-IDE-Core-Tracing.html
${PLIST.doc}share/doc/${HS_PLATFORM}/ghcide-${PKGVERSION}/html/Development-IDE-Core-UseStale.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/ghcide-${PKGVERSION}/html/Development-IDE-GHC-Compat-CmdLine.html
${PLIST.doc}share/doc/${HS_PLATFORM}/ghcide-${PKGVERSION}/html/Development-IDE-GHC-Compat-Core.html
${PLIST.doc}share/doc/${HS_PLATFORM}/ghcide-${PKGVERSION}/html/Development-IDE-GHC-Compat-Env.html
${PLIST.doc}share/doc/${HS_PLATFORM}/ghcide-${PKGVERSION}/html/Development-IDE-GHC-Compat-Iface.html
@@ -271,6 +278,7 @@ ${PLIST.doc}share/doc/${HS_PLATFORM}/ghc
${PLIST.doc}share/doc/${HS_PLATFORM}/ghcide-${PKGVERSION}/html/Development-IDE-Main.html
${PLIST.doc}share/doc/${HS_PLATFORM}/ghcide-${PKGVERSION}/html/Development-IDE-Monitoring-EKG.html
${PLIST.doc}share/doc/${HS_PLATFORM}/ghcide-${PKGVERSION}/html/Development-IDE-Monitoring-OpenTelemetry.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/ghcide-${PKGVERSION}/html/Development-IDE-Plugin-Completions-Logic.html
${PLIST.doc}share/doc/${HS_PLATFORM}/ghcide-${PKGVERSION}/html/Development-IDE-Plugin-Completions-Types.html
${PLIST.doc}share/doc/${HS_PLATFORM}/ghcide-${PKGVERSION}/html/Development-IDE-Plugin-Completions.html
${PLIST.doc}share/doc/${HS_PLATFORM}/ghcide-${PKGVERSION}/html/Development-IDE-Plugin-HLS-GhcIde.html
@@ -279,6 +287,7 @@ ${PLIST.doc}share/doc/${HS_PLATFORM}/ghc
${PLIST.doc}share/doc/${HS_PLATFORM}/ghcide-${PKGVERSION}/html/Development-IDE-Plugin-TypeLenses.html
${PLIST.doc}share/doc/${HS_PLATFORM}/ghcide-${PKGVERSION}/html/Development-IDE-Plugin.html
${PLIST.doc}share/doc/${HS_PLATFORM}/ghcide-${PKGVERSION}/html/Development-IDE-Session-Diagnostics.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/ghcide-${PKGVERSION}/html/Development-IDE-Session-Implicit.html
${PLIST.doc}share/doc/${HS_PLATFORM}/ghcide-${PKGVERSION}/html/Development-IDE-Session.html
${PLIST.doc}share/doc/${HS_PLATFORM}/ghcide-${PKGVERSION}/html/Development-IDE-Spans-AtPoint.html
${PLIST.doc}share/doc/${HS_PLATFORM}/ghcide-${PKGVERSION}/html/Development-IDE-Spans-Common.html
@@ -299,6 +308,7 @@ ${PLIST.doc}share/doc/${HS_PLATFORM}/ghc
${PLIST.doc}share/doc/${HS_PLATFORM}/ghcide-${PKGVERSION}/html/doc-index-36.html
${PLIST.doc}share/doc/${HS_PLATFORM}/ghcide-${PKGVERSION}/html/doc-index-42.html
${PLIST.doc}share/doc/${HS_PLATFORM}/ghcide-${PKGVERSION}/html/doc-index-60.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/ghcide-${PKGVERSION}/html/doc-index-95.html
${PLIST.doc}share/doc/${HS_PLATFORM}/ghcide-${PKGVERSION}/html/doc-index-A.html
${PLIST.doc}share/doc/${HS_PLATFORM}/ghcide-${PKGVERSION}/html/doc-index-All.html
${PLIST.doc}share/doc/${HS_PLATFORM}/ghcide-${PKGVERSION}/html/doc-index-B.html
@@ -327,12 +337,10 @@ ${PLIST.doc}share/doc/${HS_PLATFORM}/ghc
${PLIST.doc}share/doc/${HS_PLATFORM}/ghcide-${PKGVERSION}/html/doc-index-Y.html
${PLIST.doc}share/doc/${HS_PLATFORM}/ghcide-${PKGVERSION}/html/doc-index-Z.html
${PLIST.doc}share/doc/${HS_PLATFORM}/ghcide-${PKGVERSION}/html/doc-index.html
-${PLIST.doc}share/doc/${HS_PLATFORM}/ghcide-${PKGVERSION}/html/doc-index.json
${PLIST.doc}share/doc/${HS_PLATFORM}/ghcide-${PKGVERSION}/html/ghcide.haddock
${PLIST.doc}share/doc/${HS_PLATFORM}/ghcide-${PKGVERSION}/html/haddock-bundle.min.js
${PLIST.doc}share/doc/${HS_PLATFORM}/ghcide-${PKGVERSION}/html/index.html
${PLIST.doc}share/doc/${HS_PLATFORM}/ghcide-${PKGVERSION}/html/linuwial.css
${PLIST.doc}share/doc/${HS_PLATFORM}/ghcide-${PKGVERSION}/html/meta.json
${PLIST.doc}share/doc/${HS_PLATFORM}/ghcide-${PKGVERSION}/html/quick-jump.css
-${PLIST.doc}share/doc/${HS_PLATFORM}/ghcide-${PKGVERSION}/html/quick-jump.min.js
${PLIST.doc}share/doc/${HS_PLATFORM}/ghcide-${PKGVERSION}/html/synopsis.png
Index: pkgsrc/devel/hs-ghcide/distinfo
diff -u pkgsrc/devel/hs-ghcide/distinfo:1.3 pkgsrc/devel/hs-ghcide/distinfo:1.4
--- pkgsrc/devel/hs-ghcide/distinfo:1.3 Tue Oct 31 09:23:32 2023
+++ pkgsrc/devel/hs-ghcide/distinfo Sat May 4 11:24:53 2024
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.3 2023/10/31 09:23:32 pho Exp $
+$NetBSD: distinfo,v 1.4 2024/05/04 11:24:53 pho Exp $
-BLAKE2s (ghcide-2.4.0.0.tar.gz) = dfc1e8b08e2d940d82462f616f486293744999fcf1c6f61524ea14ff6bc24bb6
-SHA512 (ghcide-2.4.0.0.tar.gz) = 48008a2de2e03d1eba2fb45c1788a99ec2f2ee74bcedad7ad7a06ba8a70b7827be3d1596475e9b263e691df7cef70de139e8d4e4ec973a23aebd8a41405a9d1b
-Size (ghcide-2.4.0.0.tar.gz) = 299656 bytes
+BLAKE2s (ghcide-2.7.0.0.tar.gz) = a0f2f535471f0f3bcc39a888f686dff8d8d0b0380468a784490455f861a5490b
+SHA512 (ghcide-2.7.0.0.tar.gz) = ddcca10eba2f4ad6d7d02a992826ca70769d1cddd84093b9d963ee3d05c8e7eefa788c04a0c9b42989f88a9642b01618d99ff042086bcc2e4a4c6ee634bdef52
+Size (ghcide-2.7.0.0.tar.gz) = 301061 bytes
+SHA1 (patch-session-loader_Development_IDE_Session.hs) = 6d2d73f366759bf15fcbaf1d8df3894ccf91dfae
+SHA1 (patch-src_Development_IDE_Core_PositionMapping.hs) = 27f1f7afaf8e83a8e0525eb70c96bf4a77e25114
+SHA1 (patch-src_Development_IDE_Plugin_Completions_Logic.hs) = a1dae580d7bf36ff8e0f285c6cbb6aea4dcf5703
Added files:
Index: pkgsrc/devel/hs-ghcide/patches/patch-session-loader_Development_IDE_Session.hs
diff -u /dev/null pkgsrc/devel/hs-ghcide/patches/patch-session-loader_Development_IDE_Session.hs:1.1
--- /dev/null Sat May 4 11:24:54 2024
+++ pkgsrc/devel/hs-ghcide/patches/patch-session-loader_Development_IDE_Session.hs Sat May 4 11:24:53 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-session-loader_Development_IDE_Session.hs,v 1.1 2024/05/04 11:24:53 pho Exp $
+
+Fix build with newer hie-bios. Already fixed in upstream HEAD.
+
+--- session-loader/Development/IDE/Session.hs.orig 2024-05-04 11:11:27.236113902 +0000
++++ session-loader/Development/IDE/Session.hs
+@@ -718,7 +718,7 @@ cradleToOptsAndLibDir recorder cradle fi
+ -- noneCradleFoundMessage f = T.pack $ "none cradle found for " <> f <> ", ignoring the file"
+ -- Start off by getting the session options
+ logWith recorder Debug $ LogCradle cradle
+- cradleRes <- HieBios.getCompilerOptions file old_files cradle
++ cradleRes <- HieBios.getCompilerOptions file (LoadWithContext old_files) cradle
+ case cradleRes of
+ CradleSuccess r -> do
+ -- Now get the GHC lib dir
Index: pkgsrc/devel/hs-ghcide/patches/patch-src_Development_IDE_Core_PositionMapping.hs
diff -u /dev/null pkgsrc/devel/hs-ghcide/patches/patch-src_Development_IDE_Core_PositionMapping.hs:1.1
--- /dev/null Sat May 4 11:24:54 2024
+++ pkgsrc/devel/hs-ghcide/patches/patch-src_Development_IDE_Core_PositionMapping.hs Sat May 4 11:24:53 2024
@@ -0,0 +1,39 @@
+$NetBSD: patch-src_Development_IDE_Core_PositionMapping.hs,v 1.1 2024/05/04 11:24:53 pho Exp $
+
+Upgrade to latest lsp / lsp-types / lsp-test
+https://github.com/haskell/haskell-language-server/pull/4166
+
+--- src/Development/IDE/Core/PositionMapping.hs.orig 2024-05-04 11:00:42.359853887 +0000
++++ src/Development/IDE/Core/PositionMapping.hs
+@@ -1,4 +1,3 @@
+-{-# LANGUAGE OverloadedLabels #-}
+ -- Copyright (c) 2019 The DAML Authors. All rights reserved.
+ -- SPDX-License-Identifier: Apache-2.0
+ module Development.IDE.Core.PositionMapping
+@@ -25,6 +24,7 @@ module Development.IDE.Core.PositionMapp
+ ) where
+
+ import Control.DeepSeq
++import Control.Lens ((^.))
+ import Control.Monad
+ import Data.Algorithm.Diff
+ import Data.Bifunctor
+@@ -32,6 +32,7 @@ import Data.List
+ import Data.Row
+ import qualified Data.Text as T
+ import qualified Data.Vector.Unboxed as V
++import qualified Language.LSP.Protocol.Lens as L
+ import Language.LSP.Protocol.Types (Position (Position),
+ Range (Range),
+ TextDocumentContentChangeEvent (TextDocumentContentChangeEvent),
+@@ -131,8 +132,8 @@ addOldDelta delta (PositionMapping pm) =
+ -- that was what was done with lsp* 1.6 packages
+ applyChange :: PositionDelta -> TextDocumentContentChangeEvent -> PositionDelta
+ applyChange PositionDelta{..} (TextDocumentContentChangeEvent (InL x)) = PositionDelta
+- { toDelta = toCurrent (x .! #range) (x .! #text) <=< toDelta
+- , fromDelta = fromDelta <=< fromCurrent (x .! #range) (x .! #text)
++ { toDelta = toCurrent (x ^. L.range) (x ^. L.text) <=< toDelta
++ , fromDelta = fromDelta <=< fromCurrent (x ^. L.range) (x ^. L.text)
+ }
+ applyChange posMapping _ = posMapping
+
Index: pkgsrc/devel/hs-ghcide/patches/patch-src_Development_IDE_Plugin_Completions_Logic.hs
diff -u /dev/null pkgsrc/devel/hs-ghcide/patches/patch-src_Development_IDE_Plugin_Completions_Logic.hs:1.1
--- /dev/null Sat May 4 11:24:54 2024
+++ pkgsrc/devel/hs-ghcide/patches/patch-src_Development_IDE_Plugin_Completions_Logic.hs Sat May 4 11:24:53 2024
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_Development_IDE_Plugin_Completions_Logic.hs,v 1.1 2024/05/04 11:24:53 pho Exp $
+
+Upgrade to latest lsp / lsp-types / lsp-test
+https://github.com/haskell/haskell-language-server/pull/4166
+
+--- src/Development/IDE/Plugin/Completions/Logic.hs.orig 2024-05-04 11:03:45.624475760 +0000
++++ src/Development/IDE/Plugin/Completions/Logic.hs
+@@ -2,7 +2,6 @@
+ {-# LANGUAGE DuplicateRecordFields #-}
+ {-# LANGUAGE GADTs #-}
+ {-# LANGUAGE MultiWayIf #-}
+-{-# LANGUAGE OverloadedLabels #-}
+
+ -- Mostly taken from "haskell-ide-engine"
+ module Development.IDE.Plugin.Completions.Logic (
+@@ -530,7 +529,7 @@ toggleSnippets ClientCapabilities {_text
+ removeSnippetsWhen (not $ enableSnippets && supported)
+ where
+ supported =
+- Just True == (_textDocument >>= _completion >>= view L.completionItem >>= (\x -> x .! #snippetSupport))
++ Just True == (_textDocument >>= _completion >>= view L.completionItem >>= view L.snippetSupport)
+
+ toggleAutoExtend :: CompletionsConfig -> CompItem -> CompItem
+ toggleAutoExtend CompletionsConfig{enableAutoExtend=False} x = x {additionalTextEdits = Nothing}
Home |
Main Index |
Thread Index |
Old Index