Skip to content

Commit baf113d

Browse files
samohtsamoht
authored
Merge pull request ocaml#24310 from voodoos/release-merlin-v4.10-414
Release merlin v4.10-414 and v4.10-500
2 parents 661e294 + 38b91b3 commit baf113d

File tree

4 files changed

+230
-0
lines changed
  • packages
    • merlin-lib
      • merlin-lib.4.10-414
      • merlin-lib.4.10-500
    • merlin

4 files changed

+230
-0
lines changed

‎packages/merlin-lib/merlin-lib.4.10-414/opam‎

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: "[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" {>= "4.14" & < "4.15"}
14+
"dune" {>= "2.9.0"}
15+
"csexp" {>= "1.5.1"}
16+
"menhir" {dev & >= "20201216"}
17+
"menhirLib" {dev & >= "20201216"}
18+
"menhirSdk" {dev & >= "20201216"}
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.10-414/merlin-4.10-414.tbz"
29+
checksum: [
30+
"sha256=fdad4ea804884a96f4e9e87682c6a6d6b137c28bcce024fcc9b3d5f3a5f04767"
31+
"sha512=7805b99c2a73b2e3f70d26fd7183a90f97657d66946e2a4b58563f00fd3ed8d82da1fb0597b033b8c8c9e8db415d66e51720c972d34db4b66b71bb8f0c9ee08c"
32+
]
33+
}
34+
x-commit-hash: "5b19576d6288161a2c2da895a1a87c1140384eb5"

‎packages/merlin-lib/merlin-lib.4.10-500/opam‎

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: "[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.0" & < "5.1"}
14+
"dune" {>= "2.9.0"}
15+
"csexp" {>= "1.5.1"}
16+
"menhir" {dev & >= "20201216"}
17+
"menhirLib" {dev & >= "20201216"}
18+
"menhirSdk" {dev & >= "20201216"}
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.10-500/merlin-4.10-500.tbz"
29+
checksum: [
30+
"sha256=9bdf90cfc0d3f78c8d4b0a5a99354b40a2121ed4550569d90f7b7fcb2ba3499d"
31+
"sha512=1306e8b691f95c1549e4dfd0b6a702eb6eb40e99c6f5bdcb086d4bd3cd4e8977168fe3a4391f5448cea4a6ef598beb3086ec730a66bb1c96280c9070072be4de"
32+
]
33+
}
34+
x-commit-hash: "50be6becda483ac02383aec6517c9ba90930736d"

‎packages/merlin/merlin.4.10-414/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: "[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" {>= "4.14" & < "4.15"}
15+
"dune" {>= "2.9.0"}
16+
"merlin-lib" {= version}
17+
"dot-merlin-reader" {>= "4.9"}
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+
;; 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/v4.10-414/merlin-4.10-414.tbz"
76+
checksum: [
77+
"sha256=fdad4ea804884a96f4e9e87682c6a6d6b137c28bcce024fcc9b3d5f3a5f04767"
78+
"sha512=7805b99c2a73b2e3f70d26fd7183a90f97657d66946e2a4b58563f00fd3ed8d82da1fb0597b033b8c8c9e8db415d66e51720c972d34db4b66b71bb8f0c9ee08c"
79+
]
80+
}
81+
x-commit-hash: "5b19576d6288161a2c2da895a1a87c1140384eb5"

‎packages/merlin/merlin.4.10-500/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: "[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.0" & < "5.1"}
15+
"dune" {>= "2.9.0"}
16+
"merlin-lib" {= version}
17+
"dot-merlin-reader" {>= "4.9"}
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+
;; 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/v4.10-500/merlin-4.10-500.tbz"
76+
checksum: [
77+
"sha256=9bdf90cfc0d3f78c8d4b0a5a99354b40a2121ed4550569d90f7b7fcb2ba3499d"
78+
"sha512=1306e8b691f95c1549e4dfd0b6a702eb6eb40e99c6f5bdcb086d4bd3cd4e8977168fe3a4391f5448cea4a6ef598beb3086ec730a66bb1c96280c9070072be4de"
79+
]
80+
}
81+
x-commit-hash: "50be6becda483ac02383aec6517c9ba90930736d"

0 commit comments

Comments
 (0)