dune 3.4+ is broken on esy + Windows

grain-lang · Aug 24, 2022 · 7a996a1 · 7a996a1
1 parent a131ae5
commit 7a996a1
Show file tree

Hide file tree

Showing 12 changed files with 213 additions and 213 deletions.
diff --git a/esy.lock/index.json b/esy.lock/index.json
diff --git a/esy.lock/opam/dune-configurator.3.4.1/opam → esy.lock/opam/dune-configurator.3.3.1/opam b/esy.lock/opam/dune-configurator.3.4.1/opam → esy.lock/opam/dune-configurator.3.3.1/opam
diff --git a/esy.lock/opam/dune-rpc.3.4.1/opam → esy.lock/opam/dune-rpc.3.3.1/opam b/esy.lock/opam/dune-rpc.3.4.1/opam → esy.lock/opam/dune-rpc.3.3.1/opam
diff --git a/esy.lock/opam/dune.3.4.1/opam → esy.lock/opam/dune.3.3.1/opam b/esy.lock/opam/dune.3.4.1/opam → esy.lock/opam/dune.3.3.1/opam
diff --git a/esy.lock/opam/dyn.3.4.1/opam → esy.lock/opam/dyn.3.3.1/opam b/esy.lock/opam/dyn.3.4.1/opam → esy.lock/opam/dyn.3.3.1/opam
diff --git a/esy.lock/opam/fiber.3.4.1/opam → esy.lock/opam/fiber.3.3.1/opam b/esy.lock/opam/fiber.3.4.1/opam → esy.lock/opam/fiber.3.3.1/opam
diff --git a/esy.lock/opam/ocaml-lsp-server.1.13.1/opam → esy.lock/opam/ocaml-lsp-server.1.12.4/opam b/esy.lock/opam/ocaml-lsp-server.1.13.1/opam → esy.lock/opam/ocaml-lsp-server.1.12.4/opam
diff --git a/esy.lock/opam/ordering.3.4.1/opam → esy.lock/opam/ordering.3.3.1/opam b/esy.lock/opam/ordering.3.4.1/opam → esy.lock/opam/ordering.3.3.1/opam
diff --git a/esy.lock/opam/stdune.3.4.1/opam → esy.lock/opam/stdune.3.3.1/opam b/esy.lock/opam/stdune.3.4.1/opam → esy.lock/opam/stdune.3.3.1/opam
diff --git a/esy.lock/opam/xdg.3.4.1/opam → esy.lock/opam/xdg.3.3.1/opam b/esy.lock/opam/xdg.3.4.1/opam → esy.lock/opam/xdg.3.3.1/opam
diff --git a/libbinaryen.opam b/libbinaryen.opam
@@ -13,9 +13,9 @@ build: [
 ]
 depends: [
   "conf-cmake" {build}
-  "dune" {>= "2.9.1"}
-  "dune-configurator" {>= "2.9.1"}
-  "js_of_ocaml-compiler" {with-test & >= "3.10.0"}
+  "dune" {>= "2.9.1" < "3.4.0"}
+  "dune-configurator" {>= "2.9.1" < "3.4.0"}
+  "js_of_ocaml-compiler" {with-test & >= "3.10.0" < "5.0.0"}
   "ocaml" {>= "4.12"}
 ]
 depexts: [

diff --git a/package.json b/package.json
@@ -7,16 +7,18 @@
   "dependencies": {
     "ocaml": ">= 4.12.0",
     "@opam/conf-cmake": "grain-lang/cmake:esy.json#1cead3871bbb27a45adab2263ef2dff4a38a8869",
-    "@opam/dune": ">= 2.9.1",
-    "@opam/dune-configurator": ">= 2.9.1"
+    "@opam/dune": ">= 2.9.1 < 3.4.0",
+    "@opam/dune-configurator": ">= 2.9.1 < 3.4.0"
   },
   "devDependencies": {
     "@opam/js_of_ocaml-compiler": ">= 3.10.0 < 5.0.0",
     "@opam/ocamlformat": "0.24.1",
-    "@opam/ocaml-lsp-server": "^1.13.1"
+    "@opam/ocaml-lsp-server": "> 1.9.1 < 1.13.0"
   },
   "resolutions": {
-    "@opam/ocp-indent": "1.7.0"
+    "@opam/dune-rpc": "3.3.1",
+    "@opam/ocp-indent": "1.7.0",
+    "@opam/xdg": "3.3.1"
   },
   "esy": {
     "build": [