Skip to content

Commit 97da9a1

Browse files
kit-ty-katekit-ty-kate
authored
Merge pull request #21698 from voodoos/release-merlin-v4.6-413
Release merlin v4.6-413/412 and dot-merlin-reader 4.5
2 parents b098ce4 + 37a7700 commit 97da9a1

File tree

3 files changed

+184
-0
lines changed
  • packages
    • dot-merlin-reader/dot-merlin-reader.4.5
    • merlin

3 files changed

+184
-0
lines changed

‎packages/dot-merlin-reader/dot-merlin-reader.4.5/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: "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+
build: [
10+
["dune" "subst"] {dev}
11+
["dune" "build" "-p" name "-j" jobs]
12+
]
13+
depends: [
14+
"ocaml" {>= "4.08.0" & < "5.0.0"}
15+
"dune" {>= "2.9.0"}
16+
"yojson" {>= "1.6.0"}
17+
"ocamlfind" {>= "1.6.0"}
18+
"csexp" {>= "1.5.1"}
19+
]
20+
description:
21+
"Helper process: reads .merlin files and gives the normalized content to merlin"
22+
url {
23+
src:
24+
"https://github.com/ocaml/merlin/releases/download/v4.6-413/merlin-4.6-413.tbz"
25+
checksum: [
26+
"sha256=f3dd371f84c4e85fefd8ac355e97297571222c875bf6595882de36cd247d90ee"
27+
"sha512=fe88a52c4c3c94505da142fbb7d400fce11bfafe6e47ec7cd39437308baa7122399a008bb6d0ef7b8f29636c2a51f4d49e3535136010fec198a1188293914a56"
28+
]
29+
}
30+
x-commit-hash: "2f422293d26b16ccf934d6d340c7a02f76e444c9"

‎packages/merlin/merlin.4.6-412/opam

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
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+
build: [
9+
["dune" "subst"] {dev}
10+
["dune" "build" "-p" name "-j" jobs]
11+
["dune" "runtest" "-p" "merlin,dot-merlin-reader" "-j" "1"] {with-test}
12+
]
13+
depends: [
14+
"ocaml" {>= "4.12" & < "4.13"}
15+
"dune" {>= "2.9.0"}
16+
"dot-merlin-reader" {>= "4.2"}
17+
"yojson" {>= "2.0.0"}
18+
"conf-jq" {with-test}
19+
"csexp" {>= "1.5.1"}
20+
"menhir" {dev}
21+
"menhirLib" {dev}
22+
"menhirSdk" {dev}
23+
]
24+
conflicts: "seq" {!= "base"}
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+
55+
Take a look at https://github.com/ocaml/merlin for more information
56+
57+
Quick setup with opam-user-setup
58+
--------------------------------
59+
60+
Opam-user-setup support Merlin.
61+
62+
$ opam user-setup install
63+
64+
should take care of basic setup.
65+
See https://github.com/OCamlPro/opam-user-setup
66+
"
67+
{success & !user-setup:installed}
68+
]
69+
url {
70+
src:
71+
"https://github.com/ocaml/merlin/releases/download/v4.6-412/merlin-4.6-412.tbz"
72+
checksum: [
73+
"sha256=8ac8aeacb7969a29c9410478a07a493c2cd593a7049ad41d5f8fa7dcf7646b97"
74+
"sha512=4362482ecd7c8af1c4e740e3816100cd5408eba3aebc01b867b45bdd1dcc237819cb0640e0f618b6ecf00aa8d55e58e55ecfeb176ed7b358c404ea71302443b0"
75+
]
76+
}
77+
x-commit-hash: "014387709c659fd937476647a30387cd7a58c9a7"

‎packages/merlin/merlin.4.6-413/opam

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
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+
build: [
9+
["dune" "subst"] {dev}
10+
["dune" "build" "-p" name "-j" jobs]
11+
["dune" "runtest" "-p" "merlin,dot-merlin-reader" "-j" "1"] {with-test}
12+
]
13+
depends: [
14+
"ocaml" {>= "4.13" & < "4.14"}
15+
"dune" {>= "2.9.0"}
16+
"dot-merlin-reader" {>= "4.2"}
17+
"yojson" {>= "2.0.0"}
18+
"conf-jq" {with-test}
19+
"csexp" {>= "1.5.1"}
20+
"menhir" {dev}
21+
"menhirLib" {dev}
22+
"menhirSdk" {dev}
23+
]
24+
conflicts: "seq" {!= "base"}
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+
55+
Take a look at https://github.com/ocaml/merlin for more information
56+
57+
Quick setup with opam-user-setup
58+
--------------------------------
59+
60+
Opam-user-setup support Merlin.
61+
62+
$ opam user-setup install
63+
64+
should take care of basic setup.
65+
See https://github.com/OCamlPro/opam-user-setup
66+
"
67+
{success & !user-setup:installed}
68+
]
69+
url {
70+
src:
71+
"https://github.com/ocaml/merlin/releases/download/v4.6-413/merlin-4.6-413.tbz"
72+
checksum: [
73+
"sha256=f3dd371f84c4e85fefd8ac355e97297571222c875bf6595882de36cd247d90ee"
74+
"sha512=fe88a52c4c3c94505da142fbb7d400fce11bfafe6e47ec7cd39437308baa7122399a008bb6d0ef7b8f29636c2a51f4d49e3535136010fec198a1188293914a56"
75+
]
76+
}
77+
x-commit-hash: "2f422293d26b16ccf934d6d340c7a02f76e444c9"

0 commit comments

Comments
 (0)