Merge branch 'ocaml:master' into master

packages/archetype/archetype.1.4.3/opam

@@ -0,0 +1,56 @@
+# This file is generated by dune, edit dune-project instead
+opam-version: "2.0"
+synopsis: "Archetype language compiler"
+description: """
+Archetype is a general purpose language to develop smart contracts
+on the Tezos blockchain, with a specific focus on contract security
+"""
+maintainer: ["The Archetype development team <[email protected]>"]
+authors: [
+  "Benoit Rognier <[email protected]>"
+  "Guillaume Duhamel <[email protected]>"
+  "Pierre-Yves Strub <[email protected]>"
+]
+license: "MIT"
+homepage: "https://archetype-lang.org"
+doc: "https://archetype-lang.org"
+bug-reports: "https://github.com/completium/archetype-lang/issues"
+depends: [
+  "dune" {>= "2.7"}
+  "ocaml" {>= "4.08.0"}
+  "menhir" {>= "20180523"}
+  "num"
+  "yojson" {>= "1.6.0"}
+  "ppx_deriving"
+  "ppx_deriving_yojson"
+  "uri"
+  "visitors" {>= "20200207"}
+  "js_of_ocaml" {>= "3.9.0"}
+  "js_of_ocaml-ppx" {>= "3.9.0"}
+  "hex" {>= "1.4.0"}
+  "xmlm"
+  "alcotest"
+  "odoc" {with-doc}
+]
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+]
+dev-repo: "git+https://github.com/completium/archetype-lang.git"
+url {
+  src: "https://github.com/completium/archetype-lang/archive/1.4.3.tar.gz"
+  checksum: [
+    "md5=056be0abf0b3855e73a7a63264ccfa86"
+    "sha512=82a146f1390808f5409ee97b31c4faad39e87eefc77f29f00e2a17fc267394e6d53e8c790e9cdde749d5acc402c53f56f0b595c40285b87d0998fbddbefdaa5d"
+  ]
+}

packages/b0/b0.0.0.5/opam

@@ -0,0 +1,44 @@
+opam-version: "2.0"
+synopsis: "Software construction and deployment kit"
+description: """\
+WARNING this package is unstable and work in progress, do not depend on it. 
+
+B0 describes software construction and deployments using modular and
+customizable definitions written in OCaml.
+
+B0 describes:
+
+* Build environments.
+* Software configuration, build and testing.
+* Source and binary deployments.
+* Software life-cycle procedures.
+
+B0 also provides the B00 build library which provides abitrary build
+abstraction with reliable and efficient incremental rebuilds. The B00
+library can be – and has been – used on its own to devise domain
+specific build systems.
+
+B0 is distributed under the ISC license. It depends on [cmdliner][cmdliner].
+
+[cmdliner]: https://erratique.ch/software/cmdliner"""
+maintainer: "Daniel Bünzli <daniel.buenzl [email protected]>"
+authors: "The b0 programmers"
+license: ["ISC" "BSD-2-Clause"]
+tags: ["dev" "org:erratique" "org:b0-system" "build"]
+homepage: "https://erratique.ch/software/b0"
+doc: "https://erratique.ch/software/b0/doc"
+bug-reports: "https://github.com/b0-system/b0/issues"
+depends: [
+  "ocaml" {>= "4.08.0"}
+  "ocamlfind" {build}
+  "ocamlbuild" {build}
+  "topkg" {build & >= "1.0.3"}
+  "cmdliner" {>= "1.1.0"}
+]
+build: ["ocaml" "pkg/pkg.ml" "build" "--dev-pkg" "%{dev}%"]
+dev-repo: "git+https://erratique.ch/repos/b0.git"
+url {
+  src: "https://erratique.ch/software/b0/releases/b0-0.0.5.tbz"
+  checksum:
+    "sha512=00a6868b4dfa34565d0141b335622a81a0e8d5b9e3c6dfad025dabfa3df2db2a1302b492953bbbce30c3a4406c324fcec25250a00b38f6d18a69e15605e3b07e"
+}

packages/benchpress/benchpress.0.1/opam

