Skip to content

Commit bc0f0a4

Browse files
mserimseri
authored
Merge pull request #27250 from voodoos/release-merlin-v5.4.1-503
[new release] merlin (4 packages) (5.4.1-503)
2 parents 2d5d10f + 0a7e863 commit bc0f0a4

File tree

5 files changed

+187
-0
lines changed
  • packages
    • dot-merlin-reader/dot-merlin-reader.5.4.1-503
    • merlin-lib
      • merlin-lib.5.4-503
      • merlin-lib.5.4.1-503
    • merlin/merlin.5.4.1-503
    • ocaml-index/ocaml-index.5.4.1-503

5 files changed

+187
-0
lines changed

‎packages/dot-merlin-reader/dot-merlin-reader.5.4.1-503/opam

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
opam-version: "2.0"
2+
maintainer: "[email protected]"
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+
build: [
10+
["dune" "subst"] {dev}
11+
["dune" "build" "-p" name "-j" jobs]
12+
]
13+
depends: [
14+
"ocaml" {>= "5.2" }
15+
"dune" {>= "3.0.0"}
16+
"merlin-lib" {= version}
17+
"ocamlfind" {>= "1.6.0"}
18+
]
19+
description:
20+
"Helper process: reads .merlin files and outputs the normalized content to
21+
stdout."
22+
url {
23+
src:
24+
"https://github.com/ocaml/merlin/releases/download/v5.4.1-503/merlin-5.4.1-503.tbz"
25+
checksum: [
26+
"sha256=49b3b4c778c12125fc7405e73790b0b312d5d79749dd73d4838b6562a2533022"
27+
"sha512=6350ff076ac61727c48bc098a05520c5d343f3323b2f3b6d7d69fdd568e51abca6945cbcbc3a6ae97fd198bd7bbdcae823fbd0f3f14a37972fe713da2ed14f2d"
28+
]
29+
}
30+
x-commit-hash: "86b4b261b950e409791a42815e4ede601c6be92d"

‎packages/merlin-lib/merlin-lib.5.4-503/opam

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ homepage: "https://github.com/ocaml/merlin"
55
bug-reports: "https://github.com/ocaml/merlin/issues"
66
dev-repo: "git+https://github.com/ocaml/merlin.git"
77
license: "MIT"
8+
flags: avoid-version
89
build: [
910
["dune" "subst"] {dev}
1011
["dune" "build" "-p" name "-j" jobs]

‎packages/merlin-lib/merlin-lib.5.4.1-503/opam

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
opam-version: "2.0"
2+
maintainer: "[email protected]"
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+
build: [
9+
["dune" "subst"] {dev}
10+
["dune" "build" "-p" name "-j" jobs]
11+
]
12+
depends: [
13+
"ocaml" {>="5.3" & <"5.4"}
14+
"dune" {>= "3.0.0"}
15+
"csexp" {>= "1.5.1"}
16+
"alcotest" {with-test & >= "1.3.0" }
17+
"menhir" {dev & >= "20201216"}
18+
"menhirLib" {dev & >= "20201216"}
19+
"menhirSdk" {dev & >= "20201216"}
20+
]
21+
synopsis:
22+
"Merlin's libraries"
23+
description:
24+
"These libraries provides access to low-level compiler interfaces and the
25+
standard higher-level merlin protocol. The library is provided as-is, is not
26+
thoroughly documented, and its public API might break with any new release."
27+
url {
28+
src:
29+
"https://github.com/ocaml/merlin/releases/download/v5.4.1-503/merlin-5.4.1-503.tbz"
30+
checksum: [
31+
"sha256=49b3b4c778c12125fc7405e73790b0b312d5d79749dd73d4838b6562a2533022"
32+
"sha512=6350ff076ac61727c48bc098a05520c5d343f3323b2f3b6d7d69fdd568e51abca6945cbcbc3a6ae97fd198bd7bbdcae823fbd0f3f14a37972fe713da2ed14f2d"
33+
]
34+
}
35+
x-commit-hash: "86b4b261b950e409791a42815e4ede601c6be92d"

‎packages/merlin/merlin.5.4.1-503/opam

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

‎packages/ocaml-index/ocaml-index.5.4.1-503/opam

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
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: ["[email protected]"]
6+
authors: ["[email protected]"]
7+
license: "MIT"
8+
homepage: "https://github.com/ocaml/merlin/ocaml-index"
9+
bug-reports: "https://github.com/ocaml/merlin/issues"
10+
depends: [
11+
"dune" {>= "3.0.0"}
12+
"ocaml" {>= "5.3"}
13+
"merlin-lib" {= version}
14+
"odoc" {with-doc}
15+
]
16+
build: [
17+
["dune" "subst"] {dev}
18+
[
19+
"dune"
20+
"build"
21+
"-p"
22+
name
23+
"-j"
24+
jobs
25+
"--promote-install-files=false"
26+
"@install"
27+
"@runtest" {with-test}
28+
"@doc" {with-doc}
29+
]
30+
["dune" "install" "-p" name "--create-install-files" name]
31+
]
32+
dev-repo: "git+https://github.com/ocaml/merlin.git"
33+
url {
34+
src:
35+
"https://github.com/ocaml/merlin/releases/download/v5.4.1-503/merlin-5.4.1-503.tbz"
36+
checksum: [
37+
"sha256=49b3b4c778c12125fc7405e73790b0b312d5d79749dd73d4838b6562a2533022"
38+
"sha512=6350ff076ac61727c48bc098a05520c5d343f3323b2f3b6d7d69fdd568e51abca6945cbcbc3a6ae97fd198bd7bbdcae823fbd0f3f14a37972fe713da2ed14f2d"
39+
]
40+
}
41+
x-commit-hash: "86b4b261b950e409791a42815e4ede601c6be92d"

0 commit comments

Comments
 (0)