Skip to content

Commit a4dcdfd

Browse files
mserimseri
authored
Merge pull request ocaml#28081 from voodoos/release-merlin-v5.5-503
[new release] merlin (5.5-503) and ocaml-lsp (1.23.0) (7 packages)
2 parents 9f08af3 + 6814cf4 commit a4dcdfd

File tree

8 files changed

+374
-1
lines changed
  • packages
    • dot-merlin-reader/dot-merlin-reader.5.5-503
    • jsonrpc/jsonrpc.1.23.0
    • lsp/lsp.1.23.0
    • merlin-lib/merlin-lib.5.5-503
    • merlin/merlin.5.5-503
    • ocaml-index/ocaml-index.5.5-503
    • ocaml-lsp-server
      • ocaml-lsp-server.1.22.0
      • ocaml-lsp-server.1.23.0

8 files changed

+374
-1
lines changed

‎packages/dot-merlin-reader/dot-merlin-reader.5.5-503/opam‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
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+
x-maintenance-intent: ["(latest)"]
10+
build: [
11+
["dune" "subst"] {dev}
12+
["dune" "build" "-p" name "-j" jobs]
13+
]
14+
depends: [
15+
"ocaml" {>= "5.2" }
16+
"dune" {>= "3.0.0"}
17+
"merlin-lib" {= version}
18+
"ocamlfind" {>= "1.6.0"}
19+
]
20+
description:
21+
"Helper process: reads .merlin files and outputs the normalized content to
22+
stdout."
23+
url {
24+
src:
25+
"https://github.com/ocaml/merlin/releases/download/v5.5-503/merlin-5.5-503.tbz"
26+
checksum: [
27+
"sha256=67da3b34f2fea07678267309f61da4a2c6f08298de0dc59655b8d30fd8269af1"
28+
"sha512=1fb3b5180d36aa82b82a319e15b743b802b6888f0dc67645baafdb4e18dfc23a7b90064ec9bc42f7424061cf8cde7f8839178d8a8537bf4596759f3ff4891873"
29+
]
30+
}
31+
x-commit-hash: "8b88b89ee7431a23eaf95e4e02e45dc65595aa74"

‎packages/jsonrpc/jsonrpc.1.23.0/opam‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
opam-version: "2.0"
2+
synopsis: "Jsonrpc protocol implemenation"
3+
description: "See https://www.jsonrpc.org/specification"
4+
maintainer: ["Rudi Grinberg <[email protected]>"]
5+
authors: [
6+
"Andrey Popp <[email protected]>"
7+
"Rusty Key <[email protected]>"
8+
"Louis Roché <[email protected]>"
9+
"Oleksiy Golovko <[email protected]>"
10+
"Rudi Grinberg <[email protected]>"
11+
"Sacha Ayoun <[email protected]>"
12+
"cannorin <[email protected]>"
13+
"Ulugbek Abdullaev <[email protected]>"
14+
"Thibaut Mattio <[email protected]>"
15+
"Max Lantas <[email protected]>"
16+
]
17+
license: "ISC"
18+
homepage: "https://github.com/ocaml/ocaml-lsp"
19+
bug-reports: "https://github.com/ocaml/ocaml-lsp/issues"
20+
depends: [
21+
"dune" {>= "3.0"}
22+
"ocaml" {>= "4.08"}
23+
"odoc" {with-doc}
24+
]
25+
dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git"
26+
build: [
27+
["dune" "subst"] {dev}
28+
[
29+
"dune"
30+
"build"
31+
"-p"
32+
name
33+
"-j"
34+
jobs
35+
"@install"
36+
"@doc" {with-doc}
37+
]
38+
]
39+
40+
x-maintenance-intent: [ "(latest)" ]
41+
url {
42+
src:
43+
"https://github.com/ocaml/ocaml-lsp/releases/download/1.23.0/lsp-1.23.0.tbz"
44+
checksum: [
45+
"sha256=7f2bd023b54a80eace16286d28891c1360768946052c939918a8a9cd95340e7d"
46+
"sha512=f5d62f19646923b0e54a23516539b949dd434178b98cf3a6f1fdaf6bba3c277aa4b93c57a2d8f9a6d9d75d7c514b4a2616a8593e01cd17331986d4e3392ef96e"
47+
]
48+
}
49+
x-commit-hash: "4483b5b9cb3c58d09cfd113394f3ced8fea11f50"