@@ -15,7 +15,7 @@ depends: [
   "cmdliner"
   "iter" { >= "1.0" } # TODO: remove
   "logs"
-  "uuidm"
+  "uuidm" {>= "0.9.6"}
   "base64"
   "ocaml-protoc" { >= "2.0" & < "3.0" }
   "gnuplot" { >= "0.6" & < "0.8" }
@@ -24,6 +24,7 @@ depends: [
   "printbox" { >= "0.5" & < "0.6" }
   "decoders" { >= "0.3.0" & < "0.4" }
   "ocaml" {>= "4.03" }
+  "result"
 ]
 homepage: "https://github.com/sneeuwballen/benchpress/"
 dev-repo: "git+https://github.com/sneeuwballen/benchpress.git"

packages/chrome-trace/chrome-trace.3.8.0/opam

@@ -0,0 +1,39 @@
+opam-version: "2.0"
+synopsis: "Chrome trace event generation library"
+description:
+  "This library offers no backwards compatibility guarantees. Use at your own risk."
+maintainer: ["Jane Street Group, LLC <[email protected]>"]
+authors: ["Jane Street Group, LLC <[email protected]>"]
+license: "MIT"
+homepage: "https://github.com/ocaml/dune"
+doc: "https://dune.readthedocs.io/"
+bug-reports: "https://github.com/ocaml/dune/issues"
+depends: [
+  "dune" {>= "3.5"}
+  "ocaml" {>= "4.08.0"}
+  "odoc" {with-doc}
+]
+dev-repo: "git+https://github.com/ocaml/dune.git"
+build: [
+  ["dune" "subst"] {dev}
+  ["rm" "-rf" "vendor/csexp"]
+  ["rm" "-rf" "vendor/pp"]
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@doc" {with-doc}
+  ]
+]
+url {
+  src: "https://github.com/ocaml/dune/releases/download/3.8.0/dune-3.8.0.tbz"
+  checksum: [
+    "sha256=f7e2970bfab99c7766ff1a05deff5ad7f82cb2471abca6f72449572293f5f6b4"
+    "sha512=3b3a566f63842c314de2c0a660c5f7714bc90f8303c82d82e3021aee84980eff1886d15c9b9d4ea0047a411d799fb39d5f2ea70a92bdeb629e00d3d5d5f2d994"
+  ]
+}
+x-commit-hash: "d62f4c39748e2498fc99a398f5e0667761687bf7"

packages/chrome-trace/chrome-trace.3.8.1/opam

@@ -0,0 +1,39 @@
+opam-version: "2.0"
+synopsis: "Chrome trace event generation library"
+description:
+  "This library offers no backwards compatibility guarantees. Use at your own risk."
+maintainer: ["Jane Street Group, LLC <[email protected]>"]
+authors: ["Jane Street Group, LLC <[email protected]>"]
+license: "MIT"
+homepage: "https://github.com/ocaml/dune"
+doc: "https://dune.readthedocs.io/"
+bug-reports: "https://github.com/ocaml/dune/issues"
+depends: [
+  "dune" {>= "3.5"}
+  "ocaml" {>= "4.08.0"}
+  "odoc" {with-doc}
+]
+dev-repo: "git+https://github.com/ocaml/dune.git"
+build: [
+  ["dune" "subst"] {dev}
+  ["rm" "-rf" "vendor/csexp"]
+  ["rm" "-rf" "vendor/pp"]
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@doc" {with-doc}
+  ]
+]
+url {
+  src: "https://github.com/ocaml/dune/releases/download/3.8.1/dune-3.8.1.tbz"
+  checksum: [
+    "sha256=9413a5d6eb9d7968a0463debb9d9f1be73025345809b827978d0c14db76cf914"
+    "sha512=6857b64e7ca8ba452937539d5996c8d0941b25d82313cfad9e1e6b835a04fb86605beccdc86400cc705ad6a969171524091ab6981df87629b542cc172b38746b"
+  ]
+}
+x-commit-hash: "a340b806a6ec2da97c481c64011bfab7b71213a8"

packages/conf-capnproto/conf-capnproto.2/opam

