Merge branch 'main' into melange/fix-melc-ppx

ocaml · Nov 28, 2022 · c16eec2 · c16eec2
2 parents f2b7a96 + 5a09827
commit c16eec2
Show file tree

Hide file tree

Showing 34 changed files with 543 additions and 189 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,6 +1,9 @@
 Unreleased
 ----------
 
+- Format dune files when they are named `dune-file`. This occurs when we enable
+  the alternative file names project option. (#6566, @rgrinberg)
+
 - Do not shadow library interface modules (#6549, fixes #6545, @rgrinberg)
 
 - Move `$ dune ocaml-merlin -dump-config=$dir` to `$ dune ocaml merlin

diff --git a/Makefile b/Makefile
@@ -23,11 +23,10 @@ ocamlformat.$$(awk -F = '$$1 == "version" {print $$2}' .ocamlformat) \
 "ppx_expect.v0.15.0" \
 ppx_inline_test \
 ppxlib \
-result \
 ctypes \
 "utop>=2.6.0" \
-"melange>=0.3.0" \
-"mel>=0.3.0" \
+"melange>=0.3.1" \
+"mel>=0.3.1"
 
 # Dependencies recommended for developing dune locally,
 # but not wanted in CI
@@ -74,7 +73,8 @@ dev-depext:
 
 .PHONY: melange
 melange:
-	opam pin add melange https://github.com/melange-re/melange.git#2f7a184400fd5d62c9160528a7ab4ce81874c024
+	opam pin add melange-compiler-libs https://github.com/melange-re/melange-compiler-libs.git#426463a77d0b70ecf0108c98e6a86d325cd01472
+	opam pin add melange https://github.com/melange-re/melange.git#685e546e290d317a884a4d48c7835467422c6426
 
 dev-deps: melange
 	opam install -y $(TEST_DEPS)

diff --git a/dune → dune-file b/dune → dune-file
diff --git a/dune-project b/dune-project
@@ -6,6 +6,8 @@
 
 (generate_opam_files true)
 
+(accept_alternative_dune_file_name)
+
 (strict_package_deps false)
 
 ; Reserved for Dune itself. This is to help with the bootstrap

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -96,7 +96,13 @@
         };
 
       devShells.slim =
-        let pkgs = nix-overlays.legacyPackages.${system};
+        let
+          pkgs = nix-overlays.legacyPackages.${system}.appendOverlays [
+            (self: super: {
+              ocamlPackages = self.ocaml-ng.ocamlPackages_4_14;
+            })
+            melange.overlays.default
+          ];
         in
         pkgs.mkShell {
           nativeBuildInputs = with pkgs; [ pkg-config nodejs-slim ];

diff --git a/otherlibs/configurator/test/blackbox-tests/dune b/otherlibs/configurator/test/blackbox-tests/dune
@@ -3,6 +3,10 @@
   (package dune)
   (package dune-configurator)))
 
+(cram
+ (applies_to pkg-config-quoting)
+ (deps %{bin:pkg-config}))
+
 (cram
  (enabled_if
   (<> %{ocaml-config:system} win))

diff --git a/otherlibs/dune-rpc-lwt/src/dune_rpc_lwt.ml b/otherlibs/dune-rpc-lwt/src/dune_rpc_lwt.ml
@@ -85,7 +85,10 @@ module V1 = struct
       (Fiber)
       (struct
         let read_file s : (string, exn) result Lwt.t =
-          Lwt_result.catch (Lwt_io.with_file ~mode:Input s Lwt_io.read)
+          Lwt.catch
+            (fun () ->
+              Lwt_result.ok (Lwt_io.with_file ~mode:Input s Lwt_io.read))
+            Lwt_result.fail
 
         let analyze_path s =
           Lwt.try_bind