‎packages/lsp/lsp.1.23.0/opam‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
opam-version: "2.0"
2+
synopsis: "LSP protocol implementation in OCaml"
3+
description: """
4+
5+
Implementation of the LSP protocol in OCaml. It is designed to be as portable as
6+
possible and does not make any assumptions about IO.
7+
"""
8+
maintainer: ["Rudi Grinberg <[email protected]>"]
9+
authors: [
10+
"Andrey Popp <[email protected]>"
11+
"Rusty Key <[email protected]>"
12+
"Louis Roché <[email protected]>"
13+
"Oleksiy Golovko <[email protected]>"
14+
"Rudi Grinberg <[email protected]>"
15+
"Sacha Ayoun <[email protected]>"
16+
"cannorin <[email protected]>"
17+
"Ulugbek Abdullaev <[email protected]>"
18+
"Thibaut Mattio <[email protected]>"
19+
"Max Lantas <[email protected]>"
20+
]
21+
license: "ISC"
22+
homepage: "https://github.com/ocaml/ocaml-lsp"
23+
bug-reports: "https://github.com/ocaml/ocaml-lsp/issues"
24+
depends: [
25+
"dune" {>= "3.0"}
26+
"jsonrpc" {= version}
27+
"yojson" {< "3.0.0"}
28+
"ppx_yojson_conv_lib" {>= "v0.14"}
29+
"cinaps" {with-test}
30+
"ppx_expect" {>= "v0.17.0" & with-test}
31+
"uutf" {>= "1.0.2"}
32+
"odoc" {with-doc}
33+
"ocaml" {>= "4.14"}
34+
"ppx_yojson_conv" {with-dev-setup}
35+
]
36+
dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git"
37+
build: [
38+
["dune" "subst"] {dev}
39+
[
40+
"dune"
41+
"build"
42+
"-p"
43+
name
44+
"-j"
45+
jobs
46+
"@install"
47+
"@doc" {with-doc}
48+
]
49+
]
50+
51+
x-maintenance-intent: [ "(latest)" ]
52+
url {
53+
src:
54+
"https://github.com/ocaml/ocaml-lsp/releases/download/1.23.0/lsp-1.23.0.tbz"
55+
checksum: [
56+
"sha256=7f2bd023b54a80eace16286d28891c1360768946052c939918a8a9cd95340e7d"
57+
"sha512=f5d62f19646923b0e54a23516539b949dd434178b98cf3a6f1fdaf6bba3c277aa4b93c57a2d8f9a6d9d75d7c514b4a2616a8593e01cd17331986d4e3392ef96e"
58+
]
59+
}
60+
x-commit-hash: "4483b5b9cb3c58d09cfd113394f3ced8fea11f50"

‎packages/merlin-lib/merlin-lib.5.5-503/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+
x-maintenance-intent: ["(latest)"]
9+
build: [
10+
["dune" "subst"] {dev}
11+
["dune" "build" "-p" name "-j" jobs]
12+
]
13+
depends: [
14+
"ocaml" {>="5.3" & <"5.4"}
15+
"dune" {>= "3.0.0"}
16+
"csexp" {>= "1.5.1"}
17+
"alcotest" {with-test & >= "1.3.0" }
18+
"menhir" {dev & >= "20201216"}
19+
"menhirLib" {dev & >= "20201216"}
20+
"menhirSdk" {dev & >= "20201216"}
21+
]
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/v5.5-503/merlin-5.5-503.tbz"
31+
checksum: [
32+
"sha256=67da3b34f2fea07678267309f61da4a2c6f08298de0dc59655b8d30fd8269af1"
33+
"sha512=1fb3b5180d36aa82b82a319e15b743b802b6888f0dc67645baafdb4e18dfc23a7b90064ec9bc42f7424061cf8cde7f8839178d8a8537bf4596759f3ff4891873"
34+
]
35+
}
36+
x-commit-hash: "8b88b89ee7431a23eaf95e4e02e45dc65595aa74"

‎packages/merlin/merlin.5.5-503/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+
x-maintenance-intent: ["(latest)"]
9+
build: [
10+
["dune" "subst"] {dev}
11+
["dune" "build" "-p" name "-j" jobs]
12+
["dune" "runtest" "-p" name "-j" jobs] {with-test}
13+
]
14+
depends: [
15+
"dune" {>= "3.0.0"}
16+
"merlin-lib" {= version}
17+
"dot-merlin-reader" {= version}
18+
"ocaml-index" {>= "1.0" & post}
19+
"yojson" {>= "2.0.0"}
20+
"conf-jq" {with-test}
21+
"ppxlib" {with-test}
22+
]
23+
conflicts: [
24+
"seq" {!= "base"}
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/v5.5-503/merlin-5.5-503.tbz"
76+
checksum: [
77+
"sha256=67da3b34f2fea07678267309f61da4a2c6f08298de0dc59655b8d30fd8269af1"
78+
"sha512=1fb3b5180d36aa82b82a319e15b743b802b6888f0dc67645baafdb4e18dfc23a7b90064ec9bc42f7424061cf8cde7f8839178d8a8537bf4596759f3ff4891873"
79+
]
80+
}
81+
x-commit-hash: "8b88b89ee7431a23eaf95e4e02e45dc65595aa74"