@@ -23,6 +23,7 @@ depexts: [
   ["capnp"] {os-distribution = "homebrew" & os = "macos"}
   ["capnproto"] {os-distribution = "macports" & os = "macos"}
   ["capnproto" "libcapnp-devel"] {os-family = "suse"}
+  ["capnproto" "libcapnp-devel"] {os-family = "opensuse"}
   ["capnproto"] {os = "freebsd"}
 ]
 x-ci-accept-failures: [

packages/conf-fts/conf-fts.1/opam

@@ -11,5 +11,6 @@ build: [
 ]
 flags: conf
 depexts: [
-  ["fts-dev"] {os-distribution = "alpine"}
+  ["fts-dev"] {os-distribution = "alpine" & os-version < "3.17"}
+  ["musl-fts-dev"] {os-distribution = "alpine" & os-version >= "3.17"}
 ]

packages/doculib/doculib.1.3.1/opam

@@ -12,7 +12,7 @@ bug-reports: "https://github.com/nguermond/doculib/issues"
 depends: [
   "dune" {>= "2.9"}
   "cohttp-lwt-unix" {>= "2.5.0"}
-  "metadb" {>= "1.0.1"}
+  "metadb" {= "1.0.1"}
   "lablgtk3" {>= "3.1.2"}
   "ocaml" {>= "4.12.0"}
   "tls" {>= "0.13.0"}

packages/doculib/doculib.1.3.5/opam

@@ -0,0 +1,45 @@
+# This file is generated by dune, edit dune-project instead
+opam-version: "2.0"
+synopsis:
+  "A GUI for tagging and managing document metadata for books, textbooks, or articles"
+description:
+  "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."
+maintainer: ["[email protected]"]
+authors: ["Nathan Guermond"]
+license: "GPL-3.0-or-later"
+homepage: "https://github.com/nguermond/doculib"
+bug-reports: "https://github.com/nguermond/doculib/issues"
+depends: [
+  "dune" {>= "2.9"}
+  "cohttp-lwt-unix" {>= "2.5.0"}
+  "metadb" {= "1.0.2"}
+  "lablgtk3" {>= "3.1.2"}
+  "ocaml" {>= "4.13.0"}
+  "ocamlgraph" {>= "1.8.1"}
+  "tls-lwt"
+  "odoc" {with-doc}
+]
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "--promote-install-files=false"
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+  ["dune" "install" "-p" name "--create-install-files" name]
+]
+dev-repo: "git+https://github.com/nguermond/doculib.git"
+url {
+  src: "https://github.com/nguermond/doculib/archive/v1.3.5.tar.gz"
+  checksum: [
+    "md5=9477d43b91aa8ee8ba26de8c19cb6388"
+    "sha512=492341c7eab448e92a23bfadeed11b74c67b147c00d67bf195e276e19cfdef7b6225d7431c984bab1deb2b05133f4ec79119d7a1568ac933768e4d68cd4e72f4"
+  ]
+}

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

@@ -13,7 +13,7 @@ build: [
 depends: [
   "ocaml" {>= "4.08"}
   "dune" {>= "2.9.0"}
-  "merlin-lib" {>= "4.6"}
+  "merlin-lib" {>= "4.6" & < "4.9"}
   "ocamlfind" {>= "1.6.0"}
 ]
 description:

packages/dot-merlin-reader/dot-merlin-reader.4.9/opam

@@ -0,0 +1,30 @@
+opam-version: "2.0"
+maintainer:   "[email protected]"
+authors:      "The Merlin team"
+synopsis:     "Reads config files for merlin"
+homepage:     "https://github.com/ocaml/merlin"
+bug-reports:  "https://github.com/ocaml/merlin/issues"
+dev-repo:     "git+https://github.com/ocaml/merlin.git"
+license:      "MIT"
+build: [
+  ["dune" "subst"] {dev}
+  ["dune" "build" "-p" name "-j" jobs]
+]
+depends: [
+  "ocaml" {>= "4.08" & < "6.0"}
+  "dune" {>= "2.9.0"}
+  "merlin-lib" {>= "4.9"}
+  "ocamlfind" {>= "1.6.0"}
+]
+description:
+  "Helper process: reads .merlin files and outputs the normalized content to
+  stdout."
+url {
+  src:
+    "https://github.com/ocaml/merlin/releases/download/v4.9-414/merlin-4.9-414.tbz"
+  checksum: [
+    "sha256=e23fc47813591269ff9d27c820988e520a662c89dd0af7ea652b21517499cbfd"
+    "sha512=2199f963368597d10cc197e41ebb883f6a166018c9da3fe259c354550df41b713781003598a2fe5956b0a4ae96f8c07ba33831d3cf6f9d494b731944f87e491e"
+  ]
+}
+x-commit-hash: "df75a4550704c113ac29505fd68ef9b7893d4bf5"

packages/dune-action-plugin/dune-action-plugin.3.8.0/opam

@@ -0,0 +1,52 @@
+opam-version: "2.0"
+synopsis: "[experimental] API for writing dynamic Dune actions"
+description: """
+
+This library is experimental. No backwards compatibility is implied.
+
+dune-action-plugin provides an API for writing dynamic Dune actions.
+Dynamic dune actions do not need to declare their dependencies
+upfront; they are instead discovered automatically during the
+execution of the action.
+"""
+maintainer: ["Jane Street Group, LLC <[email protected]>"]
+authors: ["Jane Street Group, LLC <[email protected]>"]
+license: "MIT"
+homepage: "https://github.com/ocaml/dune"
+doc: "https://dune.readthedocs.io/"
+bug-reports: "https://github.com/ocaml/dune/issues"
+depends: [
+  "dune" {>= "3.5"}
+  "dune-glob" {= version}
+  "csexp" {>= "1.5.0"}
+  "ppx_expect" {with-test}
+  "stdune" {= version}
+  "dune-private-libs" {= version}
+  "dune-rpc" {= version}
+  "base-unix"
+  "odoc" {with-doc}
+]
+dev-repo: "git+https://github.com/ocaml/dune.git"
+build: [
+  ["dune" "subst"] {dev}
+  ["rm" "-rf" "vendor/csexp"]
+  ["rm" "-rf" "vendor/pp"]
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@doc" {with-doc}
+  ]
+]
+url {
+  src: "https://github.com/ocaml/dune/releases/download/3.8.0/dune-3.8.0.tbz"
+  checksum: [
+    "sha256=f7e2970bfab99c7766ff1a05deff5ad7f82cb2471abca6f72449572293f5f6b4"
+    "sha512=3b3a566f63842c314de2c0a660c5f7714bc90f8303c82d82e3021aee84980eff1886d15c9b9d4ea0047a411d799fb39d5f2ea70a92bdeb629e00d3d5d5f2d994"
+  ]
+}
+x-commit-hash: "d62f4c39748e2498fc99a398f5e0667761687bf7"