Skip to content

Commit 92063b7

Browse files
authored
Merge pull request #22655 from voodoos/release-merlin-v4.7.1-500
[new release] merlin and merlin-lib (4.7.1-500)
2 parents ebfa3da + 9703f54 commit 92063b7

File tree

2 files changed

+112
-0
lines changed
  • packages
    • merlin-lib/merlin-lib.4.7.1-500
    • merlin/merlin.4.7.1-500

2 files changed

+112
-0
lines changed
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
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+
]
12+
depends: [
13+
"ocaml" {>= "5.0" & < "5.1"}
14+
"dune" {>= "2.9.0"}
15+
"csexp" {>= "1.5.1"}
16+
"menhir" {dev}
17+
"menhirLib" {dev}
18+
"menhirSdk" {dev}
19+
]
20+
synopsis:
21+
"Merlin's libraries"
22+
description:
23+
"These libraries provides access to low-level compiler interfaces and the
24+
standard higher-level merlin protocol. The library is provided as-is, is not
25+
thoroughly documented, and its public API might break with any new release."
26+
url {
27+
src:
28+
"https://github.com/ocaml/merlin/releases/download/v4.7.1-500/merlin-4.7.1-500.tbz"
29+
checksum: [
30+
"sha256=885d7a69796e06b1e7f80ddfc568af3a35cd03670e2ce23d39ea3c8547fa4b27"
31+
"sha512=de89c4cea7fe67e0d6f69d51e565a65d846fdf8ab63e4c1e9aafffebe73f7a087f12f828da7352c589cb1d1a127d8e0a2f021a3779cd9799b2e2a4681b8ed011"
32+
]
33+
}
34+
x-commit-hash: "f3643eab67b5d2a89c3310282b1b605eadeb1908"
Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
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" name "-j" jobs] {with-test}
12+
]
13+
depends: [
14+
"ocaml" {>= "5.0" & < "5.1"}
15+
"dune" {>= "2.9.0"}
16+
"merlin-lib" {= version}
17+
"dot-merlin-reader" {>= "4.6"}
18+
"yojson" {>= "2.0.0"}
19+
"conf-jq" {with-test}
20+
"ppxlib" {with-test}
21+
]
22+
conflicts: [
23+
"seq" {!= "base"}
24+
"base-effects"
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+
56+
Take a look at https://github.com/ocaml/merlin for more information
57+
58+
Quick setup with opam-user-setup
59+
--------------------------------
60+
61+
Opam-user-setup support Merlin.
62+
63+
$ opam user-setup install
64+
65+
should take care of basic setup.
66+
See https://github.com/OCamlPro/opam-user-setup
67+
"
68+
{success & !user-setup:installed}
69+
]
70+
url {
71+
src:
72+
"https://github.com/ocaml/merlin/releases/download/v4.7.1-500/merlin-4.7.1-500.tbz"
73+
checksum: [
74+
"sha256=885d7a69796e06b1e7f80ddfc568af3a35cd03670e2ce23d39ea3c8547fa4b27"
75+
"sha512=de89c4cea7fe67e0d6f69d51e565a65d846fdf8ab63e4c1e9aafffebe73f7a087f12f828da7352c589cb1d1a127d8e0a2f021a3779cd9799b2e2a4681b8ed011"
76+
]
77+
}
78+
x-commit-hash: "f3643eab67b5d2a89c3310282b1b605eadeb1908"

0 commit comments

Comments
 (0)