‎packages/ocaml-index/ocaml-index.5.5-503/opam‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
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: ["[email protected]"]
6+
authors: ["[email protected]"]
7+
license: "MIT"
8+
homepage: "https://github.com/ocaml/merlin/ocaml-index"
9+
bug-reports: "https://github.com/ocaml/merlin/issues"
10+
x-maintenance-intent: ["(latest)"]
11+
depends: [
12+
"dune" {>= "3.0.0"}
13+
"ocaml" {>= "5.3"}
14+
"merlin-lib" {= version}
15+
"odoc" {with-doc}
16+
]
17+
build: [
18+
["dune" "subst"] {dev}
19+
[
20+
"dune"
21+
"build"
22+
"-p"
23+
name
24+
"-j"
25+
jobs
26+
"--promote-install-files=false"
27+
"@install"
28+
"@runtest" {with-test}
29+
"@doc" {with-doc}
30+
]
31+
["dune" "install" "-p" name "--create-install-files" name]
32+
]
33+
dev-repo: "git+https://github.com/ocaml/merlin.git"
34+
url {
35+
src:
36+
"https://github.com/ocaml/merlin/releases/download/v5.5-503/merlin-5.5-503.tbz"
37+
checksum: [
38+
"sha256=67da3b34f2fea07678267309f61da4a2c6f08298de0dc59655b8d30fd8269af1"
39+
"sha512=1fb3b5180d36aa82b82a319e15b743b802b6888f0dc67645baafdb4e18dfc23a7b90064ec9bc42f7424061cf8cde7f8839178d8a8537bf4596759f3ff4891873"
40+
]
41+
}
42+
x-commit-hash: "8b88b89ee7431a23eaf95e4e02e45dc65595aa74"

‎packages/ocaml-lsp-server/ocaml-lsp-server.1.22.0/opam‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ depends: [
4444
"csexp" {>= "1.5"}
4545
"ocamlformat-rpc-lib" {>= "0.21.0"}
4646
"odoc" {with-doc}
47-
"merlin-lib" {>= "5.4" & < "6.0"}
47+
"merlin-lib" {>= "5.4" & < "5.5"}
4848
"ocaml-index" {>= "5.4" & < "6.0" & post}
4949
"ppx_yojson_conv" {with-dev-setup}
5050
]

‎packages/ocaml-lsp-server/ocaml-lsp-server.1.23.0/opam‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
opam-version: "2.0"
2+
synopsis: "LSP Server for OCaml"
3+
description: "An LSP server for OCaml."
4+
maintainer: ["Rudi Grinberg <[email protected]>"]
5+
authors: [
6+
"Andrey Popp <[email protected]>"
7+
"Rusty Key <[email protected]>"
8+
"Louis Roché <[email protected]>"
9+
"Oleksiy Golovko <[email protected]>"
10+
"Rudi Grinberg <[email protected]>"
11+
"Sacha Ayoun <[email protected]>"
12+
"cannorin <[email protected]>"
13+
"Ulugbek Abdullaev <[email protected]>"
14+
"Thibaut Mattio <[email protected]>"
15+
"Max Lantas <[email protected]>"
16+
]
17+
license: "ISC"
18+
homepage: "https://github.com/ocaml/ocaml-lsp"
19+
bug-reports: "https://github.com/ocaml/ocaml-lsp/issues"
20+
depends: [
21+
"dune" {>= "3.0"}
22+
"yojson" {< "3.0.0"}
23+
"base" {>= "v0.16.0"}
24+
"lsp" {= version}
25+
"jsonrpc" {= version}
26+
"re" {>= "1.5.0"}
27+
"ppx_yojson_conv_lib" {>= "v0.14"}
28+
"dune-rpc" {>= "3.4.0"}
29+
"chrome-trace" {>= "3.3.0"}
30+
"dyn"
31+
"stdune"
32+
"fiber" {>= "3.1.1" & < "4.0.0"}
33+
"ocaml" {>= "5.3" & < "5.4"}
34+
"xdg"
35+
"ordering"
36+
"dune-build-info"
37+
"spawn"
38+
"astring"
39+
"camlp-streams"
40+
"ppx_expect" {>= "v0.17.0" & with-test}
41+
"ocamlformat" {with-test & = "0.27.0"}
42+
"ocamlc-loc" {>= "3.7.0"}
43+
"pp" {>= "1.1.2"}
44+
"csexp" {>= "1.5"}
45+
"ocamlformat-rpc-lib" {>= "0.21.0"}
46+
"odoc" {with-doc}
47+
"merlin-lib" {>= "5.5" & < "6.0"}
48+
"ppx_yojson_conv" {with-dev-setup}
49+
]
50+
dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git"
51+
build: [
52+
["dune" "subst"] {dev}
53+
[
54+
"dune"
55+
"build"
56+
"-p"
57+
name
58+
"-j"
59+
jobs
60+
"@install"
61+
"@doc" {with-doc}
62+
]
63+
]
64+
65+
x-maintenance-intent: [ "(latest)" ]
66+
url {
67+
src:
68+
"https://github.com/ocaml/ocaml-lsp/releases/download/1.23.0/lsp-1.23.0.tbz"
69+
checksum: [
70+
"sha256=7f2bd023b54a80eace16286d28891c1360768946052c939918a8a9cd95340e7d"
71+
"sha512=f5d62f19646923b0e54a23516539b949dd434178b98cf3a6f1fdaf6bba3c277aa4b93c57a2d8f9a6d9d75d7c514b4a2616a8593e01cd17331986d4e3392ef96e"
72+
]
73+
}
74+
x-commit-hash: "4483b5b9cb3c58d09cfd113394f3ced8fea11f50"

0 commit comments

Comments
 (0)