Skip to content

Commit bc1219b

Browse files
voodoosvoodoos
committed
[new release] merlin, merlin-lib and dot-merlin-reader (4.9-414/500)
CHANGES: Fri May 26 15:23:42 CEST 2023 + merlin binary - Allow monadic IO in dot protocol (ocaml/merlin#1581) - Add a `scope` option to the `occurrences` command in preparation for the upcoming `project-wide-occurrences` feature (ocaml/merlin#1596) - Construct bool-typed holes as `false` instead of `true` in the `construct` command, for consistency (ocaml/merlin#1599). - Add a hook to configure system command for spawning ppxes when Merlin is used as a library. (ocaml/merlin#1585) - Implement an all-or-nothing cache for the PPX phase (ocaml/merlin#1584) - Cleanup functors caches when backtracking, to avoid memory leaks (ocaml/merlin#1609, fixes ocaml/merlin#1529 and ocaml-lsp#1032) - Fix `construct` results ordering for sum types sand poly variants (ocaml/merlin#1603) - Fix object method completion not working (ocaml/merlin#1606, fixes ocaml/merlin#1575) - Improve context detection for package types (ocaml/merlin#1608, fixes ocaml/merlin#1607) - Fix incorrect locations for string literals (ocaml/merlin#1574) - Fixed an issue that caused `errors` to erroneously alert about missing `cmi` files (ocaml/merlin#1577) - Prevent destruct from crashing on closed variant types (ocaml/merlin#1602, fixes ocaml/merlin#1601) - Improve longident parsing (ocaml/merlin#1612, fixes ocaml/merlin#945) + editor modes - emacs: call the user's configured completion UI in `merlin-construct` (ocaml/merlin#1598) + test suite - Add missing dependency to a test using ppxlib (ocaml/merlin#1583) - Add tests for the new PPX phase cache (ocaml/merlin#1584) - Add and update tests for `construct` ordering (ocaml/merlin#1603) [new release] merlin, merlin-lib and dot-merlin-reader (4.9-414) CHANGES: Fri May 26 15:23:42 CEST 2023 + merlin binary - Allow monadic IO in dot protocol (ocaml/merlin#1581) - Add a `scope` option to the `occurrences` command in preparation for the upcoming `project-wide-occurrences` feature (ocaml/merlin#1596) - Construct bool-typed holes as `false` instead of `true` in the `construct` command, for consistency (ocaml/merlin#1599). - Add a hook to configure system command for spawning ppxes when Merlin is used as a library. (ocaml/merlin#1585) - Implement an all-or-nothing cache for the PPX phase (ocaml/merlin#1584) - Cleanup functors caches when backtracking, to avoid memory leaks (ocaml/merlin#1609, fixes ocaml/merlin#1529 and ocaml-lsp#1032) - Fix `construct` results ordering for sum types sand poly variants (ocaml/merlin#1603) - Fix object method completion not working (ocaml/merlin#1606, fixes ocaml/merlin#1575) - Improve context detection for package types (ocaml/merlin#1608, fixes ocaml/merlin#1607) - Fix incorrect locations for string literals (ocaml/merlin#1574) - Fixed an issue that caused `errors` to erroneously alert about missing `cmi` files (ocaml/merlin#1577) - Prevent destruct from crashing on closed variant types (ocaml/merlin#1602, fixes ocaml/merlin#1601) - Improve longident parsing (ocaml/merlin#1612, fixes ocaml/merlin#945) + editor modes - emacs: call the user's configured completion UI in `merlin-construct` (ocaml/merlin#1598) + test suite - Add missing dependency to a test using ppxlib (ocaml/merlin#1583) - Add tests for the new PPX phase cache (ocaml/merlin#1584) - Add and update tests for `construct` ordering (ocaml/merlin#1603)
1 parent 93bb2e6 commit bc1219b

File tree

5 files changed

+254
-0
lines changed
  • packages
    • dot-merlin-reader/dot-merlin-reader.4.9
    • merlin-lib
      • merlin-lib.4.9-414
      • merlin-lib.4.9-500
    • merlin

5 files changed

+254
-0
lines changed

‎packages/dot-merlin-reader/dot-merlin-reader.4.9/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: "[email protected]"
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" & < "6.0"}
15+
"dune" {>= "2.9.0"}
16+
"merlin-lib" {>= "4.9"}
17+
"ocamlfind" {>= "1.6.0"}
18+
]
19+
description:
20+
"Helper process: reads .merlin files and outputs the normalized content to
21+
stdout."
22+
url {
23+
src:
24+
"https://github.com/ocaml/merlin/releases/download/v4.9-414/merlin-4.9-414.tbz"
25+
checksum: [
26+
"sha256=e23fc47813591269ff9d27c820988e520a662c89dd0af7ea652b21517499cbfd"
27+
"sha512=2199f963368597d10cc197e41ebb883f6a166018c9da3fe259c354550df41b713781003598a2fe5956b0a4ae96f8c07ba33831d3cf6f9d494b731944f87e491e"
28+
]
29+
}
30+
x-commit-hash: "df75a4550704c113ac29505fd68ef9b7893d4bf5"

‎packages/merlin-lib/merlin-lib.4.9-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.9-414/merlin-4.9-414.tbz"
29+
checksum: [
30+
"sha256=e23fc47813591269ff9d27c820988e520a662c89dd0af7ea652b21517499cbfd"
31+
"sha512=2199f963368597d10cc197e41ebb883f6a166018c9da3fe259c354550df41b713781003598a2fe5956b0a4ae96f8c07ba33831d3cf6f9d494b731944f87e491e"
32+
]
33+
}
34+
x-commit-hash: "df75a4550704c113ac29505fd68ef9b7893d4bf5"

‎packages/merlin-lib/merlin-lib.4.9-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.9-500/merlin-4.9-500.tbz"
29+
checksum: [
30+
"sha256=b907c66b3a314f17251d28937e38e2fad289bfc30aa9174730f0ffc5f3199526"
31+
"sha512=0ce829da06439aed378a1548538a0ecc5b8caa72bffd3b9ff7b70643ff4281306ba7e6de5b00559f93a8e5f5a4ee54c7177257a66fa6a90262ff3c405795ae38"
32+
]
33+
}
34+
x-commit-hash: "d203dd96b98079add79ae797ccec555c3b3750ac"

‎packages/merlin/merlin.4.9-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.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+
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.9-414/merlin-4.9-414.tbz"
73+
checksum: [
74+
"sha256=e23fc47813591269ff9d27c820988e520a662c89dd0af7ea652b21517499cbfd"
75+
"sha512=2199f963368597d10cc197e41ebb883f6a166018c9da3fe259c354550df41b713781003598a2fe5956b0a4ae96f8c07ba33831d3cf6f9d494b731944f87e491e"
76+
]
77+
}
78+
x-commit-hash: "df75a4550704c113ac29505fd68ef9b7893d4bf5"

‎packages/merlin/merlin.4.9-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.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+
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.9-500/merlin-4.9-500.tbz"
73+
checksum: [
74+
"sha256=b907c66b3a314f17251d28937e38e2fad289bfc30aa9174730f0ffc5f3199526"
75+
"sha512=0ce829da06439aed378a1548538a0ecc5b8caa72bffd3b9ff7b70643ff4281306ba7e6de5b00559f93a8e5f5a4ee54c7177257a66fa6a90262ff3c405795ae38"
76+
]
77+
}
78+
x-commit-hash: "d203dd96b98079add79ae797ccec555c3b3750ac"

0 commit comments

Comments
 (0)