Merge pull request #10551 from gridbugs/merge-main-into-toolchains2

Merge main into toolchains

Author: gridbugs

Makefile

@@ -74,10 +74,10 @@ install-ocamlformat:
 dev-depext:
 	opam depext -y $(TEST_DEPS)
 
-# v4-414-dev
+# branch v4-414-for-dune
 .PHONY: melange
 melange:
-	opam pin add -n melange.dev https://github.com/melange-re/melange.git#24e21cc42
+	opam pin add -n melange.dev https://github.com/melange-re/melange.git#ab48cfcfe5f2c0ca4a4a4fcafceb73b95c2acb1d
 
 .PHONY: dev-deps
 dev-deps: melange

bin/install_uninstall.ml

@@ -204,7 +204,7 @@ module File_ops_real (W : sig
   open W
 
   let print_line = print_line ~verbosity
-  let get_vcs p = Dune_rules.Vcs_db.nearest_vcs p
+  let get_vcs p = Source_tree.nearest_vcs p
 
   type copy_special_file_status =
     | Done