From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id UOemDQ7C82ZYBwEAqHPOHw:P1 (envelope-from ) for ; Wed, 25 Sep 2024 07:55:58 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id UOemDQ7C82ZYBwEAqHPOHw (envelope-from ) for ; Wed, 25 Sep 2024 09:55:58 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=fCMwRI7N; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=NvCFsh5h; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1727250958; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=tuQmK/FhGCFHViAXgLX9qgsWCyGHDovPlK76RZ0n2KM=; b=P2X3JskLuOks8V2xCS7E/bumbfGrIg722kPWjMWswcZCnXc+7WWNaw/sGMLOzdxT31e54h pPki2PIecnIx+l+x1pRpxUULgW86/JY/yVbKEkdzK1lfanoONvuzfYJqxDJW/x/Iw3MXLi QcJzOvhNwKo9mrgFm9XF388ZPU2xAD0yIR88tiT43Ytsta+vtlv623azgOcPSoENQ9mS5V xnmlfG/7i9jMrUut/5QKlgkR/jCDuEB6aAPBAlwhpPIFiD+Ba27Dp+Dtbxpds2t41CXcFM UH1/VBr7rQGcEju8gahS8AWfjzjo/FiMkeu8hVgvy42z5LTedWbA6DpFJp1x7A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=fCMwRI7N; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=NvCFsh5h; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1727250958; a=rsa-sha256; cv=none; b=D7YmcpTAEgMLLyVg0GfQEB05qMwKl9CgC8yB5MtRn9o2qpJTDz6O9BUguh6a7vl4vyS8GR JO317ruTMw/Fj8JPrDq639XBmqhc31pDJP2tqTnsCUEl/kt9oo5a4/fQdJMzoQuX+iat9a OOH7G2js+YzkOtqopGI+bFIIOSh6Iz8VY1bFUROKwfDZzZxk16L92ZIlUaHH1eZiXrz8bT QwqN+JdsjZHgeGmSgoWAGjvaDLTGpIqw9T5FrRLrcITCnD1QUdrSyak2FbYIWaL2VenukP lhlneF6hgXm+IVSY6Asxk0vclyruL6Yuklf1d8MH9lmgRRQM7kKwMNIbixO3vw== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 98CC3286F for ; Wed, 25 Sep 2024 09:55:57 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1stMs7-0003ES-H9; Wed, 25 Sep 2024 03:55:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1stMs5-0003E0-TF for guix-patches@gnu.org; Wed, 25 Sep 2024 03:55:37 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1stMs5-0003Ni-9F for guix-patches@gnu.org; Wed, 25 Sep 2024 03:55:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=tuQmK/FhGCFHViAXgLX9qgsWCyGHDovPlK76RZ0n2KM=; b=fCMwRI7NlttbkdgMc9KyCNT0Oh6E/+ZZ0Ojdf4wqmV8MGfmhWIQ0OECl7Un2HF8mefkLAZ0I2rKOB8t0Rz52OFUEA0aShgjtfbSIQON/AJ1l0kvpBI3wgK4KoPTQlVuZyePccIkRM44aSP6d1xNKN+cLyNrsPCIjpgQCQe2r+8qAOCK48KdZlUjb1ZES4FjU2eQPOvdlQGNepKFmbDDkbqoTAswFPXR4xY3lsGrBzT7FQwKD0/2qaBQkmgcKdcASTT12xfTOkk3jPOhBqFpTCWptt5op2bM/I38G03Q0a4v44qVKV6FbZPca+KVJyRFsWzZ/GrGQwHMXdOGrnaBs2Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1stMsU-0003EX-MH; Wed, 25 Sep 2024 03:56:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73466] [PATCH 01/16] gnu: Add ocaml-jsonrpc. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Wed, 25 Sep 2024 07:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 73466 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73466@debbugs.gnu.org Cc: Julien Lepiller , pukkamustard X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Julien Lepiller , pukkamustard Received: via spool by submit@debbugs.gnu.org id=B.172725092511829 (code B ref -1); Wed, 25 Sep 2024 07:56:02 +0000 Received: (at submit) by debbugs.gnu.org; 25 Sep 2024 07:55:25 +0000 Received: from localhost ([127.0.0.1]:44229 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1stMrs-00034h-Ak for submit@debbugs.gnu.org; Wed, 25 Sep 2024 03:55:24 -0400 Received: from lists.gnu.org ([209.51.188.17]:33692) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1stMrp-00034R-8o for submit@debbugs.gnu.org; Wed, 25 Sep 2024 03:55:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1stMrP-00032s-DF for guix-patches@gnu.org; Wed, 25 Sep 2024 03:54:55 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117] helo=email.rimm.ee) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1stMrN-00037J-3Z for guix-patches@gnu.org; Wed, 25 Sep 2024 03:54:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1727250884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=tuQmK/FhGCFHViAXgLX9qgsWCyGHDovPlK76RZ0n2KM=; b=NvCFsh5h2i7vmgKoCp7n/n8bbDLveFEJm+y6iMmmi25TXFpE/Qu4sqdO5h/Bbskj8BQ+41 84yP2gq4IvFh9IhikDw6kKkhPH8L83NQDhRegelXaplql2oNojDvG7sN/Mq0mi6Az9jvfT 5oNUGDjhlGSI+Jnn1zLt2YgQMUSJ+rSyBiXFz1hWd5uZhHxtfu/91JV8BpK6IegC2e9u+R uyf/xDE2Wn9jIZsl1T0ld4o0GEAkWrNTyHaYY7FE9J2aBxuuo9JjVWLPlyEdw7f6uTX8MV O4nreXIFQ2CjGV3AjJUIl+8R+ncqmoHLr7h7Y/hLVBheOsjo/e+50qOTwNJ5Ow== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 24b516d5 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for ; Wed, 25 Sep 2024 07:54:43 +0000 (UTC) Date: Wed, 25 Sep 2024 09:54:11 +0200 Message-ID: <2a9cc50a22ef14c84d7a5479e10ff42e9efa5ba1.1727250772.git.herman@rimm.ee> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=81.205.150.117; envelope-from=herman@rimm.ee; helo=email.rimm.ee X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_PBL=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, TVD_RCVD_IP=0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches From: Herman Rimm via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -2.31 X-Spam-Score: -2.31 X-Migadu-Queue-Id: 98CC3286F X-Migadu-Scanner: mx10.migadu.com X-TUID: BOTM/AiEvMQB * gnu/packages/ocaml.scm (ocaml-jsonrpc): Add variable. * gnu/packages/patches/ocaml-jsonrpc.patch: Add file. * gnu/local.mk (dist_patch_DATA): Register file. Change-Id: I0486038d2d5936ca462413eca605c356c00d39d7 --- gnu/local.mk | 1 + gnu/packages/ocaml.scm | 42 +++++++++++++++ gnu/packages/patches/ocaml-jsonrpc.patch | 66 ++++++++++++++++++++++++ 3 files changed, 109 insertions(+) create mode 100644 gnu/packages/patches/ocaml-jsonrpc.patch diff --git a/gnu/local.mk b/gnu/local.mk index 795ff822a4..dc139429dd 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1820,6 +1820,7 @@ dist_patch_DATA = \ %D%/packages/patches/nyacc-binary-literals.patch \ %D%/packages/patches/obs-modules-location.patch \ %D%/packages/patches/ocaml-multiple-definitions.patch \ + %D%/packages/patches/ocaml-jsonrpc.patch \ %D%/packages/patches/ocaml-4.07-dynamically-allocate-signal-stack.patch \ %D%/packages/patches/ocaml-4.09-dynamically-allocate-signal-stack.patch \ %D%/packages/patches/ocaml-4.09-multiple-definitions.patch \ diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 6ba5f5e374..e7dcedc939 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -73,6 +73,7 @@ (define-module (gnu packages ocaml) #:use-module (gnu packages maths) #:use-module (gnu packages multiprecision) #:use-module (gnu packages ncurses) + #:use-module (gnu packages networking) #:use-module (gnu packages node) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) @@ -81,6 +82,7 @@ (define-module (gnu packages ocaml) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages rsync) + #:use-module (gnu packages ruby) #:use-module (gnu packages sdl) #:use-module (gnu packages sqlite) #:use-module (gnu packages tex) @@ -3984,6 +3986,46 @@ (define-public ocaml-jsonm without a complete in-memory representation of the data.") (license license:isc))) +(define-public ocaml-jsonrpc + (package + (name "ocaml-jsonrpc") + (version "1.17.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ocaml/ocaml-lsp") + (commit version))) + (file-name (git-file-name name version)) + (modules '((guix build utils))) + (snippet + #~(for-each delete-file-recursively + '("jsonrpc-fiber" + "lsp" + "lsp.opam" + "lsp-fiber" + "ocaml-lsp-server" + "ocaml-lsp-server.opam"))) + (sha256 + (base32 + "1w1m2mi7va3wcwgvgzqd3af6hrhx5zzyr3hqa228pcimp44w6f0h")) + (patches (search-patches "ocaml-jsonrpc.patch")))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-odoc)) + (native-inputs (list dune-stdune + ocaml-dune-build-info + ocaml-ppx-expect + ocaml-ppx-inline-test + ocaml-ppx-yojson-conv-lib + ocaml-uutf + ocaml-yojson)) + (home-page "https://github.com/ocaml/ocaml-lsp") + (synopsis "Jsonrpc protocol implemenation") + (description + "This package provides a JSON-RPC implementation as described in + https://www.jsonrpc.org/specification.") + (license license:isc))) + (define-public ocaml-ocp-indent (package (name "ocaml-ocp-indent") diff --git a/gnu/packages/patches/ocaml-jsonrpc.patch b/gnu/packages/patches/ocaml-jsonrpc.patch new file mode 100644 index 0000000000..1b40f4b90e --- /dev/null +++ b/gnu/packages/patches/ocaml-jsonrpc.patch @@ -0,0 +1,66 @@ +diff --git a/dune-project b/dune-project +index 34c04542..d25da5c8 100644 +--- a/dune-project ++++ b/dune-project +@@ -1,6 +1,6 @@ + (lang dune 3.0) + (using cinaps 1.0) +-(name lsp) ++(name jsonrpc) + + (implicit_transitive_deps false) + +@@ -22,53 +22,6 @@ + + (generate_opam_files true) + +-(package +- (name lsp) +- (synopsis "LSP protocol implementation in OCaml") +- (description " +-Implementation of the LSP protocol in OCaml. It is designed to be as portable as +-possible and does not make any assumptions about IO. +-") +- (depends +- (jsonrpc (= :version)) +- yojson +- (ppx_yojson_conv_lib (>= "v0.14")) +- (cinaps :with-test) +- (ppx_expect (and (>= v0.15.0) :with-test)) +- (uutf (>= 1.0.2)) +- (odoc :with-doc) +- (ocaml (>= 4.14)))) +- +-(package +- (name ocaml-lsp-server) +- (synopsis "LSP Server for OCaml") +- (description "An LSP server for OCaml.") +- (depends +- yojson +- (re (>= 1.5.0)) +- (ppx_yojson_conv_lib (>= "v0.14")) +- (dune-rpc (>= 3.4.0)) +- (chrome-trace (>= 3.3.0)) +- dyn +- stdune +- (fiber (and (>= 3.1.1) (< 4.0.0))) +- xdg +- ordering +- dune-build-info +- spawn +- astring +- camlp-streams +- (ppx_expect (and (>= v0.15.0) :with-test)) +- (ocamlformat (and :with-test (= 0.24.1))) +- (ocamlc-loc (>= 3.7.0)) +- (uutf (>= 1.0.2)) +- (pp (>= 1.1.2)) +- (csexp (>= 1.5)) +- (ocamlformat-rpc-lib (>= 0.21.0)) +- (odoc :with-doc) +- (ocaml (and (>= 4.14) (< 5.2))) +- (merlin-lib (and (>= 4.9) (< 5.0))))) +- + (package + (name jsonrpc) + (synopsis "Jsonrpc protocol implemenation") base-commit: 3ac69c1a757430d6dfdd37eb948ba1d6967967cc -- 2.45.2