Skip to content

Commit 6f5cb9f

Browse files
dkalinichenko-jsdkalinichenko-js
authored
Merge branch 'ocaml:master' into janestreet-v0.16-core
2 parents 1ab1a4b + c2772f0 commit 6f5cb9f

File tree

36 files changed

+1085
-12
lines changed
  • packages
    • doculib
    • dot-merlin-reader
      • dot-merlin-reader.4.6
      • dot-merlin-reader.4.9
    • lacaml/lacaml.11.0.10
    • merlin-lib
      • merlin-lib.4.9-414
      • merlin-lib.4.9-500
    • merlin
    • nlopt-ocaml
    • nlopt/nlopt.0.6.1
    • ocaml-options-vanilla/ocaml-options-vanilla.1
    • ocamlformat-rpc/ocamlformat-rpc.removed
    • opam-client/opam-client.2.1.5
    • opam-core/opam-core.2.1.5
    • opam-devel/opam-devel.2.1.5
    • opam-format/opam-format.2.1.5
    • opam-installer/opam-installer.2.1.5
    • opam-repository/opam-repository.2.1.5
    • opam-solver/opam-solver.2.1.5
    • opam-state/opam-state.2.1.5
    • xapi-stdext-date/xapi-stdext-date.4.22.0
    • xapi-stdext-encodings/xapi-stdext-encodings.4.22.0
    • xapi-stdext-pervasives/xapi-stdext-pervasives.4.22.0
    • xapi-stdext-std/xapi-stdext-std.4.22.0
    • xapi-stdext-threads/xapi-stdext-threads.4.22.0
    • xapi-stdext-unix
      • xapi-stdext-unix.4.19.0
      • xapi-stdext-unix.4.20.0
      • xapi-stdext-unix.4.21.0
      • xapi-stdext-unix.4.22.0
    • xapi-stdext-zerocheck/xapi-stdext-zerocheck.4.22.0
    • yuujinchou
      • yuujinchou.5.0.0
      • yuujinchou.5.0.1
    • z3/z3.4.12.2

36 files changed

+1085
-12
lines changed

