Skip to content

Commit 0513bad

Browse files
shonfedershonfeder
authored
Merge pull request #27927 from kit-ty-kate/opam-publish-dot-merlin-reader.5.4.2-5.4preview
4 packages from voodoos/merlin at 5.4.2~5.4preview
2 parents 6aba779 + a36b40d commit 0513bad

File tree

4 files changed

+192
-0
lines changed
  • packages
    • dot-merlin-reader/dot-merlin-reader.5.4.2~5.4preview
    • merlin/merlin.5.4.2~5.4preview
    • merlin-lib/merlin-lib.5.4.2~5.4preview
    • ocaml-index/ocaml-index.5.4.2~5.4preview

4 files changed

+192
-0
lines changed

‎packages/dot-merlin-reader/dot-merlin-reader.5.4.2~5.4preview/opam

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
opam-version: "2.0"
2+
synopsis: "Reads config files for merlin"
3+
description: """\
4+
Helper process: reads .merlin files and outputs the normalized content to
5+
stdout."""
6+
maintainer: "defree@gmail.com"
7+
authors: "The Merlin team"
8+
license: "MIT"
9+
homepage: "https://github.com/ocaml/merlin"
10+
bug-reports: "https://github.com/ocaml/merlin/issues"
11+
depends: [
12+
"ocaml" {>= "5.2"}
13+
"dune" {>= "3.0.0"}
14+
"merlin-lib" {= version}
15+
"ocamlfind" {>= "1.6.0"}
16+
]
17+
available: opam-version >= "2.1.0"
18+
flags: avoid-version
19+
build: [
20+
["dune" "subst"] {dev}
21+
["dune" "build" "-p" name "-j" jobs]
22+
]
23+
dev-repo: "git+https://github.com/ocaml/merlin.git"
24+
url {
25+
src:
26+
"https://github.com/voodoos/merlin/archive/9cd9e4870d5bca509f0f40ee8532ad206a2721a5.tar.gz"
27+
checksum: [
28+
"md5=ffbb615406722b1f3b7f8b839c57fcc3"
29+
"sha512=48c98bf93ce9a2e0c2e7e51c8b2c341e756b80b6a0967afacd2fcd7ef27f056d2feed2226c48c1ee83c9059380552b00d850654ddd4017ff4dacfa803b08e577"
30+
]
31+
}
32+
x-maintenance-intent: ["(latest)"]

‎packages/merlin-lib/merlin-lib.5.4.2~5.4preview/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+
synopsis: "Merlin's libraries"
3+
description: """\
4+
These libraries provides access to low-level compiler interfaces and the
5+
standard higher-level merlin protocol. The library is provided as-is, is not
6+
thoroughly documented, and its public API might break with any new release."""
7+
maintainer: "defree@gmail.com"
8+
authors: "The Merlin team"
9+
license: "MIT"
10+
homepage: "https://github.com/ocaml/merlin"
11+
bug-reports: "https://github.com/ocaml/merlin/issues"
12+
depends: [
13+
"ocaml" {>= "5.4" & < "5.5"}
14+
"dune" {>= "3.0.0"}
15+
"csexp" {>= "1.5.1"}
16+
"alcotest" {with-test & >= "1.3.0"}
17+
"menhir" {dev & >= "20201216"}
18+
"menhirLib" {dev & >= "20201216"}
19+
"menhirSdk" {dev & >= "20201216"}
20+
]
21+
available: opam-version >= "2.1.0"
22+
flags: avoid-version
23+
build: [
24+
["dune" "subst"] {dev}
25+
["dune" "build" "-p" name "-j" jobs]
26+
]
27+
dev-repo: "git+https://github.com/ocaml/merlin.git"
28+
url {
29+
src:
30+
"https://github.com/voodoos/merlin/archive/9cd9e4870d5bca509f0f40ee8532ad206a2721a5.tar.gz"
31+
checksum: [
32+
"md5=ffbb615406722b1f3b7f8b839c57fcc3"
33+
"sha512=48c98bf93ce9a2e0c2e7e51c8b2c341e756b80b6a0967afacd2fcd7ef27f056d2feed2226c48c1ee83c9059380552b00d850654ddd4017ff4dacfa803b08e577"
34+
]
35+
}
36+
x-maintenance-intent: ["(latest)"]

