Skip to content

Commit ed8d3c8

Browse files
kit-ty-katekit-ty-kate
authored
Merge pull request ocaml#23687 from voodoos/release-merlin-v4.8-501preview
[new release] merlin, merlin-lib (4.8~5.1preview)
2 parents 3b2a802 + 1041f81 commit ed8d3c8

File tree

2 files changed

+116
-0
lines changed
  • packages
    • merlin-lib/merlin-lib.4.8~5.1preview
    • merlin/merlin.4.8~5.1preview

2 files changed

+116
-0
lines changed

‎packages/merlin-lib/merlin-lib.4.8~5.1preview/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: "[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.1" & < "5.2"}
14+
"dune" {>= "2.9.0"}
15+
"csexp" {>= "1.5.1"}
16+
"menhir" {dev & >= "20201216"}
17+
"menhirLib" {dev & >= "20201216"}
18+
"menhirSdk" {dev & >= "20201216"}
19+
]
20+
available: opam-version >= "2.1.0"
21+
flags: avoid-version
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/v4.8-501preview/merlin-4.8-501preview.tbz"
31+
checksum: [
32+
"sha256=d9901fd6620905dc0942bd4442b7ff318ec4fd0343ae21084debf07b0639e6c4"
33+
"sha512=136bbc9404c4a5fd3a08bed5c4c8293d7ae0562ec4573ee87d1060983fd494c19aafaaa76a9eeba72e5548a3028a1ab06889df0816695961c49c354f4c2b17be"
34+
]
35+
}
36+
x-commit-hash: "f0e2a05ccfd94526771ea1dcc1a25f3c333313e4"

‎packages/merlin/merlin.4.8~5.1preview/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+
"ocaml" {>= "5.1" & < "5.2"}
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+
available: opam-version >= "2.1.0"
27+
flags: avoid-version
28+
synopsis:
29+
"Editor helper, provides completion, typing and source browsing in Vim and Emacs"
30+
description:
31+
"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."
32+
post-messages: [
33+
"merlin installed.
34+
35+
Quick setup for VIM
36+
-------------------
37+
Append this to your .vimrc to add merlin to vim's runtime-path:
38+
let g:opamshare = substitute(system('opam var share'),'\\n$','','''')
39+
execute \"set rtp+=\" . g:opamshare . \"/merlin/vim\"
40+
41+
Also run the following line in vim to index the documentation:
42+
:execute \"helptags \" . g:opamshare . \"/merlin/vim/doc\"
43+
44+
Quick setup for EMACS
45+
-------------------
46+
Add opam emacs directory to your load-path by appending this to your .emacs:
47+
(let ((opam-share (ignore-errors (car (process-lines \"opam\" \"var\" \"share\")))))
48+
(when (and opam-share (file-directory-p opam-share))
49+
;; Register Merlin
50+
(add-to-list 'load-path (expand-file-name \"emacs/site-lisp\" opam-share))
51+
(autoload 'merlin-mode \"merlin\" nil t nil)
52+
;; Automatically start it in OCaml buffers
53+
(add-hook 'tuareg-mode-hook 'merlin-mode t)
54+
(add-hook 'caml-mode-hook 'merlin-mode t)
55+
;; Use opam switch to lookup ocamlmerlin binary
56+
(setq merlin-command 'opam)))
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/v4.8-501preview/merlin-4.8-501preview.tbz"
75+
checksum: [
76+
"sha256=d9901fd6620905dc0942bd4442b7ff318ec4fd0343ae21084debf07b0639e6c4"
77+
"sha512=136bbc9404c4a5fd3a08bed5c4c8293d7ae0562ec4573ee87d1060983fd494c19aafaaa76a9eeba72e5548a3028a1ab06889df0816695961c49c354f4c2b17be"
78+
]
79+
}
80+
x-commit-hash: "f0e2a05ccfd94526771ea1dcc1a25f3c333313e4"

0 commit comments

Comments
 (0)