feat: upgrade to the OCaml 5.1.1 branch

.github/workflows/opam-build.yml

@@ -25,7 +25,7 @@ jobs:
           - ubuntu-latest
           # - windows-latest # for some reason windows build is not picking dune 3.5
         ocaml-compiler:
-          - 5.1.x
+          - ocaml-variants.5.1.1+trunk
 
     runs-on: ${{ matrix.os }}
 

Changes.md

@@ -63,6 +63,8 @@ Unreleased
   [#929](https://github.com/melange-re/melange/pull/929)
 - BREAKING(runtime): Remove `Js.null_undefined` in favor of `Js.nullable`
   ([#930](https://github.com/melange-re/melange/pull/930))
+- BREAKING(core): require OCaml 5.1.1
+  ([#926](https://github.com/melange-re/melange/pull/926))
 
 2.1.0 2023-10-22
 ---------------

Makefile

@@ -29,6 +29,10 @@ opam-create-switch: ## Create opam switch
 
 .PHONY: opam-install-test
 opam-install-test: ## Install test dependencies
+	opam pin add js_of_ocaml-compiler --dev-repo -y
+	opam pin add js_of_ocaml --dev-repo -y
+	opam pin add merlin-lib git+https://github.com/voodoos/merlin#5.1.1-upgrade
+	opam pin add merlin git+https://github.com/voodoos/merlin#5.1.1-upgrade
 	opam pin add melange.dev . --with-test -y
 	opam pin add melange-playground.dev . --with-test -y
 

flake.nix

@@ -26,7 +26,16 @@
     } // (flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = nixpkgs.legacyPackages."${system}".extend (self: super: {
-          ocamlPackages = super.ocaml-ng.ocamlPackages_5_1;
+          ocamlPackages = super.ocaml-ng.ocamlPackages_5_1.overrideScope' (oself: osuper: {
+            ocaml = osuper.ocaml.overrideAttrs (_: {
+              src = super.fetchFromGitHub {
+                owner = "ocaml";
+                repo = "ocaml";
+                rev = "35fdd0226e2e05a1a8244ecfec780b563b23b59c";
+                hash = "sha256-SkxZhodkU5RBSaJ+p1NI/EtVEvHT1cOW8vks4Nf11tA=";
+              };
+            });
+          });
         });
 
         packages =

nix/ci/test.nix

@@ -12,13 +12,23 @@ let
   nix-filter-src = findFlakeSrc { name = "nix-filter"; };
   melange-compiler-libs-src = findFlakeSrc {
     name = "melange-compiler-libs";
+    allRefs = true;
   };
   nix-filter = import "${nix-filter-src}";
 
   pkgs = import src {
     extraOverlays = [
       (self: super: {
-        ocamlPackages = super.ocaml-ng."ocamlPackages_${ocamlVersion}";
+        ocamlPackages = super.ocaml-ng."ocamlPackages_${ocamlVersion}".overrideScope' (oself: osuper: {
+          ocaml = osuper.ocaml.overrideAttrs (_: {
+            src = super.fetchFromGitHub {
+              owner = "ocaml";
+              repo = "ocaml";
+              rev = "35fdd0226e2e05a1a8244ecfec780b563b23b59c";
+              hash = "sha256-SkxZhodkU5RBSaJ+p1NI/EtVEvHT1cOW8vks4Nf11tA=";
+            };
+          });
+        });
       })
     ];
   };