:up_arrow: Use OCaml 5.3.0

React-Analysis · Dec 20, 2024 · 9f78c90 · 9f78c90
1 parent d264799
commit 9f78c90
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 13 deletions.
diff --git a/dune-project b/dune-project
@@ -25,7 +25,7 @@
   ocaml
   dune
   (ocaml-base-compiler
-   (= 5.2.0))
+   (= 5.3.0~beta2))
   base
   js_of_ocaml
   js_of_ocaml-ppx

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -20,14 +20,17 @@
         pkgs = nixpkgs.legacyPackages.${system};
         on = opam-nix.lib.${system};
         devPackagesQuery = {
-          ocaml-lsp-server = "*";
-          ocamlformat = "*";
+          ocaml-lsp-server = "1.20.0~5.3preview";
+          ocamlformat = "0.27.0";
           utop = "*";
         };
         query = devPackagesQuery // {
           ocaml-base-compiler = "*";
         };
-        scope = on.buildDuneProject { resolveArgs.with-test = true; } package ./. query;
+        scope = on.buildDuneProject {
+          # resolveArgs.with-test = true;
+          resolveArgs.env.enable-ocaml-beta-repository = true;
+        } package ./. query;
         overlay = final: prev: {
           ${package} = prev.${package}.overrideAttrs (_: {
             # Prevent the ocaml dependencies from leaking into dependent environments

diff --git a/react_trace.opam b/react_trace.opam
@@ -11,7 +11,7 @@ bug-reports: "https://github.com/React-Analysis/ReacttRace/issues"
 depends: [
   "ocaml"
   "dune" {>= "3.15"}
-  "ocaml-base-compiler" {= "5.2.0"}
+  "ocaml-base-compiler" {= "5.3.0~beta2"}
   "base"
   "js_of_ocaml"
   "js_of_ocaml-ppx"
@@ -42,7 +42,8 @@ build: [
 ]
 dev-repo: "git+https://github.com/React-Analysis/ReacttRace.git"
 pin-depends: [
-  [ "flow_parser.0.239.1" "git+https://github.com/facebook/flow#5d1b246a1ac8a8fc4e431b835ab8fb7f6f5ebd30" ]
+  [ "ppxlib.0.33.1~5.3preview" "git+https://github.com/ocaml-ppx/ppxlib#218347c59cb93e463f33f06801bd61cf47f46265" ]
+  [ "flow_parser.0.257.0" "git+https://github.com/Zeta611/flow#52bf15978715a096119d422145b1bb9f32a06804" ]
   [ "printbox.0.11" "git+https://github.com/c-cube/printbox#d49d9520e7d9e96121c13643cd3eaf8876389205" ]
   [ "printbox-text.0.11" "git+https://github.com/c-cube/printbox#d49d9520e7d9e96121c13643cd3eaf8876389205" ]
 ]
diff --git a/react_trace.opam.template b/react_trace.opam.template
@@ -1,5 +1,6 @@
 pin-depends: [
-  [ "flow_parser.0.239.1" "git+https://github.com/facebook/flow#5d1b246a1ac8a8fc4e431b835ab8fb7f6f5ebd30" ]
+  [ "ppxlib.0.33.1~5.3preview" "git+https://github.com/ocaml-ppx/ppxlib#218347c59cb93e463f33f06801bd61cf47f46265" ]
+  [ "flow_parser.0.257.0" "git+https://github.com/Zeta611/flow#52bf15978715a096119d422145b1bb9f32a06804" ]
   [ "printbox.0.11" "git+https://github.com/c-cube/printbox#d49d9520e7d9e96121c13643cd3eaf8876389205" ]
   [ "printbox-text.0.11" "git+https://github.com/c-cube/printbox#d49d9520e7d9e96121c13643cd3eaf8876389205" ]
 ]