‎packages/doculib/doculib.1.3.1/opam‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ bug-reports: "https://github.com/nguermond/doculib/issues"
1212
depends: [
1313
"dune" {>= "2.9"}
1414
"cohttp-lwt-unix" {>= "2.5.0"}
15-
"metadb" {>= "1.0.1"}
15+
"metadb" {= "1.0.1"}
1616
"lablgtk3" {>= "3.1.2"}
1717
"ocaml" {>= "4.12.0"}
1818
"tls" {>= "0.13.0"}

‎packages/doculib/doculib.1.3.5/opam‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# This file is generated by dune, edit dune-project instead
2+
opam-version: "2.0"
3+
synopsis:
4+
"A GUI for tagging and managing document metadata for books, textbooks, or articles"
5+
description:
6+
"DocuLib manages locally stored libraries of books, textbooks, or articles by keeping track of data such as authors, title, year, tags, and DOI/ISBN. Metadata can be searched through openlibrary.org and semanticscholar.org. DocuLib automatically detects renamed, moved, and duplicate files."
7+
maintainer: ["[email protected]"]
8+
authors: ["Nathan Guermond"]
9+
license: "GPL-3.0-or-later"
10+
homepage: "https://github.com/nguermond/doculib"
11+
bug-reports: "https://github.com/nguermond/doculib/issues"
12+
depends: [
13+
"dune" {>= "2.9"}
14+
"cohttp-lwt-unix" {>= "2.5.0"}
15+
"metadb" {= "1.0.2"}
16+
"lablgtk3" {>= "3.1.2"}
17+
"ocaml" {>= "4.13.0"}
18+
"ocamlgraph" {>= "1.8.1"}
19+
"tls-lwt"
20+
"odoc" {with-doc}
21+
]
22+
build: [
23+
["dune" "subst"] {dev}
24+
[
25+
"dune"
26+
"build"
27+
"-p"
28+
name
29+
"-j"
30+
jobs
31+
"--promote-install-files=false"
32+
"@install"
33+
"@runtest" {with-test}
34+
"@doc" {with-doc}
35+
]
36+
["dune" "install" "-p" name "--create-install-files" name]
37+
]
38+
dev-repo: "git+https://github.com/nguermond/doculib.git"
39+
url {
40+
src: "https://github.com/nguermond/doculib/archive/v1.3.5.tar.gz"
41+
checksum: [
42+
"md5=9477d43b91aa8ee8ba26de8c19cb6388"
43+
"sha512=492341c7eab448e92a23bfadeed11b74c67b147c00d67bf195e276e19cfdef7b6225d7431c984bab1deb2b05133f4ec79119d7a1568ac933768e4d68cd4e72f4"
44+
]
45+
}

‎packages/dot-merlin-reader/dot-merlin-reader.4.6/opam‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ build: [
1313
depends: [
1414
"ocaml" {>= "4.08"}
1515
"dune" {>= "2.9.0"}
16-
"merlin-lib" {>= "4.6"}
16+
"merlin-lib" {>= "4.6" & < "4.9"}
1717
"ocamlfind" {>= "1.6.0"}
1818
]
1919
description:

‎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/lacaml/lacaml.11.0.10/opam‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
opam-version: "2.0"
2+
synopsis: "Lacaml - OCaml-bindings to BLAS and LAPACK"
3+
description: """
4+
Lacaml interfaces the BLAS-library (Basic Linear Algebra Subroutines) and
5+
LAPACK-library (Linear Algebra routines). It also contains many additional
6+
convenience functions for vectors and matrices."""
7+
maintainer: [
8+
"Markus Mottl <[email protected]>"
9+
"Christophe Troestler <[email protected]>"
10+
]
11+
authors: [
12+
"Egbert Ammicht <[email protected]>"
13+
"Patrick Cousot <[email protected]>"
14+
"Sam Ehrlichman <[email protected]>"
15+
"Florent Hoareau <[email protected]>"
16+
"Markus Mottl <[email protected]>"
17+
"Liam Stewart <[email protected]>"
18+
"Christophe Troestler <[email protected]>"
19+
"Oleg Trott <[email protected]>"
20+
"Martin Willensdorfer <[email protected]>"
21+
]
22+
license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception"
23+
tags: ["clib:lapack" "clib:blas"]
24+
homepage: "https://mmottl.github.io/lacaml"
25+
doc: "https://mmottl.github.io/lacaml/api"
26+
bug-reports: "https://github.com/mmottl/lacaml/issues"
27+
depends: [
28+
"dune" {>= "2.7"}
29+
"ocaml" {>= "4.08"}
30+
"dune-configurator"
31+
"conf-blas" {build}
32+
"conf-lapack" {build}
33+
"base-bytes"
34+
"base-bigarray"
35+
"odoc" {with-doc}
36+
]
37+
build: [
38+
["dune" "subst"] {dev}
39+
[
40+
"dune"
41+
"build"
42+
"-p"
43+
name
44+
"-j"
45+
jobs
46+
"@install"
47+
"@runtest" {with-test}
48+
"@doc" {with-doc}
49+
]
50+
]
51+
conflicts: [
52+
"ocaml-option-bytecode-only"
53+
]
54+
dev-repo: "git+https://github.com/mmottl/lacaml.git"
55+
url {
56+
src:
57+
"https://github.com/mmottl/lacaml/releases/download/11.0.10/lacaml-11.0.10.tbz"
58+
checksum: [
59+
"sha256=560e87977d6ed5bbe1d217d653d7aaa08f29199b78621a4645fdee97787e4899"
60+
"sha512=bda36434ca85590921761ce230fb5fcde2ee2dc5ffa0fe1e5fa26e1457fee98fbc905d008dc759e4182c9d3fffef5a28e27239074ba1f36b6e18edf997e45db2"
61+
]
62+
}
63+
x-commit-hash: "8cfabf76de647c3e1004dd8c924be1bce5a132a3"

‎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)