From df85ca228626dacdb3cecdca83f5ee62fc3fa0b6 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Tue, 18 May 2021 10:46:34 -0700 Subject: [PATCH 1/5] [new release] ocaml-lsp-server, lsp and jsonrpc (1.6.1) CHANGES: ## Fixes - Switch `verbosity` from 1 to 0. This is the same default that merlin uses. The old value for verbosity (ocaml/ocaml-lsp#433) - Get fresh diagnostics (warning and error messages) on a file save (ocaml/ocaml-lsp#438) Note: If you want the fresh diagnostics to take into account changes in other files, you likely need to rebuild your project. An easy way to get automatic rebuilds is to run `dune` in a watching mode, e.g.,[dune build --watch]. --- packages/jsonrpc/jsonrpc.1.6.1/opam | 45 ++++++++++++++ packages/lsp/lsp.1.6.1/opam | 58 +++++++++++++++++++ .../ocaml-lsp-server.1.6.1/opam | 50 ++++++++++++++++ 3 files changed, 153 insertions(+) create mode 100644 packages/jsonrpc/jsonrpc.1.6.1/opam create mode 100644 packages/lsp/lsp.1.6.1/opam create mode 100644 packages/ocaml-lsp-server/ocaml-lsp-server.1.6.1/opam diff --git a/packages/jsonrpc/jsonrpc.1.6.1/opam b/packages/jsonrpc/jsonrpc.1.6.1/opam new file mode 100644 index 00000000000..9ea9e05b125 --- /dev/null +++ b/packages/jsonrpc/jsonrpc.1.6.1/opam @@ -0,0 +1,45 @@ +opam-version: "2.0" +synopsis: "Jsonrpc protocol implemenation" +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 " +] +license: "ISC" +homepage: "https://github.com/ocaml/ocaml-lsp" +bug-reports: "https://github.com/ocaml/ocaml-lsp/issues" +depends: [ + "dune" {>= "2.7"} + "ocaml" {>= "4.08"} + "odoc" {with-doc} +] +dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git" +build: [ + ["dune" "subst"] {dev} + ["ocaml" "unix.cma" "unvendor.ml"] + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@doc" {with-doc} + ] +] +x-commit-hash: "e97fa4c6862732926190cf2dd0965ae2705f365d" +url { + src: + "https://github.com/ocaml/ocaml-lsp/releases/download/1.6.1/jsonrpc-1.6.1.tbz" + checksum: [ + "sha256=bccc0d7194714a4c40c362766ad9095d3c58505a1d4f1dc4becd9b3d1bda8209" + "sha512=199bee8c74aec6822bc83bf9a7c3757206bdaa55a19cd1f5cf480127618a078baa1e917f6a90a6135a5277e4eb87977e685c10e6503f546997e6b985949e190f" + ] +} diff --git a/packages/lsp/lsp.1.6.1/opam b/packages/lsp/lsp.1.6.1/opam new file mode 100644 index 00000000000..b915e3038c3 --- /dev/null +++ b/packages/lsp/lsp.1.6.1/opam @@ -0,0 +1,58 @@ +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 " +] +license: "ISC" +homepage: "https://github.com/ocaml/ocaml-lsp" +bug-reports: "https://github.com/ocaml/ocaml-lsp/issues" +depends: [ + "dune" {>= "2.7"} + "jsonrpc" {= version} + "yojson" + "ppx_yojson_conv_lib" + "pp" + "csexp" + "uutf" + "odoc" {with-doc} + "menhir" {with-test} + "cinaps" {with-test} + "ppx_expect" {with-test & >= "v0.14.0"} + "ocaml" {>= "4.08"} +] +dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git" +build: [ + ["dune" "subst"] {dev} + ["ocaml" "unix.cma" "unvendor.ml"] + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@doc" {with-doc} + ] +] +x-commit-hash: "e97fa4c6862732926190cf2dd0965ae2705f365d" +url { + src: + "https://github.com/ocaml/ocaml-lsp/releases/download/1.6.1/jsonrpc-1.6.1.tbz" + checksum: [ + "sha256=bccc0d7194714a4c40c362766ad9095d3c58505a1d4f1dc4becd9b3d1bda8209" + "sha512=199bee8c74aec6822bc83bf9a7c3757206bdaa55a19cd1f5cf480127618a078baa1e917f6a90a6135a5277e4eb87977e685c10e6503f546997e6b985949e190f" + ] +} diff --git a/packages/ocaml-lsp-server/ocaml-lsp-server.1.6.1/opam b/packages/ocaml-lsp-server/ocaml-lsp-server.1.6.1/opam new file mode 100644 index 00000000000..fd30474d1a4 --- /dev/null +++ b/packages/ocaml-lsp-server/ocaml-lsp-server.1.6.1/opam @@ -0,0 +1,50 @@ +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 " +] +license: "ISC" +homepage: "https://github.com/ocaml/ocaml-lsp" +bug-reports: "https://github.com/ocaml/ocaml-lsp/issues" +depends: [ + "dune" {>= "2.7"} + "yojson" + "ppx_yojson_conv_lib" + "dune-build-info" + "dot-merlin-reader" + "pp" + "csexp" {>= "1.2.3"} + "result" {>= "1.5"} + "ocamlformat" {with-test} + "odoc" {with-doc} + "ocaml" {>= "4.12" & < "4.13"} +] +dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git" +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-j" + jobs + "ocaml-lsp-server.install" + "--release" + ] +] +x-commit-hash: "e97fa4c6862732926190cf2dd0965ae2705f365d" +url { + src: + "https://github.com/ocaml/ocaml-lsp/releases/download/1.6.1/jsonrpc-1.6.1.tbz" + checksum: [ + "sha256=bccc0d7194714a4c40c362766ad9095d3c58505a1d4f1dc4becd9b3d1bda8209" + "sha512=199bee8c74aec6822bc83bf9a7c3757206bdaa55a19cd1f5cf480127618a078baa1e917f6a90a6135a5277e4eb87977e685c10e6503f546997e6b985949e190f" + ] +} From c6a30b5e2548fa54387743c0500adfb2807e701d Mon Sep 17 00:00:00 2001 From: Kate Date: Wed, 19 May 2021 20:10:57 +0100 Subject: [PATCH 2/5] lsp*.1.6.1: Fix constraint (uses Csexp.t) --- packages/lsp/lsp.1.6.1/opam | 2 +- packages/ocaml-lsp-server/ocaml-lsp-server.1.6.1/opam | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/lsp/lsp.1.6.1/opam b/packages/lsp/lsp.1.6.1/opam index b915e3038c3..04fd71585ef 100644 --- a/packages/lsp/lsp.1.6.1/opam +++ b/packages/lsp/lsp.1.6.1/opam @@ -24,7 +24,7 @@ depends: [ "yojson" "ppx_yojson_conv_lib" "pp" - "csexp" + "csexp" {>= "1.4.0"} "uutf" "odoc" {with-doc} "menhir" {with-test} diff --git a/packages/ocaml-lsp-server/ocaml-lsp-server.1.6.1/opam b/packages/ocaml-lsp-server/ocaml-lsp-server.1.6.1/opam index fd30474d1a4..62b6afd5e80 100644 --- a/packages/ocaml-lsp-server/ocaml-lsp-server.1.6.1/opam +++ b/packages/ocaml-lsp-server/ocaml-lsp-server.1.6.1/opam @@ -21,7 +21,7 @@ depends: [ "dune-build-info" "dot-merlin-reader" "pp" - "csexp" {>= "1.2.3"} + "csexp" {>= "1.4.0"} "result" {>= "1.5"} "ocamlformat" {with-test} "odoc" {with-doc} From bb6bf546efd4a560f79fae699aeaaf348aa0cb97 Mon Sep 17 00:00:00 2001 From: Kate Date: Wed, 19 May 2021 20:11:37 +0100 Subject: [PATCH 3/5] lsp.1.6.1 requires at least OCaml 4.12 (uses Either) --- packages/lsp/lsp.1.6.1/opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/lsp/lsp.1.6.1/opam b/packages/lsp/lsp.1.6.1/opam index 04fd71585ef..47fe5662438 100644 --- a/packages/lsp/lsp.1.6.1/opam +++ b/packages/lsp/lsp.1.6.1/opam @@ -30,7 +30,7 @@ depends: [ "menhir" {with-test} "cinaps" {with-test} "ppx_expect" {with-test & >= "v0.14.0"} - "ocaml" {>= "4.08"} + "ocaml" {>= "4.12"} ] dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git" build: [ From 3e48ab0cf713e7045d5e1848f9e1d515edfe9b8b Mon Sep 17 00:00:00 2001 From: Kate Date: Wed, 19 May 2021 20:48:00 +0100 Subject: [PATCH 4/5] lsp*.1.6.1: Add missing constraint (uses Ppx_yojson_conv_lib.Option) --- packages/lsp/lsp.1.6.1/opam | 2 +- packages/ocaml-lsp-server/ocaml-lsp-server.1.6.1/opam | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/lsp/lsp.1.6.1/opam b/packages/lsp/lsp.1.6.1/opam index 47fe5662438..02be7058e18 100644 --- a/packages/lsp/lsp.1.6.1/opam +++ b/packages/lsp/lsp.1.6.1/opam @@ -22,7 +22,7 @@ depends: [ "dune" {>= "2.7"} "jsonrpc" {= version} "yojson" - "ppx_yojson_conv_lib" + "ppx_yojson_conv_lib" {>= "v0.14.0"} "pp" "csexp" {>= "1.4.0"} "uutf" diff --git a/packages/ocaml-lsp-server/ocaml-lsp-server.1.6.1/opam b/packages/ocaml-lsp-server/ocaml-lsp-server.1.6.1/opam index 62b6afd5e80..8a07fe744fa 100644 --- a/packages/ocaml-lsp-server/ocaml-lsp-server.1.6.1/opam +++ b/packages/ocaml-lsp-server/ocaml-lsp-server.1.6.1/opam @@ -17,7 +17,7 @@ bug-reports: "https://github.com/ocaml/ocaml-lsp/issues" depends: [ "dune" {>= "2.7"} "yojson" - "ppx_yojson_conv_lib" + "ppx_yojson_conv_lib" {>= "v0.14.0"} "dune-build-info" "dot-merlin-reader" "pp" From 2ef7a86b230bebb0f1a6de2d977455b474472216 Mon Sep 17 00:00:00 2001 From: Kate Date: Wed, 19 May 2021 21:42:27 +0100 Subject: [PATCH 5/5] ocaml-lsp-server.1.6.1: Add missing constraint (uses Pp.Ast through the vendored Stdune.Pp.Ast) --- packages/ocaml-lsp-server/ocaml-lsp-server.1.6.1/opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ocaml-lsp-server/ocaml-lsp-server.1.6.1/opam b/packages/ocaml-lsp-server/ocaml-lsp-server.1.6.1/opam index 8a07fe744fa..69a46eb77bc 100644 --- a/packages/ocaml-lsp-server/ocaml-lsp-server.1.6.1/opam +++ b/packages/ocaml-lsp-server/ocaml-lsp-server.1.6.1/opam @@ -20,7 +20,7 @@ depends: [ "ppx_yojson_conv_lib" {>= "v0.14.0"} "dune-build-info" "dot-merlin-reader" - "pp" + "pp" {>= "1.1.2"} "csexp" {>= "1.4.0"} "result" {>= "1.5"} "ocamlformat" {with-test}