Skip to content

Commit c3b5c54

Browse files
voodoosvoodoos
committed
[new release] merlin (4 packages) (5.6.1-504)
CHANGES: Sat Dec 20 11:15:42 CET 2025 + merlin binary - Fix a plethora of minor issues with the C code (ocaml/merlin#1998) + merlin library - Signature help should not appear on the function name (ocaml/merlin#1997) - Fix completion not working for inlined records labels (ocaml/merlin#1978, fixes ocaml/merlin#1977) - Perform buffer indexing only if the query requires it (ocaml/merlin#1990 and ocaml/merlin#1991) - Stop unnecessarily forcing substitutions when initializing short-paths graph (ocaml/merlin#1988) - Fix Mocaml.with_printer didn't update replacement_printer_doc (ocaml/merlin#2010) + test suite - Add a test to ensure the behavior showed in issue ocaml/merlin#1517 is no longer relevant (ocaml/merlin#1995) - Add a test to ensure the code fragment exhibited in issue ocaml/merlin#1118 no longer makes Merlin crash (ocaml/merlin#1996) - Add a test case illustrating how a snippet produces two unrelated errors in issue ocaml/merlin#2000. (ocaml/merlin#2003) - Add a test reproducing issue ocaml/merlin#1983 where `document` command which sometime concatenates consecutive variants and labels (ocaml/merlin#2005) - Signature-help should trigger on unfinished `let ... in` bindings (ocaml/merlin#2009)
1 parent 55b1099 commit c3b5c54

File tree

4 files changed

+190
-0
lines changed
  • packages
    • dot-merlin-reader/dot-merlin-reader.5.6.1-504
    • merlin-lib/merlin-lib.5.6.1-504
    • merlin/merlin.5.6.1-504
    • ocaml-index/ocaml-index.5.6.1-504

4 files changed

+190
-0
lines changed

‎packages/dot-merlin-reader/dot-merlin-reader.5.6.1-504/opam‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
opam-version: "2.0"
2+
maintainer: "defree@gmail.com"
3+
authors: "The Merlin team"
4+
synopsis: "Reads config files for merlin"
5+
homepage: "https://github.com/ocaml/merlin"
6+
bug-reports: "https://github.com/ocaml/merlin/issues"
7+
dev-repo: "git+https://github.com/ocaml/merlin.git"
8+
license: "MIT"
9+
x-maintenance-intent: ["(latest)"]
10+
build: [
11+
["dune" "subst"] {dev}
12+
["dune" "build" "-p" name "-j" jobs]
13+
]
14+
depends: [
15+
"ocaml" {>= "5.2" }
16+
"dune" {>= "3.0.0"}
17+
"merlin-lib" {= version}
18+
"ocamlfind" {>= "1.6.0"}
19+
]
20+
description:
21+
"Helper process: reads .merlin files and outputs the normalized content to
22+
stdout."
23+
url {
24+
src:
25+
"https://github.com/ocaml/merlin/releases/download/v5.6.1-504/merlin-5.6.1-504.tbz"
26+
checksum: [
27+
"sha256=cc3c7c01f19a454c96f6bc8a39538023e01042519f001a895fd61488e2b49fb5"
28+
"sha512=4268a932a8494023699abd98e0d52deb6f201f656863849db230dc8692050e0fe00cc25a50d70e902410f17a27268fd8335c32636f616ef012cf86fc9a43e019"
29+
]
30+
}
31+
x-commit-hash: "a0b096c243bbcea483bf8728a71c30eeafb18d11"

‎packages/merlin-lib/merlin-lib.5.6.1-504/opam‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
opam-version: "2.0"
2+
maintainer: "defree@gmail.com"
3+
authors: "The Merlin team"
4+
homepage: "https://github.com/ocaml/merlin"
5+
bug-reports: "https://github.com/ocaml/merlin/issues"
6+
dev-repo: "git+https://github.com/ocaml/merlin.git"
7+
license: "MIT"
8+
x-maintenance-intent: ["(latest)"]
9+
build: [
10+
["dune" "subst"] {dev}
11+
["dune" "build" "-p" name "-j" jobs]
12+
]
13+
depends: [
14+
"ocaml" {>="5.4" & <"5.5"}
15+
"dune" {>= "3.0.0"}
16+
"csexp" {>= "1.5.1"}
17+
"alcotest" {with-test & >= "1.3.0" }
18+
"menhir" {dev & >= "20201216"}
19+
"menhirLib" {dev & >= "20201216"}
20+
"menhirSdk" {dev & >= "20201216"}
21+
]
22+
synopsis:
23+
"Merlin's libraries"
24+
description:
25+
"These libraries provides access to low-level compiler interfaces and the
26+
standard higher-level merlin protocol. The library is provided as-is, is not
27+
thoroughly documented, and its public API might break with any new release."
28+
url {
29+
src:
30+
"https://github.com/ocaml/merlin/releases/download/v5.6.1-504/merlin-5.6.1-504.tbz"
31+
checksum: [
32+
"sha256=cc3c7c01f19a454c96f6bc8a39538023e01042519f001a895fd61488e2b49fb5"
33+
"sha512=4268a932a8494023699abd98e0d52deb6f201f656863849db230dc8692050e0fe00cc25a50d70e902410f17a27268fd8335c32636f616ef012cf86fc9a43e019"
34+
]
35+
}
36+
x-commit-hash: "a0b096c243bbcea483bf8728a71c30eeafb18d11"

‎packages/merlin/merlin.5.6.1-504/opam‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
opam-version: "2.0"
2+
maintainer: "defree@gmail.com"
3+
authors: "The Merlin team"
4+
homepage: "https://github.com/ocaml/merlin"
5+
bug-reports: "https://github.com/ocaml/merlin/issues"
6+
dev-repo: "git+https://github.com/ocaml/merlin.git"
7+
license: "MIT"
8+
x-maintenance-intent: ["(latest)"]
9+
build: [
10+
["dune" "subst"] {dev}
11+
["dune" "build" "-p" name "-j" jobs]
12+
["dune" "runtest" "-p" name "-j" jobs] {with-test}
13+
]
14+
depends: [
15+
"dune" {>= "3.0.0"}
16+
"merlin-lib" {= version}
17+
"dot-merlin-reader" {= version}
18+
"ocaml-index" {= version & post}
19+
"yojson" {>= "2.0.0"}
20+
"conf-jq" {with-test}
21+
"ppxlib" {with-test}
22+
]
23+
conflicts: [
24+
"seq" {!= "base"}
25+
]
26+
synopsis:
27+
"Editor helper, provides completion, typing and source browsing in Vim and Emacs"
28+
description:
29+
"Merlin is an assistant for editing OCaml code. It aims to provide the features available in modern IDEs: error reporting, auto completion, source browsing and much more."
30+
post-messages: [
31+
"merlin installed.
32+
33+
Quick setup for VIM
34+
-------------------
35+
Append this to your .vimrc to add merlin to vim's runtime-path:
36+
let g:opamshare = substitute(system('opam var share'),'\\n$','','''')
37+
execute \"set rtp+=\" . g:opamshare . \"/merlin/vim\"
38+
39+
Also run the following line in vim to index the documentation:
40+
:execute \"helptags \" . g:opamshare . \"/merlin/vim/doc\"
41+
42+
Quick setup for EMACS
43+
-------------------
44+
Add opam emacs directory to your load-path by appending this to your .emacs:
45+
(let ((opam-share (ignore-errors (car (process-lines \"opam\" \"var\" \"share\")))))
46+
(when (and opam-share (file-directory-p opam-share))
47+
;; Register Merlin
48+
(add-to-list 'load-path (expand-file-name \"emacs/site-lisp\" opam-share))
49+
(autoload 'merlin-mode \"merlin\" nil t nil)
50+
;; Automatically start it in OCaml buffers
51+
(add-hook 'tuareg-mode-hook 'merlin-mode t)
52+
(add-hook 'caml-mode-hook 'merlin-mode t)
53+
;; Use opam switch to lookup ocamlmerlin binary
54+
(setq merlin-command 'opam)
55+
;; To easily change opam switches within a given Emacs session, you can
56+
;; install the minor mode https://github.com/ProofGeneral/opam-switch-mode
57+
;; and use one of its \"OPSW\" menus.
58+
))
59+
Take a look at https://github.com/ocaml/merlin for more information
60+
61+
Quick setup with opam-user-setup
62+
--------------------------------
63+
64+
Opam-user-setup support Merlin.
65+
66+
$ opam user-setup install
67+
68+
should take care of basic setup.
69+
See https://github.com/OCamlPro/opam-user-setup
70+
"
71+
{success & !user-setup:installed}
72+
]
73+
url {
74+
src:
75+
"https://github.com/ocaml/merlin/releases/download/v5.6.1-504/merlin-5.6.1-504.tbz"
76+
checksum: [
77+
"sha256=cc3c7c01f19a454c96f6bc8a39538023e01042519f001a895fd61488e2b49fb5"
78+
"sha512=4268a932a8494023699abd98e0d52deb6f201f656863849db230dc8692050e0fe00cc25a50d70e902410f17a27268fd8335c32636f616ef012cf86fc9a43e019"
79+
]
80+
}
81+
x-commit-hash: "a0b096c243bbcea483bf8728a71c30eeafb18d11"

‎packages/ocaml-index/ocaml-index.5.6.1-504/opam‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
opam-version: "2.0"
2+
synopsis: "A tool that indexes value usages from cmt files"
3+
description:
4+
"ocaml-index should integrate with the build system to index codebase and allow tools such as Merlin to perform project-wide occurrences queries."
5+
maintainer: ["ulysse@tarides.com"]
6+
authors: ["ulysse@tarides.com"]
7+
license: "MIT"
8+
homepage: "https://github.com/ocaml/merlin/ocaml-index"
9+
bug-reports: "https://github.com/ocaml/merlin/issues"
10+
x-maintenance-intent: ["(latest)"]
11+
depends: [
12+
"dune" {>= "3.0.0"}
13+
"ocaml" {>= "5.4"}
14+
"merlin-lib" {= version}
15+
"odoc" {with-doc}
16+
]
17+
build: [
18+
["dune" "subst"] {dev}
19+
[
20+
"dune"
21+
"build"
22+
"-p"
23+
name
24+
"-j"
25+
jobs
26+
"--promote-install-files=false"
27+
"@install"
28+
"@runtest" {with-test}
29+
"@doc" {with-doc}
30+
]
31+
["dune" "install" "-p" name "--create-install-files" name]
32+
]
33+
dev-repo: "git+https://github.com/ocaml/merlin.git"
34+
url {
35+
src:
36+
"https://github.com/ocaml/merlin/releases/download/v5.6.1-504/merlin-5.6.1-504.tbz"
37+
checksum: [
38+
"sha256=cc3c7c01f19a454c96f6bc8a39538023e01042519f001a895fd61488e2b49fb5"
39+
"sha512=4268a932a8494023699abd98e0d52deb6f201f656863849db230dc8692050e0fe00cc25a50d70e902410f17a27268fd8335c32636f616ef012cf86fc9a43e019"
40+
]
41+
}
42+
x-commit-hash: "a0b096c243bbcea483bf8728a71c30eeafb18d11"

0 commit comments

Comments
 (0)