From 20c8131fc6de3c0050636fda9178520f460f775c Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <me@rgrinberg.com>
Date: Wed, 14 Oct 2020 16:25:10 -0700
Subject: [PATCH 1/2] [new release] ocaml-lsp-server and lsp (1.1.0)

CHANGES:

## Features

- Implement a command to switch between module interfaces and implementations
  (ocaml/ocaml-lsp#254)

## Fixes

- Do not crash on invalid positions (ocaml/ocaml-lsp#248)

- add missing record fields to list of completions (ocaml/ocaml-lsp#253)

- do not offer `destruct` as a code action in interface files (ocaml/ocaml-lsp#255)
---
 packages/lsp/lsp.1.1.0/opam                   | 57 +++++++++++++++++++
 .../ocaml-lsp-server.1.1.0/opam               | 51 +++++++++++++++++
 2 files changed, 108 insertions(+)
 create mode 100644 packages/lsp/lsp.1.1.0/opam
 create mode 100644 packages/ocaml-lsp-server/ocaml-lsp-server.1.1.0/opam

diff --git a/packages/lsp/lsp.1.1.0/opam b/packages/lsp/lsp.1.1.0/opam
new file mode 100644
index 00000000000..57c5167ece3
--- /dev/null
+++ b/packages/lsp/lsp.1.1.0/opam
@@ -0,0 +1,57 @@
+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 <me@rgrinerg.com>"]
+authors: [
+  "Andrey Popp <8mayday@gmail.com>"
+  "Rusty Key <iam@stfoo.ru>"
+  "Louis Roché <louis@louisroche.net>"
+  "Oleksiy Golovko <alexei.golovko@gmail.com>"
+  "Rudi Grinberg <me@rgrinberg.com>"
+  "Sacha Ayoun <sachaayoun@gmail.com>"
+  "cannorin <cannorin@gmail.com>"
+]
+license: "ISC"
+homepage: "https://github.com/ocaml/ocaml-lsp"
+bug-reports: "https://github.com/ocaml/ocaml-lsp/issues"
+depends: [
+  "stdlib-shims"
+  "yojson"
+  "ppx_yojson_conv_lib"
+  "ocaml-syntax-shims"
+  "cppo"
+  "uutf"
+  "csexp"
+  "menhir" {with-test}
+  "cinaps" {with-test}
+  "ppx_expect" {with-test & >= "v0.14.0"}
+  "ocaml" {>= "4.06"}
+  "dune" {>= "2.0"}
+]
+dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git"
+build: [
+  ["dune" "subst"] {pinned}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@doc" {with-doc}
+  ]
+]
+x-commit-hash: "fee074471b2c345f7e42c6ed3482363279d4f32c"
+url {
+  src:
+    "https://github.com/ocaml/ocaml-lsp/releases/download/1.1.0/ocaml-lsp-server-1.1.0.tbz"
+  checksum: [
+    "sha256=fa0ca1d3c5c3377f798c221381228a65e8f49fece42715d279ebe91f2f4f74c8"
+    "sha512=c00ad47478a4ddfebe3798895700d2bececa29a610c7757619f47a5b90ede921afa56efc776df3a1c4a8b2f082898423a5806d00c041dae137da1b57ee487a9b"
+  ]
+}
diff --git a/packages/ocaml-lsp-server/ocaml-lsp-server.1.1.0/opam b/packages/ocaml-lsp-server/ocaml-lsp-server.1.1.0/opam
new file mode 100644
index 00000000000..89ab61fcf55
--- /dev/null
+++ b/packages/ocaml-lsp-server/ocaml-lsp-server.1.1.0/opam
@@ -0,0 +1,51 @@
+opam-version: "2.0"
+synopsis: "LSP Server for OCaml"
+description: "An LSP server for OCaml."
+maintainer: ["Rudi Grinberg <me@rgrinerg.com>"]
+authors: [
+  "Andrey Popp <8mayday@gmail.com>"
+  "Rusty Key <iam@stfoo.ru>"
+  "Louis Roché <louis@louisroche.net>"
+  "Oleksiy Golovko <alexei.golovko@gmail.com>"
+  "Rudi Grinberg <me@rgrinberg.com>"
+  "Sacha Ayoun <sachaayoun@gmail.com>"
+  "cannorin <cannorin@gmail.com>"
+]
+license: "ISC"
+homepage: "https://github.com/ocaml/ocaml-lsp"
+bug-reports: "https://github.com/ocaml/ocaml-lsp/issues"
+depends: [
+  "yojson"
+  "stdlib-shims"
+  "menhir"
+  "ppx_yojson_conv_lib"
+  "dune-build-info"
+  "csexp" {>= "1.2.3"}
+  "result" {>= "1.5"}
+  "ocamlformat" {with-test}
+  "reason" {with-test}
+  "ocamlfind" {>= "1.5.2"}
+  "ocaml" {>= "4.06"}
+  "dune" {>= "2.5.0"}
+]
+dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git"
+build: [
+  ["dune" "subst"] {pinned}
+  [
+    "dune"
+    "build"
+    "-j"
+    jobs
+    "ocaml-lsp-server.install"
+    "--release"
+  ]
+]
+x-commit-hash: "fee074471b2c345f7e42c6ed3482363279d4f32c"
+url {
+  src:
+    "https://github.com/ocaml/ocaml-lsp/releases/download/1.1.0/ocaml-lsp-server-1.1.0.tbz"
+  checksum: [
+    "sha256=fa0ca1d3c5c3377f798c221381228a65e8f49fece42715d279ebe91f2f4f74c8"
+    "sha512=c00ad47478a4ddfebe3798895700d2bececa29a610c7757619f47a5b90ede921afa56efc776df3a1c4a8b2f082898423a5806d00c041dae137da1b57ee487a9b"
+  ]
+}

From e284bc04aa931e52a48a02f4e412eb4a1eb38d6b Mon Sep 17 00:00:00 2001
From: Kate <kit.ty.kate@disroot.org>
Date: Thu, 15 Oct 2020 23:17:10 +0100
Subject: [PATCH 2/2] lsp.1.1.0: Fix dune dependency constraint

---
 packages/lsp/lsp.1.1.0/opam | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/lsp/lsp.1.1.0/opam b/packages/lsp/lsp.1.1.0/opam
index 57c5167ece3..47802feab56 100644
--- a/packages/lsp/lsp.1.1.0/opam
+++ b/packages/lsp/lsp.1.1.0/opam
@@ -30,7 +30,7 @@ depends: [
   "cinaps" {with-test}
   "ppx_expect" {with-test & >= "v0.14.0"}
   "ocaml" {>= "4.06"}
-  "dune" {>= "2.0"}
+  "dune" {>= "2.5"}
 ]
 dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git"
 build: [