Skip to content

Commit 97f7ace

Browse files
kit-ty-katekit-ty-kate
authored
Merge pull request ocaml#23411 from voodoos/release-merlin-v4.8-500
Release merlin and merlin-lib v4.8-{500,414}
2 parents 16930bb + 72ee436 commit 97f7ace

File tree

5 files changed

+225
-1
lines changed
  • packages
    • gopcaml-mode/gopcaml-mode.0.0.6
    • merlin-lib
      • merlin-lib.4.8-414
      • merlin-lib.4.8-500
    • merlin

5 files changed

+225
-1
lines changed

‎packages/gopcaml-mode/gopcaml-mode.0.0.6/opam‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ license: "GPL-3.0-only"
99
homepage: "https://gitlab.com/gopiandcode/gopcaml-mode"
1010
bug-reports: "https://gitlab.com/gopiandcode/gopcaml-mode/issues"
1111
depends: [
12-
"ocaml" {>= "4.08.0"}
12+
"ocaml" {>= "4.08.0" & < "5.0.0"}
1313
"dune" {>= "2.9.0"}
1414
"core" {>= "v0.13.0"}
1515
"ppx_deriving" {>= "4.4.0"}

‎packages/merlin-lib/merlin-lib.4.8-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.8-414/merlin-4.8-414.tbz"
29+
checksum: [
30+
"sha256=1cc5d685c54e5d6d39f32d78deb34171f10e9a3b76b5925771728798a6798baf"
31+
"sha512=49804812b9066a457ad15d4e11a8bdb0323beead43712b5f5f936f60aa2975753c2a62dc95c7a49f3bd07c210056a170fb5c71f269ca1890aa26c96b45541fc6"
32+
]
33+
}
34+
x-commit-hash: "85ad3a6b09edbf54685eb8e962e82c209f409951"

‎packages/merlin-lib/merlin-lib.4.8-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.8-500/merlin-4.8-500.tbz"
29+
checksum: [
30+
"sha256=9f93472aea34fe56667deed6b24aa75b7c66d52d0f9972924bddc10caae98c22"
31+
"sha512=b1498064c69305d72bf833e1652e4a0947540c736aa17b58f03af35dd7ca191250acc6a929f1e5b2010bc0fc30fc7074d8b20a5cbad8d9685715df2746c12839"
32+
]
33+
}
34+
x-commit-hash: "1fbb47f7559fd4145cee3661cb70e2fae711df53"

‎packages/merlin/merlin.4.8-414/opam‎

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: "[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.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.8-414/merlin-4.8-414.tbz"
73+
checksum: [
74+
"sha256=1cc5d685c54e5d6d39f32d78deb34171f10e9a3b76b5925771728798a6798baf"
75+
"sha512=49804812b9066a457ad15d4e11a8bdb0323beead43712b5f5f936f60aa2975753c2a62dc95c7a49f3bd07c210056a170fb5c71f269ca1890aa26c96b45541fc6"
76+
]
77+
}
78+
x-commit-hash: "85ad3a6b09edbf54685eb8e962e82c209f409951"

‎packages/merlin/merlin.4.8-500/opam‎

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: "[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.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.8-500/merlin-4.8-500.tbz"
73+
checksum: [
74+
"sha256=9f93472aea34fe56667deed6b24aa75b7c66d52d0f9972924bddc10caae98c22"
75+
"sha512=b1498064c69305d72bf833e1652e4a0947540c736aa17b58f03af35dd7ca191250acc6a929f1e5b2010bc0fc30fc7074d8b20a5cbad8d9685715df2746c12839"
76+
]
77+
}
78+
x-commit-hash: "1fbb47f7559fd4145cee3661cb70e2fae711df53"

0 commit comments

Comments
 (0)