From 0e93175a07cd73d3433ed9812a7b130e69127c1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulysse=20G=C3=A9rard?= Date: Sat, 20 Dec 2025 11:19:43 +0100 Subject: [PATCH 1/2] [new release] lsp (3 packages) (1.25.0) CHANGES: ## Features - Make `code-lens` for nested let bindings configurable (ocaml/ocaml-lsp#1567) - Add support for `.mlx` files, including formatting via `ocamlformat-mlx` and most OCaml LSP features (diagnostics, code actions, hover, etc.) (ocaml/ocaml-lsp#1528) - Add `typeExpression` custom request (ocaml/ocaml-lsp#1576) - Add `locate` custom request (ocaml/ocaml-lsp#1576) - Add `phrase` custom request (ocaml/ocaml-lsp#1576) ## Fixes - Improve precision of collected metrics timestamps. (ocaml/ocaml-lsp#1565) - Fallback on `.merlin` configuration if no `dune-project` file is found and if `dot-merlin-reader` is installed. (ocaml/ocaml-lsp#1563, fixes ocaml/ocaml-lsp#1522) --- packages/jsonrpc/jsonrpc.1.25.0/opam | 50 +++++++++++++ packages/lsp/lsp.1.25.0/opam | 60 +++++++++++++++ .../ocaml-lsp-server.1.25.0/opam | 75 +++++++++++++++++++ 3 files changed, 185 insertions(+) create mode 100644 packages/jsonrpc/jsonrpc.1.25.0/opam create mode 100644 packages/lsp/lsp.1.25.0/opam create mode 100644 packages/ocaml-lsp-server/ocaml-lsp-server.1.25.0/opam diff --git a/packages/jsonrpc/jsonrpc.1.25.0/opam b/packages/jsonrpc/jsonrpc.1.25.0/opam new file mode 100644 index 000000000000..5ebcfd05b5e8 --- /dev/null +++ b/packages/jsonrpc/jsonrpc.1.25.0/opam @@ -0,0 +1,50 @@ +opam-version: "2.0" +synopsis: "Jsonrpc protocol implementation" +description: "See https://www.jsonrpc.org/specification" +maintainer: ["Rudi Grinberg "] +authors: [ + "Andrey Popp <8mayday@gmail.com>" + "Rusty Key " + "Louis Roché " + "Oleksiy Golovko " + "Rudi Grinberg " + "Sacha Ayoun " + "cannorin " + "Ulugbek Abdullaev " + "Thibaut Mattio " + "Max Lantas " +] +license: "ISC" +homepage: "https://github.com/ocaml/ocaml-lsp" +bug-reports: "https://github.com/ocaml/ocaml-lsp/issues" +depends: [ + "dune" {>= "3.0"} + "yojson" + "ocaml" {>= "4.08"} + "odoc" {with-doc} +] +dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git" +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@doc" {with-doc} + ] +] + +x-maintenance-intent: [ "(latest)" ] +url { + src: + "https://github.com/ocaml/ocaml-lsp/releases/download/1.25.0/lsp-1.25.0.tbz" + checksum: [ + "sha256=e315d2bef3f89709ad2570846927996e54ff8dafce251188816ab97cef21f020" + "sha512=dade6239e6fc2e21a1ad5585126f1f444bb6c76af1ce1c0649460eba695297c6e2ecbd5788618b9062274397a301c79c2698107108764b1d122f2cbf05758f34" + ] +} +x-commit-hash: "41f0b8ebb0f8359bc132cf749055bde5325315a6" diff --git a/packages/lsp/lsp.1.25.0/opam b/packages/lsp/lsp.1.25.0/opam new file mode 100644 index 000000000000..63b638cba696 --- /dev/null +++ b/packages/lsp/lsp.1.25.0/opam @@ -0,0 +1,60 @@ +opam-version: "2.0" +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. +""" +maintainer: ["Rudi Grinberg "] +authors: [ + "Andrey Popp <8mayday@gmail.com>" + "Rusty Key " + "Louis Roché " + "Oleksiy Golovko " + "Rudi Grinberg " + "Sacha Ayoun " + "cannorin " + "Ulugbek Abdullaev " + "Thibaut Mattio " + "Max Lantas " +] +license: "ISC" +homepage: "https://github.com/ocaml/ocaml-lsp" +bug-reports: "https://github.com/ocaml/ocaml-lsp/issues" +depends: [ + "dune" {>= "3.0"} + "jsonrpc" {= version} + "yojson" + "ppx_yojson_conv_lib" {>= "v0.14"} + "cinaps" {with-test} + "ppx_expect" {>= "v0.17.0" & with-test} + "uutf" {>= "1.0.2"} + "odoc" {with-doc} + "ocaml" {>= "4.14"} + "ppx_yojson_conv" {with-dev-setup} +] +dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git" +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@doc" {with-doc} + ] +] + +x-maintenance-intent: [ "(latest)" ] +url { + src: + "https://github.com/ocaml/ocaml-lsp/releases/download/1.25.0/lsp-1.25.0.tbz" + checksum: [ + "sha256=e315d2bef3f89709ad2570846927996e54ff8dafce251188816ab97cef21f020" + "sha512=dade6239e6fc2e21a1ad5585126f1f444bb6c76af1ce1c0649460eba695297c6e2ecbd5788618b9062274397a301c79c2698107108764b1d122f2cbf05758f34" + ] +} +x-commit-hash: "41f0b8ebb0f8359bc132cf749055bde5325315a6" diff --git a/packages/ocaml-lsp-server/ocaml-lsp-server.1.25.0/opam b/packages/ocaml-lsp-server/ocaml-lsp-server.1.25.0/opam new file mode 100644 index 000000000000..9f53f9031638 --- /dev/null +++ b/packages/ocaml-lsp-server/ocaml-lsp-server.1.25.0/opam @@ -0,0 +1,75 @@ +opam-version: "2.0" +synopsis: "LSP Server for OCaml" +description: "An LSP server for OCaml." +maintainer: ["Rudi Grinberg "] +authors: [ + "Andrey Popp <8mayday@gmail.com>" + "Rusty Key " + "Louis Roché " + "Oleksiy Golovko " + "Rudi Grinberg " + "Sacha Ayoun " + "cannorin " + "Ulugbek Abdullaev " + "Thibaut Mattio " + "Max Lantas " +] +license: "ISC" +homepage: "https://github.com/ocaml/ocaml-lsp" +bug-reports: "https://github.com/ocaml/ocaml-lsp/issues" +depends: [ + "dune" {>= "3.0"} + "yojson" + "base" {>= "v0.16.0"} + "lsp" {= version} + "jsonrpc" {= version} + "re" {>= "1.5.0"} + "ppx_yojson_conv_lib" {>= "v0.14"} + "dune-rpc" {>= "3.4.0"} + "chrome-trace" {>= "3.3.0"} + "dyn" + "stdune" + "fiber" {>= "3.1.1" & < "4.0.0"} + "ocaml" {>= "5.4" & < "5.5"} + "xdg" + "ordering" + "dune-build-info" + "spawn" + "astring" + "camlp-streams" + "ppx_expect" {>= "v0.17.0" & with-test} + "ocamlformat" {with-test & = "0.28.1"} + "ocamlc-loc" {>= "3.7.0"} + "pp" {>= "1.1.2"} + "csexp" {>= "1.5"} + "ocamlformat-rpc-lib" {>= "0.21.0"} + "odoc" {with-doc} + "merlin-lib" {>= "5.6" & < "5.7"} + "ocaml-index" {post} + "ppx_yojson_conv" {with-dev-setup} +] +dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git" +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@doc" {with-doc} + ] +] + +x-maintenance-intent: [ "(latest)" ] +url { + src: + "https://github.com/ocaml/ocaml-lsp/releases/download/1.25.0/lsp-1.25.0.tbz" + checksum: [ + "sha256=e315d2bef3f89709ad2570846927996e54ff8dafce251188816ab97cef21f020" + "sha512=dade6239e6fc2e21a1ad5585126f1f444bb6c76af1ce1c0649460eba695297c6e2ecbd5788618b9062274397a301c79c2698107108764b1d122f2cbf05758f34" + ] +} +x-commit-hash: "41f0b8ebb0f8359bc132cf749055bde5325315a6" From 5403989a7bca10a0de2667ee486b84e6617ac96d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulysse=20G=C3=A9rard?= Date: Sat, 20 Dec 2025 14:27:56 +0100 Subject: [PATCH 2/2] Add yojson lower bound to jsonrpc package --- packages/jsonrpc/jsonrpc.1.25.0/opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/jsonrpc/jsonrpc.1.25.0/opam b/packages/jsonrpc/jsonrpc.1.25.0/opam index 5ebcfd05b5e8..02d987f66fea 100644 --- a/packages/jsonrpc/jsonrpc.1.25.0/opam +++ b/packages/jsonrpc/jsonrpc.1.25.0/opam @@ -19,7 +19,7 @@ homepage: "https://github.com/ocaml/ocaml-lsp" bug-reports: "https://github.com/ocaml/ocaml-lsp/issues" depends: [ "dune" {>= "3.0"} - "yojson" + "yojson" {>= "2.0"} "ocaml" {>= "4.08"} "odoc" {with-doc} ]