Merge branch 'ocaml:master' into opam-publish-algaeff.0.2.1

favonia · web-flow · commit 210c3f45908d · 2022-12-17T01:26:09.000+01:00
diff --git a/packages/jsonrpc/jsonrpc.1.15.0~5.0preview1/opam b/packages/jsonrpc/jsonrpc.1.15.0~5.0preview1/opam
@@ -0,0 +1,48 @@
+opam-version: "2.0"
+synopsis: "Jsonrpc protocol implemenation"
+description: "See https://www.jsonrpc.org/specification"
+maintainer: ["Rudi Grinberg <me@rgrinberg.com>"]
+authors: [
+  "Andrey Popp <8mayday@gmail.com>"
+  "Rusty Key <iam@stfoo.ru>"
+  "Louis Roché <louis@louisroche.net>"
+  "Oleksiy Golovko <alexei.golovko@gmail.com>"
+  "Rudi Grinberg <me@rgrinberg.com>"
+  "Sacha Ayoun <sachaayoun@gmail.com>"
+  "cannorin <cannorin@gmail.com>"
+  "Ulugbek Abdullaev <ulugbekna@gmail.com>"
+  "Thibaut Mattio <thibaut.mattio@gmail.com>"
+  "Max Lantas <mnxndev@outlook.com>"
+]
+license: "ISC"
+homepage: "https://github.com/ocaml/ocaml-lsp"
+bug-reports: "https://github.com/ocaml/ocaml-lsp/issues"
+depends: [
+  "dune" {>= "3.0"}
+  "ocaml" {>= "4.08"}
+  "odoc" {with-doc}
+]
+dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git"
+build: [
+  ["dune" "subst"] {dev}
+  ["ocaml" "unix.cma" "unvendor.ml"]
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@doc" {with-doc}
+  ]
+]
+url {
+  src:
+    "https://github.com/ocaml/ocaml-lsp/releases/download/1.15.0%2B5.0preview1/lsp-1.15.0.5.0preview1.tbz"
+  checksum: [
+    "sha256=e988a9de9a3e809ac1005c1eafd8f5825842edb8e92d05199110b682968c102c"
+    "sha512=a581a81b19b2d33e4ccf45d042b889164965bdefdbba06a5af8959052a0b515ede09fc8d75c25d8795777c61c39a299930fe3dbc3d69a561b6065f6629baa0a6"
+  ]
+}
+x-commit-hash: "a2779a1e8fa244a2d2002fc872f8672f6e7ca067"
diff --git a/packages/llvm/llvm.3.4/opam b/packages/llvm/llvm.3.4/opam
@@ -22,6 +22,10 @@ depends: [
   "ocaml"
   "ocamlbuild" {build}
 ]
+conflicts: [
+  "base-nnp"
+  "ocaml-option-nnpchecker"
+]
 install: ["sh" "./compile.sh" "install" "3.4" make prefix lib]
 synopsis: "The official LLVM binding"
 description: "Note: LLVM should be installed first."
diff --git a/packages/llvm/llvm.3.5/opam b/packages/llvm/llvm.3.5/opam
@@ -22,6 +22,10 @@ depends: [
   "ocaml"
   "ocamlbuild" {build}
 ]
+conflicts: [
+  "base-nnp"
+  "ocaml-option-nnpchecker"
+]
 install: ["sh" "./compile.sh" "install" "3.5" make prefix lib]
 synopsis: "The official LLVM binding"
 description: "Note: LLVM should be installed first."
diff --git a/packages/llvm/llvm.3.6/opam b/packages/llvm/llvm.3.6/opam
@@ -16,6 +16,10 @@ depends: [
   "ounit" {with-test}
   "ocamlbuild" {build}
 ]
