Skip to content

Commit 34d842f

Browse files
mserimseri
authored
Merge pull request ocaml#28070 from voodoos/release-merlin-v4.19-414
[new release] merlin and ocaml-lsp (6 packages) (4.19-414)
2 parents da0f198 + acce3f5 commit 34d842f

File tree

7 files changed

+332
-1
lines changed
  • packages
    • dot-merlin-reader/dot-merlin-reader.4.19-414
    • jsonrpc/jsonrpc.1.21.0-4.14
    • lsp/lsp.1.21.0-4.14
    • merlin-lib/merlin-lib.4.19-414
    • merlin/merlin.4.19-414
    • ocaml-lsp-server
      • ocaml-lsp-server.1.20.1-4.14
      • ocaml-lsp-server.1.21.0-4.14

7 files changed

+332
-1
lines changed

‎packages/dot-merlin-reader/dot-merlin-reader.4.19-414/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.14"}
15+
"dune" {>= "3.0.0"}
16+
"merlin-lib" {= version}
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.19-414/merlin-4.19-414.tbz"
25+
checksum: [
26+
"sha256=60a630f59203a9ce7047a5f04d0f239945960dac6f38102922e328b6d2657384"
27+
"sha512=19f8ec152356873e29c05b971a529146bb7079929037c2b35a5c0afb0b3adf662341ee8527282c5fdd16de391d01c2c469fc8629af9e0ae443fa9f42472b70bb"
28+
]
29+
}
30+
x-commit-hash: "de2dc6fc7863b1624e7dbb9c6af6a6fb9b30c644"

‎packages/jsonrpc/jsonrpc.1.21.0-4.14/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.21.0-4.14/lsp-1.21.0-4.14.tbz"
44+
checksum: [
45+
"sha256=f2de91772b72116d4746e1208c28ebe61a09e000313c9af92a0616df639637ec"
46+
"sha512=bc823d8b60b4fa31f75fb25edda405a016b621a676bde5f3d44b484e0ed67a91a885f19918a2a1d7c299823fac9900c5db9beb2c37d3a5dfe8f3ef78a40999fe"
47+
]
48+
}
49+
x-commit-hash: "4fb73155251d669f21bcfef14ba2a1890869a11b"

‎packages/lsp/lsp.1.21.0-4.14/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.15.0" & < "0.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.21.0-4.14/lsp-1.21.0-4.14.tbz"
55+
checksum: [
56+
"sha256=f2de91772b72116d4746e1208c28ebe61a09e000313c9af92a0616df639637ec"
57+
"sha512=bc823d8b60b4fa31f75fb25edda405a016b621a676bde5f3d44b484e0ed67a91a885f19918a2a1d7c299823fac9900c5db9beb2c37d3a5dfe8f3ef78a40999fe"
58+
]
59+
}
60+
x-commit-hash: "4fb73155251d669f21bcfef14ba2a1890869a11b"

‎packages/merlin-lib/merlin-lib.4.19-414/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" {>= "4.14" & < "4.15"}
15+
"dune" {>= "2.9.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/v4.19-414/merlin-4.19-414.tbz"
31+
checksum: [
32+
"sha256=60a630f59203a9ce7047a5f04d0f239945960dac6f38102922e328b6d2657384"
33+
"sha512=19f8ec152356873e29c05b971a529146bb7079929037c2b35a5c0afb0b3adf662341ee8527282c5fdd16de391d01c2c469fc8629af9e0ae443fa9f42472b70bb"
34+
]
35+
}
36+
x-commit-hash: "de2dc6fc7863b1624e7dbb9c6af6a6fb9b30c644"

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

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
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+
"ocaml" {>= "4.14" & < "4.15"}
16+
"dune" {>= "2.9.0"}
17+
"merlin-lib" {= version}
18+
"dot-merlin-reader" {>= "4.17.1"}
19+
"yojson" {>= "2.0.0"}
20+
"conf-jq" {with-test}
21+
"ppxlib" {with-test}
22+
]
23+
conflicts: [
24+
"seq" {!= "base"}
25+
"base-effects"
26+
]
27+
synopsis:
28+
"Editor helper, provides completion, typing and source browsing in Vim and Emacs"
29+
description:
30+
"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."
31+
post-messages: [
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+
"
72+
{success & !user-setup:installed}
73+
]
74+
url {
75+
src:
76+
"https://github.com/ocaml/merlin/releases/download/v4.19-414/merlin-4.19-414.tbz"
77+
checksum: [
78+
"sha256=60a630f59203a9ce7047a5f04d0f239945960dac6f38102922e328b6d2657384"
79+
"sha512=19f8ec152356873e29c05b971a529146bb7079929037c2b35a5c0afb0b3adf662341ee8527282c5fdd16de391d01c2c469fc8629af9e0ae443fa9f42472b70bb"
80+
]
81+
}
82+
x-commit-hash: "de2dc6fc7863b1624e7dbb9c6af6a6fb9b30c644"

‎packages/ocaml-lsp-server/ocaml-lsp-server.1.20.1-4.14/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" {>= "4.18" & < "5.0"}
47+
"merlin-lib" {>= "4.18" & < "4.19"}
4848
]
4949
dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git"
5050
build: [

‎packages/ocaml-lsp-server/ocaml-lsp-server.1.21.0-4.14/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.7.2"}
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" {>= "4.14.0" & < "5.0"}
34+
"xdg"
35+
"ordering"
36+
"dune-build-info"
37+
"spawn"
38+
"astring"
39+
"camlp-streams"
40+
"ppx_expect" {>= "v0.15.0" & < "0.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" {>= "4.19" & < "5.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.21.0-4.14/lsp-1.21.0-4.14.tbz"
69+
checksum: [
70+
"sha256=f2de91772b72116d4746e1208c28ebe61a09e000313c9af92a0616df639637ec"
71+
"sha512=bc823d8b60b4fa31f75fb25edda405a016b621a676bde5f3d44b484e0ed67a91a885f19918a2a1d7c299823fac9900c5db9beb2c37d3a5dfe8f3ef78a40999fe"
72+
]
73+
}
74+
x-commit-hash: "4fb73155251d669f21bcfef14ba2a1890869a11b"

0 commit comments

Comments
 (0)