‎packages/merlin/merlin.5.4.2~5.4preview/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+
synopsis:
3+
"Editor helper, provides completion, typing and source browsing in Vim and Emacs"
4+
description:
5+
"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."
6+
maintainer: "defree@gmail.com"
7+
authors: "The Merlin team"
8+
license: "MIT"
9+
homepage: "https://github.com/ocaml/merlin"
10+
bug-reports: "https://github.com/ocaml/merlin/issues"
11+
depends: [
12+
"dune" {>= "3.0.0"}
13+
"merlin-lib" {= version}
14+
"dot-merlin-reader" {= version}
15+
"ocaml-index" {>= "1.0" & post}
16+
"yojson" {>= "2.0.0"}
17+
"conf-jq" {with-test}
18+
"ppxlib" {with-test}
19+
]
20+
conflicts: [
21+
"seq" {!= "base"}
22+
]
23+
available: opam-version >= "2.1.0"
24+
flags: avoid-version
25+
build: [
26+
["dune" "subst"] {dev}
27+
["dune" "build" "-p" name "-j" jobs]
28+
["dune" "runtest" "-p" name "-j" jobs] {with-test}
29+
]
30+
post-messages:
31+
"""\
32+
merlin installed.
33+
34+
Quick setup for VIM
35+
-------------------
36+
Append this to your .vimrc to add merlin to vim's runtime-path:
37+
let g:opamshare = substitute(system('opam var share'),'\\n$','','''')
38+
execute "set rtp+=" . g:opamshare . "/merlin/vim"
39+
40+
Also run the following line in vim to index the documentation:
41+
:execute "helptags " . g:opamshare . "/merlin/vim/doc"
42+
43+
Quick setup for EMACS
44+
-------------------
45+
Add opam emacs directory to your load-path by appending this to your .emacs:
46+
(let ((opam-share (ignore-errors (car (process-lines "opam" "var" "share")))))
47+
(when (and opam-share (file-directory-p opam-share))
48+
;; Register Merlin
49+
(add-to-list 'load-path (expand-file-name "emacs/site-lisp" opam-share))
50+
(autoload 'merlin-mode "merlin" nil t nil)
51+
;; Automatically start it in OCaml buffers
52+
(add-hook 'tuareg-mode-hook 'merlin-mode t)
53+
(add-hook 'caml-mode-hook 'merlin-mode t)
54+
;; Use opam switch to lookup ocamlmerlin binary
55+
(setq merlin-command 'opam)
56+
;; To easily change opam switches within a given Emacs session, you can
57+
;; install the minor mode https://github.com/ProofGeneral/opam-switch-mode
58+
;; and use one of its "OPSW" menus.
59+
))
60+
Take a look at https://github.com/ocaml/merlin for more information
61+
62+
Quick setup with opam-user-setup
63+
--------------------------------
64+
65+
Opam-user-setup support Merlin.
66+
67+
$ opam user-setup install
68+
69+
should take care of basic setup.
70+
See https://github.com/OCamlPro/opam-user-setup"""
71+
{success & !user-setup:installed}
72+
dev-repo: "git+https://github.com/ocaml/merlin.git"
73+
url {
74+
src:
75+
"https://github.com/voodoos/merlin/archive/9cd9e4870d5bca509f0f40ee8532ad206a2721a5.tar.gz"
76+
checksum: [
77+
"md5=ffbb615406722b1f3b7f8b839c57fcc3"
78+
"sha512=48c98bf93ce9a2e0c2e7e51c8b2c341e756b80b6a0967afacd2fcd7ef27f056d2feed2226c48c1ee83c9059380552b00d850654ddd4017ff4dacfa803b08e577"
79+
]
80+
}
81+
x-maintenance-intent: ["(latest)"]

‎packages/ocaml-index/ocaml-index.5.4.2~5.4preview/opam

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
opam-version: "2.0"
2+
synopsis: "A tool that indexes value usages from cmt files"
3+
description:
4+
"ocaml-index should integrate with the build system to index codebase and allow tools such as Merlin to perform project-wide occurrences queries."
5+
maintainer: "ulysse@tarides.com"
6+
authors: "ulysse@tarides.com"
7+
license: "MIT"
8+
homepage: "https://github.com/ocaml/merlin/ocaml-index"
9+
bug-reports: "https://github.com/ocaml/merlin/issues"
10+
depends: [
11+
"dune" {>= "3.0.0"}
12+
"ocaml" {>= "5.4"}
13+
"merlin-lib" {= version}
14+
"odoc" {with-doc}
15+
]
16+
available: opam-version >= "2.1.0"
17+
flags: avoid-version
18+
build: [
19+
["dune" "subst"] {dev}
20+
[
21+
"dune"
22+
"build"
23+
"-p"
24+
name
25+
"-j"
26+
jobs
27+
"--promote-install-files=false"
28+
"@install"
29+
"@runtest" {with-test}
30+
"@doc" {with-doc}
31+
]
32+
["dune" "install" "-p" name "--create-install-files" name]
33+
]
34+
dev-repo: "git+https://github.com/ocaml/merlin.git"
35+
url {
36+
src:
37+
"https://github.com/voodoos/merlin/archive/9cd9e4870d5bca509f0f40ee8532ad206a2721a5.tar.gz"
38+
checksum: [
39+
"md5=ffbb615406722b1f3b7f8b839c57fcc3"
40+
"sha512=48c98bf93ce9a2e0c2e7e51c8b2c341e756b80b6a0967afacd2fcd7ef27f056d2feed2226c48c1ee83c9059380552b00d850654ddd4017ff4dacfa803b08e577"
41+
]
42+
}
43+
x-maintenance-intent: ["(latest)"]

0 commit comments

Comments
 (0)