Merge pull request #116 from nberth/lwt-constraint

Ensure `lwt` installs properly on windows
OCamlPro · Nov 9, 2023 · a0c0019 · a0c0019
2 parents 74e613f + 2086932
commit a0c0019
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 5 deletions.
diff --git a/.drom b/.drom
diff --git a/dune-project b/dune-project
diff --git a/opam/osx/superbol_free_lib-osx.opam b/opam/osx/superbol_free_lib-osx.opam
@@ -48,6 +48,7 @@ depends: [
   "ocaml" {>= "4.14.0"}
   "dune" {>= "2.8.0"}
   "vscode-json-osx" {= version}
+  "lwt-osx" {>= "5"}
   "ez_toml-osx" {= version}
   "ez_file-osx" {>= "0.3"}
   "ez_cmdliner-osx" {>= "0.3.0" & < "1.0.0"}

diff --git a/opam/superbol_free_lib.opam b/opam/superbol_free_lib.opam
@@ -46,6 +46,7 @@ depends: [
   "ocaml" {>= "4.14.0"}
   "dune" {>= "2.8.0"}
   "vscode-json" {= version}
+  "lwt" {>= "5"}
   "ez_toml" {= version}
   "ez_file" {>= "0.3"}
   "ez_cmdliner" {>= "0.3.0" & < "1.0.0"}

diff --git a/opam/windows/superbol_free_lib-windows.opam b/opam/windows/superbol_free_lib-windows.opam
@@ -48,6 +48,7 @@ depends: [
   "ocaml" {>= "4.14.0"}
   "dune" {>= "2.8.0"}
   "vscode-json-windows" {= version}
+  "lwt-windows" {>= "5"}
   "ez_toml-windows" {= version}
   "ez_file-windows" {>= "0.3"}
   "ez_cmdliner-windows" {>= "0.3.0" & < "1.0.0"}

diff --git a/src/lsp/superbol_free_lib/dune b/src/lsp/superbol_free_lib/dune
diff --git a/src/lsp/superbol_free_lib/package.toml b/src/lsp/superbol_free_lib/package.toml
@@ -64,6 +64,11 @@ vscode-json = "version"
 ez_api = "2.0"
 ez_toml = "version"
 
+# We only depend on `lwt` via `ez_api` (and we don't even use any bit
+# of `lwt` at all).  But we still need to add the following constraint
+# on `lwt` so it installs properly on windows:
+lwt = ">=5"
+
 # package tools dependencies
 [tools]
 # ...