+conflicts: [
+  "base-nnp"
+  "ocaml-option-nnpchecker"
+]
 depexts: [
   ["llvm-3.6-dev"] {os-family = "debian"}
   ["homebrew/versions/llvm36"] {os = "macos" & os-distribution = "homebrew"}
diff --git a/packages/llvm/llvm.3.7/opam b/packages/llvm/llvm.3.7/opam
@@ -17,6 +17,10 @@ depends: [
   "ounit" {with-test}
   "ocamlbuild" {build}
 ]
+conflicts: [
+  "base-nnp"
+  "ocaml-option-nnpchecker"
+]
 depexts: [
   ["llvm-3.7-dev"] {os-family = "debian"}
   ["homebrew/versions/llvm37"] {os = "macos" & os-distribution = "homebrew"}
diff --git a/packages/llvm/llvm.3.8/opam b/packages/llvm/llvm.3.8/opam
@@ -19,6 +19,10 @@ depends: [
   "conf-llvm" {build & = "3.8"}
   "conf-python-2-7" {build}
 ]
+conflicts: [
+  "base-nnp"
+  "ocaml-option-nnpchecker"
+]
 synopsis: "The OCaml bindings distributed with LLVM"
 description: "Note: LLVM should be installed first."
 flags: light-uninstall
diff --git a/packages/llvm/llvm.3.9/opam b/packages/llvm/llvm.3.9/opam
@@ -33,6 +33,10 @@ depends: [
   "conf-python-2-7" {build}
   "conf-cmake" {build}
 ]
+conflicts: [
+  "base-nnp"
+  "ocaml-option-nnpchecker"
+]
 synopsis: "The OCaml bindings distributed with LLVM"
 description: "Note: LLVM should be installed first."
 extra-files: [
diff --git a/packages/llvm/llvm.4.0.0/opam b/packages/llvm/llvm.4.0.0/opam
@@ -25,6 +25,10 @@ depends: [
   "conf-python-2-7" {build}
   "conf-cmake" {build}
 ]
+conflicts: [
+  "base-nnp"
+  "ocaml-option-nnpchecker"
+]
 synopsis: "The OCaml bindings distributed with LLVM"
 description: "Note: LLVM should be installed first."
 extra-files: [
diff --git a/packages/llvm/llvm.5.0.0/opam b/packages/llvm/llvm.5.0.0/opam
@@ -26,6 +26,10 @@ depends: [
   "conf-python-2-7" {build}
   "conf-cmake" {build}
 ]
+conflicts: [
+  "base-nnp"
+  "ocaml-option-nnpchecker"
+]
 patches: [
   "fix-shared.patch"
 ]
diff --git a/packages/llvm/llvm.6.0.0/opam b/packages/llvm/llvm.6.0.0/opam
@@ -26,6 +26,10 @@ depends: [
   "conf-python-2-7" {build}
   "conf-cmake" {build}
 ]
+conflicts: [
+  "base-nnp"
+  "ocaml-option-nnpchecker"
+]
 patches: [
   "fix-shared.patch"
 ]
diff --git a/packages/llvm/llvm.7.0.0/opam b/packages/llvm/llvm.7.0.0/opam
@@ -26,6 +26,10 @@ depends: [
   "conf-python-2-7" {build}
   "conf-cmake" {build}
 ]
+conflicts: [
+  "base-nnp"
+  "ocaml-option-nnpchecker"
+]
 patches: [
   "fix-shared.patch"
 ]
diff --git a/packages/llvm/llvm.8.0.0/opam b/packages/llvm/llvm.8.0.0/opam
@@ -21,6 +21,10 @@ depends: [
   "conf-python-2-7" {build}
   "conf-cmake" {build}
 ]
+conflicts: [
+  "base-nnp"
+  "ocaml-option-nnpchecker"
+]
 patches: [
   "fix-shared.patch"
 ]
diff --git a/packages/llvm/llvm.9.0.0/opam b/packages/llvm/llvm.9.0.0/opam
@@ -21,6 +21,10 @@ depends: [
   "conf-python-2-7" {build}
   "conf-cmake" {build}
 ]
+conflicts: [
+  "base-nnp"
+  "ocaml-option-nnpchecker"
+]
 patches: [
   "fix-shared.patch"
 ]
diff --git a/packages/lsp/lsp.1.15.0~5.0preview1/opam b/packages/lsp/lsp.1.15.0~5.0preview1/opam
@@ -0,0 +1,59 @@
+opam-version: "2.0"
+synopsis: "LSP protocol implementation in OCaml"
+description: """
+
+Implementation of the LSP protocol in OCaml. It is designed to be as portable as
+possible and does not make any assumptions about IO.
+"""
+maintainer: ["Rudi Grinberg <me@rgrinberg.com>"]
+authors: [
+  "Andrey Popp <8mayday@gmail.com>"
+  "Rusty Key <iam@stfoo.ru>"
+  "Louis Roché <louis@louisroche.net>"
+  "Oleksiy Golovko <alexei.golovko@gmail.com>"
+  "Rudi Grinberg <me@rgrinberg.com>"
+  "Sacha Ayoun <sachaayoun@gmail.com>"
+  "cannorin <cannorin@gmail.com>"
+  "Ulugbek Abdullaev <ulugbekna@gmail.com>"
+  "Thibaut Mattio <thibaut.mattio@gmail.com>"
+  "Max Lantas <mnxndev@outlook.com>"
+]
+license: "ISC"
+homepage: "https://github.com/ocaml/ocaml-lsp"
+bug-reports: "https://github.com/ocaml/ocaml-lsp/issues"
+depends: [
+  "dune" {>= "3.0"}
+  "jsonrpc" {= version}
+  "yojson"
+  "ppx_yojson_conv_lib" {>= "v0.14"}
+  "cinaps" {with-test}
+  "menhir" {>= "20211230" & with-test}
+  "ppx_expect" {>= "v0.15.0" & with-test}
+  "uutf" {>= "1.0.2"}
+  "odoc" {with-doc}
+  "ocaml" {>= "4.12"}
+]
+dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git"
+build: [
+  ["dune" "subst"] {dev}
+  ["ocaml" "unix.cma" "unvendor.ml"]
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@doc" {with-doc}
+  ]
+]
+url {
+  src:
+    "https://github.com/ocaml/ocaml-lsp/releases/download/1.15.0%2B5.0preview1/lsp-1.15.0.5.0preview1.tbz"
+  checksum: [
+    "sha256=e988a9de9a3e809ac1005c1eafd8f5825842edb8e92d05199110b682968c102c"
+    "sha512=a581a81b19b2d33e4ccf45d042b889164965bdefdbba06a5af8959052a0b515ede09fc8d75c25d8795777c61c39a299930fe3dbc3d69a561b6065f6629baa0a6"
+  ]
+}
+x-commit-hash: "a2779a1e8fa244a2d2002fc872f8672f6e7ca067"
diff --git a/packages/ocaml-lsp-server/ocaml-lsp-server.1.13.2~5.0preview/opam b/packages/ocaml-lsp-server/ocaml-lsp-server.1.13.2~5.0preview/opam
@@ -41,6 +41,7 @@ depends: [
   "odoc" {with-doc}
   "ocaml" {>= "5.0" & < "5.1"}
 ]
+available: false
 dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git"
 build: [
   ["dune" "subst"] {dev}
diff --git a/packages/ocaml-lsp-server/ocaml-lsp-server.1.15.0~5.0preview1/opam b/packages/ocaml-lsp-server/ocaml-lsp-server.1.15.0~5.0preview1/opam
@@ -0,0 +1,64 @@
+opam-version: "2.0"
+synopsis: "LSP Server for OCaml"
+description: "An LSP server for OCaml."
+maintainer: ["Rudi Grinberg <me@rgrinberg.com>"]
+authors: [
+  "Andrey Popp <8mayday@gmail.com>"
+  "Rusty Key <iam@stfoo.ru>"
+  "Louis Roché <louis@louisroche.net>"
+  "Oleksiy Golovko <alexei.golovko@gmail.com>"
+  "Rudi Grinberg <me@rgrinberg.com>"
+  "Sacha Ayoun <sachaayoun@gmail.com>"
+  "cannorin <cannorin@gmail.com>"
+  "Ulugbek Abdullaev <ulugbekna@gmail.com>"
+  "Thibaut Mattio <thibaut.mattio@gmail.com>"
+  "Max Lantas <mnxndev@outlook.com>"
+]
+license: "ISC"
+homepage: "https://github.com/ocaml/ocaml-lsp"
+bug-reports: "https://github.com/ocaml/ocaml-lsp/issues"
+depends: [
+  "dune" {>= "3.0"}
+  "yojson"
+  "re" {>= "1.5.0"}
+  "ppx_yojson_conv_lib" {>= "v0.14"}
+  "dune-rpc" {>= "3.4.0"}
+  "chrome-trace" {>= "3.3.0"}
+  "dyn"
+  "stdune"
+  "fiber" {>= "3.1.1"}
+  "xdg"
+  "ordering"
+  "dune-build-info"
+  "spawn"
+  "ocamlc-loc" {>= "3.5.0" & < "3.7.0"}
+  "omd" {>= "1.3.2" & < "2.0.0~alpha1"}
+  "octavius" {>= "1.2.2"}
+  "uutf" {>= "1.0.2"}
+  "pp" {>= "1.1.2"}
+  "csexp" {>= "1.5"}
+  "ocamlformat-rpc-lib" {>= "0.21.0"}
+  "odoc" {with-doc}
+  "ocaml" {>= "5.0" & < "5.1"}
+]
+dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git"
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-j"
+    jobs
+    "ocaml-lsp-server.install"
+    "--release"
+  ]
+]
+url {
+  src:
+    "https://github.com/ocaml/ocaml-lsp/releases/download/1.15.0%2B5.0preview1/lsp-1.15.0.5.0preview1.tbz"
+  checksum: [
+    "sha256=e988a9de9a3e809ac1005c1eafd8f5825842edb8e92d05199110b682968c102c"
+    "sha512=a581a81b19b2d33e4ccf45d042b889164965bdefdbba06a5af8959052a0b515ede09fc8d75c25d8795777c61c39a299930fe3dbc3d69a561b6065f6629baa0a6"
+  ]
+}
+x-commit-hash: "a2779a1e8fa244a2d2002fc872f8672f6e7ca067"
diff --git a/packages/ocaml-manual/ocaml-manual.5.0.0/opam b/packages/ocaml-manual/ocaml-manual.5.0.0/opam
@@ -0,0 +1,26 @@
+opam-version: "2.0"
+maintainer: "Daniel Bünzli <daniel.buenzl i@erratique.ch>"
+authors: [ "Xavier Leroy"
+           "Damien Doligez"
+           "Alain Frisch"
+           "Jacques Garrigue"
+           "Didier Rémy"
+           "Jérôme Vouillon" ]
+homepage: "http://ocaml.org/"
+doc: "http://caml.inria.fr/pub/docs/manual-ocaml/"
+license: "CC-BY-SA-4.0"
+dev-repo: "git+https://github.com/ocaml/ocaml.git"
+bug-reports: "https://github.com/ocaml/opam-repository/issues"
+install:
+[
+ [ "cp" "-R" "." _:doc ] {os != "win32"}
+ [ "robocopy" "/E" "." _:doc ] {os = "win32"}
+]
+synopsis: "The OCaml system manual"
+depends: [
+  "ocaml" {>= "5.0.0" & < "5.1.0"}
+]
+url {
+  src: "http://caml.inria.fr/distrib/ocaml-5.0/ocaml-5.0-refman-html.tar.gz"
+  checksum: "sha256=ea5cedafd31ee7ce06c6a19c5edc6ff0ab36bec0d60bd374be201e8ae94434a1"
+}
diff --git a/packages/ocaml-options-only-no-flat-float-array/ocaml-options-only-no-flat-float-array.1+bytecode-only/opam b/packages/ocaml-options-only-no-flat-float-array/ocaml-options-only-no-flat-float-array.1+bytecode-only/opam
@@ -0,0 +1,22 @@
+opam-version: "2.0"
+synopsis: "Ensure that OCaml is compiled with no-flat-float-array, and no other custom options"
+depends: [
+  "ocaml-option-no-flat-float-array"
+  "ocaml-option-bytecode-only"
+  "ocaml-variants" {post & >= "5.0.0~~"}
+]
+conflicts: [
+  "ocaml-option-32bit"
+  "ocaml-option-afl"
+  "ocaml-option-default-unsafe-string"
+  "ocaml-option-flambda"
+  "ocaml-option-fp"
+  "ocaml-option-musl"
+  "ocaml-option-spacetime"
+  "ocaml-option-static"
+  "ocaml-option-nnp"
+  "ocaml-option-nnpchecker"
+]
+maintainer: "platform@lists.ocaml.org"
+flags: compiler
+available: arch != "x86_64" & arch != "arm64"
diff --git a/packages/ocaml-options-only-no-flat-float-array/ocaml-options-only-no-flat-float-array.1/opam b/packages/ocaml-options-only-no-flat-float-array/ocaml-options-only-no-flat-float-array.1/opam
@@ -1,6 +1,9 @@
 opam-version: "2.0"
 synopsis: "Ensure that OCaml is compiled with no-flat-float-array, and no other custom options"
-depends: ["ocaml-option-no-flat-float-array"]
+depends: [
+  "ocaml-option-no-flat-float-array"
+  "ocaml-variants" {post & < "5.0.0~~" & arch != "x86_64" & arch != "arm64"}
+]
 conflicts: [
   "ocaml-option-32bit"
   "ocaml-option-afl"
diff --git a/packages/tezos-sapling-parameters/tezos-sapling-parameters.1.1.0/opam b/packages/tezos-sapling-parameters/tezos-sapling-parameters.1.1.0/opam
@@ -0,0 +1,16 @@
+opam-version: "2.0"
+authors: [ "Nomadic Labs <contact@nomadic-labs.com>" ]
+maintainer: "Nomadic Labs <contact@nomadic-labs.com>"
+license: "MIT"
+homepage: "https://gitlab.com/tezos/tezos-sapling-params"
+bug-reports: "https://gitlab.com/tezos/tezos-sapling-params/issues"
+dev-repo: "git+https://gitlab.com/tezos/tezos-sapling-params.git"
+synopsis: "Sapling parameters used in Tezos"
+url {
+  src:
+    "https://gitlab.com/tezos/tezos-sapling-parameters/-/archive/1.1.0/tezos-sapling-parameters-1.1.0.tar.bz2"
+  checksum: [
+    "sha256=effe6fc44ce40f244a14dca41b907f42a84a6d51c45fd3cf9cfae1ec829269ec"
+    "sha512=27674edcb0fbc947703e0220c2c26cc659969975b3c29705d5e4cf2ecabf26e42c61de8578c55cd39058ab119154411585f3886c5bba558c273fdf71e8cefee5"
+  ]
+}

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,10 @@ depends: [`
`26`	`26`	`"conf-python-2-7" {build}`
`27`	`27`	`"conf-cmake" {build}`
`28`	`28`	`]`
	`29`	`+conflicts: [`
	`30`	`+ "base-nnp"`
	`31`	`+ "ocaml-option-nnpchecker"`
	`32`	`+]`
`29`	`33`	`patches: [`
`30`	`34`	`"fix-shared.patch"`
`31`	`35`	`]`