Merge pull request #1769 from Julow/nix-ocaml-52

nix: Build with OCaml 5.2
ocaml · May 17, 2024 · 4fccc83 · 4fccc83
2 parents 6b5fe77 + 2ac4c23
commit 4fccc83
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 37 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -11,42 +11,43 @@
   outputs = { self, nixpkgs, flake-utils, menhir-repository }:
     flake-utils.lib.eachDefaultSystem (system:
       let
-        pkgs = nixpkgs.legacyPackages."${system}".extend (_: super: {
-          ocamlPackages = super.ocamlPackages.overrideScope' (_: osuper: {
+        pkgs = nixpkgs.legacyPackages."${system}";
+
+        # Build with OCaml 5.2
+        ocamlPackages = pkgs.ocaml-ng.ocamlPackages_5_2.overrideScope'
+          (_: osuper: {
+            # Override menhirLib to the pinned version
             menhirLib = osuper.menhirLib.overrideAttrs (_: {
               version = "20201216";
               src = menhir-repository;
             });
+
+            inherit (packages) merlin-lib dot-merlin-reader merlin;
           });
-        });
-        inherit (pkgs.ocamlPackages) buildDunePackage;
-      in
-      rec {
+
+        inherit (ocamlPackages) buildDunePackage;
+
         packages = rec {
           default = merlin;
           merlin-lib = buildDunePackage {
             pname = "merlin-lib";
             version = "dev";
             src = ./.;
             duneVersion = "3";
-            propagatedBuildInputs = with pkgs.ocamlPackages; [
-              csexp
-            ];
+            propagatedBuildInputs = with ocamlPackages; [ csexp ];
             doCheck = true;
           };
+
           dot-merlin-reader = buildDunePackage {
             pname = "dot-merlin-reader";
             version = "dev";
             src = ./.;
             duneVersion = "3";
-            propagatedBuildInputs = [
-              pkgs.ocamlPackages.findlib
-            ];
-            buildInputs = [
-              merlin-lib
-            ];
+            propagatedBuildInputs = [ ocamlPackages.findlib ];
+            buildInputs = [ merlin-lib ];
             doCheck = true;
           };
+
           merlin = buildDunePackage {
             pname = "merlin";
             version = "dev";
@@ -55,33 +56,29 @@
             buildInputs = [
               merlin-lib
               dot-merlin-reader
-              pkgs.ocamlPackages.menhirLib
-              pkgs.ocamlPackages.menhirSdk
-              pkgs.ocamlPackages.yojson
-            ];
-            nativeBuildInputs = [
-              pkgs.ocamlPackages.menhir
-              pkgs.jq
+              ocamlPackages.menhirLib
+              ocamlPackages.menhirSdk
+              ocamlPackages.yojson
             ];
+            nativeBuildInputs = [ ocamlPackages.menhir pkgs.jq ];
             nativeCheckInputs = [ dot-merlin-reader ];
-            checkInputs = with pkgs.ocamlPackages; [
-              ppxlib
-            ];
+            checkInputs = with ocamlPackages; [ ppxlib ];
             doCheck = true;
             checkPhase = ''
               runHook preCheck
               patchShebangs tests/merlin-wrapper
               dune build @check @runtest
               runHook postCheck
-           '';
-            meta = with pkgs; {
-              mainProgram = "ocamlmerlin";
-            };
+            '';
+            meta = with pkgs; { mainProgram = "ocamlmerlin"; };
           };
         };
+      in {
+        inherit packages;
+
         devShells.default = pkgs.mkShell {
           inputsFrom = pkgs.lib.attrValues packages;
-          buildInputs = with pkgs.ocamlPackages; [ ocaml-lsp ];
+          buildInputs = with ocamlPackages; [ merlin ];
         };
       });
 }
diff --git a/tests/test-dirs/inconsistent-assumptions.t b/tests/test-dirs/inconsistent-assumptions.t
@@ -66,13 +66,10 @@ Do an update that breaks the build:
   $ cd _build
   $ $OCAMLC -c -w @a-40-41-42-49-70 -short-paths -open My_lib__ -o my_lib__Import import.ml
   $ $OCAMLC -c -w @a-40-41-42-49-70 -short-paths -open My_lib__ -o my_lib__Bar bar.ml
-  $ $OCAMLC -c -w @a-40-41-42-49-70 -short-paths -open My_lib__ -o my_lib__Foo foo.ml
+  $ $OCAMLC -c -w @a-40-41-42-49-70 -short-paths -open My_lib__ -o my_lib__Foo foo.ml 2>&1 | head -n 3
   File "foo.ml", line 4, characters 11-12:
   4 | let x, _ = x + 1, Bar.b
                  ^
-  Error: This expression has type char but an expression was expected of type
-           int
-  [2]
   $ cd ..
 
 Go to the file, and ask merlin to move you to the error: