Fix merlin submodule

ocaml-mlx · May 5, 2024 · 50ab4b2 · 50ab4b2
1 parent 994dffe
commit 50ab4b2
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -3,7 +3,7 @@
 	url = https://github.com/let-def/merlin-extend
 [submodule "merlin"]
 	path = merlin
-	url = https://github.com/voodoos/merlin.git
+	url = https://github.com/ocaml/merlin.git
 [submodule "ocaml"]
 	path = ocaml
 	url = https://github.com/ocaml/ocaml.git
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 .PHONY: init
 init:
-	opam switch create . 5.1.0 --no-install -y
+	opam switch create . 5.1.1 --no-install -y
 	opam install . --deps-only -y
 	opam install menhir.20210419 ocamlformat ocaml-lsp-server -y
 

diff --git a/dune-project b/dune-project
@@ -28,5 +28,4 @@
  (name mlx))
 
 (package
- (name ocamlmerlin-mlx)
- )
+ (name ocamlmerlin-mlx))
diff --git a/merlin b/merlin
diff --git a/test/example/dune b/test/example/dune
@@ -1,4 +1,7 @@
 (executable
-  (name main))
+ (package mlx-example)
+ (public_name mlx-example)
+ (name main))
 
-(cram (deps ./main.exe))
+(cram
+ (deps ./main.exe))