Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id F107D852EF for ; Tue, 31 Oct 2023 04:01:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id pmkcrOPPyUpF for ; Tue, 31 Oct 2023 04:01:40 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 0F21484D05 for ; Tue, 31 Oct 2023 04:01:40 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 087AAFADC; Tue, 31 Oct 2023 04:01:40 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1698724900191480" MIME-Version: 1.0 Date: Tue, 31 Oct 2023 04:01:40 +0000 From: "Masatake Daimon" Subject: CVS commit: pkgsrc/devel/hs-lsp-types To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: pho@netbsd.org X-Mailer: log_accum Message-Id: <20231031040140.087AAFADC@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1698724900191480 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: pho Date: Tue Oct 31 04:01:39 UTC 2023 Modified Files: pkgsrc/devel/hs-lsp-types: Makefile buildlink3.mk distinfo Added Files: pkgsrc/devel/hs-lsp-types/patches: patch-src_Language_LSP_Protocol_Types_Common.hs Log Message: devel/hs-lsp-types: Update to 2.0.2.0 2.0.2.0 * Add Language.LSP.Protocol.Utils.Misc.prettyJSON :: Value -> Doc ann for prettyprinting JSON, and ViaJSON as a deriving-via newtype wrapper for it. * Generate Pretty instances for all LSP types using ViaJSON. 2.0.1.1 * Fix parsing of notifications with missing params 2.0.1.0 * Removed deprecation pragmas from fields, as these cannot currently be avoided. * Added isOptionalMethod, that checks whether a method is optional according to the spec. 2.0.0.1 * Fixed missing extra-source-files for metamodel.json. 2.0.0.0 * Breaking change: major restructure to generate types and methods from the LSP metamodel. - Full support for version 3.17 of the LSP specification, many accuracy fixes - Generated types follow the spec very closely, e.g. using anonymous types, using a |? Null instead of Maybe a - Anonymous record types in the spec are now represented using row-types - Many constructors are now prefixed with their type names - Documentation from the spec is transferred - Three top level modules: Types (main protocol types), Message (messages and methods), Capabilities (capabilities) * New typeclasses for handling LSP enumerations: LspEnum and LspOpenEnum To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/hs-lsp-types/Makefile \ pkgsrc/devel/hs-lsp-types/buildlink3.mk cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/hs-lsp-types/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/devel/hs-lsp-types/patches/patch-src_Language_LSP_Protocol_Types_Common.hs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1698724900191480 Content-Disposition: inline Content-Length: 6084 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/hs-lsp-types/Makefile diff -u pkgsrc/devel/hs-lsp-types/Makefile:1.6 pkgsrc/devel/hs-lsp-types/Makefile:1.7 --- pkgsrc/devel/hs-lsp-types/Makefile:1.6 Mon Oct 9 04:54:22 2023 +++ pkgsrc/devel/hs-lsp-types/Makefile Tue Oct 31 04:01:39 2023 @@ -1,24 +1,41 @@ -# $NetBSD: Makefile,v 1.6 2023/10/09 04:54:22 pho Exp $ +# $NetBSD: Makefile,v 1.7 2023/10/31 04:01:39 pho Exp $ -DISTNAME= lsp-types-1.6.0.0 -PKGREVISION= 2 +DISTNAME= lsp-types-2.0.2.0 CATEGORIES= devel MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Haskell library for the Microsoft Language Server Protocol, data types LICENSE= mit +HASKELL_UNRESTRICT_DEPENDENCIES+= \ + aeson + +# Don't build or install the executable "generator". +SUBST_CLASSES+= exe +SUBST_STAGE.exe= post-extract +SUBST_FILES.exe= lsp-types.cabal +SUBST_SED.exe= -e '/^executable generator/a\${.newline} buildable: False' + +# lib:lsp-types .include "../../converters/hs-aeson/buildlink3.mk" .include "../../devel/hs-data-default/buildlink3.mk" .include "../../textproc/hs-Diff/buildlink3.mk" .include "../../devel/hs-dlist/buildlink3.mk" .include "../../devel/hs-hashable/buildlink3.mk" +.include "../../devel/hs-indexed-traversable/buildlink3.mk" +.include "../../devel/hs-indexed-traversable-instances/buildlink3.mk" .include "../../devel/hs-lens/buildlink3.mk" +.include "../../converters/hs-lens-aeson/buildlink3.mk" .include "../../math/hs-mod/buildlink3.mk" .include "../../net/hs-network-uri/buildlink3.mk" +.include "../../textproc/hs-prettyprinter/buildlink3.mk" +.include "../../devel/hs-row-types/buildlink3.mk" .include "../../devel/hs-safe/buildlink3.mk" -.include "../../math/hs-scientific/buildlink3.mk" .include "../../devel/hs-some/buildlink3.mk" .include "../../devel/hs-unordered-containers/buildlink3.mk" + +# lib:metamodel +.include "../../devel/hs-file-embed/buildlink3.mk" + .include "../../mk/haskell.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/hs-lsp-types/buildlink3.mk diff -u pkgsrc/devel/hs-lsp-types/buildlink3.mk:1.6 pkgsrc/devel/hs-lsp-types/buildlink3.mk:1.7 --- pkgsrc/devel/hs-lsp-types/buildlink3.mk:1.6 Mon Oct 9 04:54:22 2023 +++ pkgsrc/devel/hs-lsp-types/buildlink3.mk Tue Oct 31 04:01:39 2023 @@ -1,26 +1,34 @@ -# $NetBSD: buildlink3.mk,v 1.6 2023/10/09 04:54:22 pho Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2023/10/31 04:01:39 pho Exp $ BUILDLINK_TREE+= hs-lsp-types .if !defined(HS_LSP_TYPES_BUILDLINK3_MK) HS_LSP_TYPES_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.hs-lsp-types+= hs-lsp-types>=1.6.0 -BUILDLINK_ABI_DEPENDS.hs-lsp-types+= hs-lsp-types>=1.6.0.0nb2 +BUILDLINK_API_DEPENDS.hs-lsp-types+= hs-lsp-types>=2.0.2 +BUILDLINK_ABI_DEPENDS.hs-lsp-types+= hs-lsp-types>=2.0.2.0 BUILDLINK_PKGSRCDIR.hs-lsp-types?= ../../devel/hs-lsp-types +# lib:lsp-types .include "../../converters/hs-aeson/buildlink3.mk" .include "../../devel/hs-data-default/buildlink3.mk" .include "../../textproc/hs-Diff/buildlink3.mk" .include "../../devel/hs-dlist/buildlink3.mk" .include "../../devel/hs-hashable/buildlink3.mk" +.include "../../devel/hs-indexed-traversable/buildlink3.mk" +.include "../../devel/hs-indexed-traversable-instances/buildlink3.mk" .include "../../devel/hs-lens/buildlink3.mk" +.include "../../converters/hs-lens-aeson/buildlink3.mk" .include "../../math/hs-mod/buildlink3.mk" .include "../../net/hs-network-uri/buildlink3.mk" +.include "../../textproc/hs-prettyprinter/buildlink3.mk" +.include "../../devel/hs-row-types/buildlink3.mk" .include "../../devel/hs-safe/buildlink3.mk" -.include "../../math/hs-scientific/buildlink3.mk" .include "../../devel/hs-some/buildlink3.mk" .include "../../devel/hs-unordered-containers/buildlink3.mk" + +# lib:metamodel +.include "../../devel/hs-file-embed/buildlink3.mk" .endif # HS_LSP_TYPES_BUILDLINK3_MK BUILDLINK_TREE+= -hs-lsp-types Index: pkgsrc/devel/hs-lsp-types/distinfo diff -u pkgsrc/devel/hs-lsp-types/distinfo:1.2 pkgsrc/devel/hs-lsp-types/distinfo:1.3 --- pkgsrc/devel/hs-lsp-types/distinfo:1.2 Mon Jan 30 03:01:38 2023 +++ pkgsrc/devel/hs-lsp-types/distinfo Tue Oct 31 04:01:39 2023 @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.2 2023/01/30 03:01:38 pho Exp $ +$NetBSD: distinfo,v 1.3 2023/10/31 04:01:39 pho Exp $ -BLAKE2s (lsp-types-1.6.0.0.tar.gz) = 1346176c70bacba175dbcae15df098acac1e43da3479150d27004d1764f6b161 -SHA512 (lsp-types-1.6.0.0.tar.gz) = eeedc906b3711fdb37668b97ff47843272858605c377656c792a224d57925b42028877e1b8edf4781e71aa50d571bef0ecd1c741c80bbd8bb8a3f7f1a175c5b0 -Size (lsp-types-1.6.0.0.tar.gz) = 76904 bytes +BLAKE2s (lsp-types-2.0.2.0.tar.gz) = 7e2947b704a0feeb06a18940ad198e3ed2d9cf760af5d24f2490251a455df051 +SHA512 (lsp-types-2.0.2.0.tar.gz) = f6c14efddd2d514edc52c033182a8d659f197002538189936050d42d7dde62f5351efe315d939443e45a061296af6c46cae550038e537fda41019903755fdd4f +Size (lsp-types-2.0.2.0.tar.gz) = 219603 bytes +SHA1 (patch-src_Language_LSP_Protocol_Types_Common.hs) = 83cb285a4bce4a141099a9243f76cfbd744bf43c Added files: Index: pkgsrc/devel/hs-lsp-types/patches/patch-src_Language_LSP_Protocol_Types_Common.hs diff -u /dev/null pkgsrc/devel/hs-lsp-types/patches/patch-src_Language_LSP_Protocol_Types_Common.hs:1.1 --- /dev/null Tue Oct 31 04:01:39 2023 +++ pkgsrc/devel/hs-lsp-types/patches/patch-src_Language_LSP_Protocol_Types_Common.hs Tue Oct 31 04:01:39 2023 @@ -0,0 +1,15 @@ +$NetBSD: patch-src_Language_LSP_Protocol_Types_Common.hs,v 1.1 2023/10/31 04:01:39 pho Exp $ + +Fix build with aeson-2.2 + +--- src/Language/LSP/Protocol/Types/Common.hs.orig 2023-10-31 03:52:25.874104652 +0000 ++++ src/Language/LSP/Protocol/Types/Common.hs +@@ -175,7 +175,7 @@ instance Semigroup s => Semigroup (s |? + -- We use String so we can use fromString on it to get a key that works + -- in both aeson-1 and aeson-2 + -- | Include a value in an JSON object optionally, omitting it if it is 'Nothing'. +-(.=?) :: (J.KeyValue kv, J.ToJSON v) => String -> Maybe v -> [kv] ++(.=?) :: (J.KeyValue e kv, J.ToJSON v) => String -> Maybe v -> [kv] + k .=? v = case v of + Just v' -> [fromString k J..= v'] + Nothing -> mempty --_----------=_1698724900191480--