Update upstream packages

.github/duplicates-upstream-extra.txt

@@ -1,7 +1,3 @@
 ocaml
 ocaml-base-compiler
 ocaml-system
-merlin
-merlin-dot-reader
-ocaml-lsp-server
-ocamlformat-rpc-lib

.github/known-licenses.txt

@@ -16,6 +16,7 @@ LGPL-2.0-only WITH OCaml-LGPL-linking-exception
 LGPL-2.0-or-later WITH OCaml-LGPL-linking-exception
 LGPL-2.1-only WITH OCaml-LGPL-linking-exception
 LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception
+LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception AND BSD-3-Clause
 LGPL-3.0-only WITH OCaml-LGPL-linking-exception
 LGPL-2.1-or-later WITH OpenSSL-linking-exception
 GPL-2.0-or-later

packages/upstream-extra/b0.0.0.4/opam → packages/upstream-extra/b0.0.0.5/opam

@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "b0"
-version: "0.0.4"
+version: "0.0.5"
 synopsis: "Software construction and deployment kit"
 description: """\
 WARNING this package is unstable and work in progress, do not depend on it. 
@@ -40,7 +40,7 @@ depends: [
 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.4.tbz"
+  src: "https://erratique.ch/software/b0/releases/b0-0.0.5.tbz"
   checksum:
-    "sha512=665735c8b7a8674201be765bdd676a18d1e38eff35de9d44c3dc15e2bfed2247e8963c9a32ae62d9ca2d6cd1edebd849aac29fdd5a846c14a30feea3edfc0601"
+    "sha512=00a6868b4dfa34565d0141b335622a81a0e8d5b9e3c6dfad025dabfa3df2db2a1302b492953bbbce30c3a4406c324fcec25250a00b38f6d18a69e15605e3b07e"
 }

packages/upstream-extra/bechamel-notty.0.3.0/opam

@@ -1,27 +1,28 @@
 opam-version: "2.0"
-maintainer:   "Romain Calascibetta <[email protected]>"
-authors:      "Romain Calascibetta <[email protected]>"
-homepage:     "https://github.com/mirage/bechamel"
-bug-reports:  "https://github.com/mirage/bechamel/issues"
-dev-repo:     "git+https://github.com/mirage/bechamel.git"
-doc:          "https://mirage.github.io/bechamel/"
-license:      "MIT"
-synopsis:     "CLI generator for bechamel's output"
-description: """A simple tool to generate a CLI output with notty
+name: "bechamel-notty"
+version: "0.3.0"
+synopsis: "CLI generator for bechamel's output"
+description: """\
+A simple tool to generate a CLI output with notty
 which shows results from bechamel's benchmarks (as core_bench)."""
-
-build: [
-  [ "dune" "build" "-p" name "-j" jobs ]
-  [ "dune" "runtest" "-p" name "-j" jobs ] {with-test}
-]
-
+maintainer: "Romain Calascibetta <[email protected]>"
+authors: "Romain Calascibetta <[email protected]>"
+license: "MIT"
+homepage: "https://github.com/mirage/bechamel"
+doc: "https://mirage.github.io/bechamel/"
+bug-reports: "https://github.com/mirage/bechamel/issues"
 depends: [
-  "ocaml"      {>= "4.08.0"}
-  "dune"       {>= "2.0.0"}
-  "bechamel"   {= version}
+  "ocaml" {>= "4.08.0"}
+  "dune" {>= "2.0.0"}
+  "bechamel" {= version}
   "notty"
-  "fmt"        {>= "0.9.0"}
+  "fmt" {>= "0.9.0"}
+]
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
+dev-repo: "git+https://github.com/mirage/bechamel.git"
 url {
   src:
     "https://github.com/mirage/bechamel/releases/download/v0.3.0/bechamel-0.3.0.tbz"

packages/upstream-extra/bechamel.0.3.0/opam

@@ -1,28 +1,29 @@
 opam-version: "2.0"
-maintainer:   "Romain Calascibetta <[email protected]>"
-authors:      "Romain Calascibetta <[email protected]>"
-homepage:     "https://github.com/mirage/bechamel"
-bug-reports:  "https://github.com/mirage/bechamel/issues"
-dev-repo:     "git+https://github.com/mirage/bechamel.git"
-doc:          "https://mirage.github.io/bechamel/"
-license:      "MIT"
-synopsis:     "Yet Another Benchmark in OCaml"
-description: """BEnchmark for a CHAMEL/camel/caml which
+name: "bechamel"
+version: "0.3.0"
+synopsis: "Yet Another Benchmark in OCaml"
+description: """\
+BEnchmark for a CHAMEL/camel/caml which
 is agnostic to the system. It's a micro-benchmark tool
 which lets the user to re-analyzes and prints samples."""
-
-build: [
-  [ "dune" "build" "-p" name "-j" jobs ]
-  [ "dune" "runtest" "-p" name "-j" jobs ] {with-test}
-]
-
+maintainer: "Romain Calascibetta <[email protected]>"
+authors: "Romain Calascibetta <[email protected]>"
+license: "MIT"
+homepage: "https://github.com/mirage/bechamel"
+doc: "https://mirage.github.io/bechamel/"
+bug-reports: "https://github.com/mirage/bechamel/issues"
 depends: [
-  "ocaml"      {>= "4.08.0"}
-  "dune"       {>= "2.0.0"}
-  "fmt"        {>= "0.9.0"}
+  "ocaml" {>= "4.08.0"}
+  "dune" {>= "2.0.0"}
+  "fmt" {>= "0.9.0"}
   "base-bytes"
   "stdlib-shims"
 ]
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+]
+dev-repo: "git+https://github.com/mirage/bechamel.git"
 url {
   src:
     "https://github.com/mirage/bechamel/releases/download/v0.3.0/bechamel-0.3.0.tbz"

packages/upstream-extra/calendar.2.04/opam

@@ -8,7 +8,7 @@ license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 homepage: "http://calendar.forge.ocamlcore.org/"
 bug-reports: "https://github.com/ocaml-community/calendar/issues"
 depends: [
-  "ocaml" {>= "3.09"}
+  "ocaml" {>= "3.09" & < "5.0"}
   "ocamlfind" {build}
 ]
 flags: light-uninstall

packages/upstream-extra/chrome-trace.3.7.0/opam → packages/upstream-extra/chrome-trace.3.10.0/opam

@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "chrome-trace"
-version: "3.7.0"
+version: "3.10.0"
 synopsis: "Chrome trace event generation library"
 description:
   "This library offers no backwards compatibility guarantees. Use at your own risk."
@@ -23,10 +23,11 @@ build: [
 ]
 dev-repo: "git+https://github.com/ocaml/dune.git"
 url {
-  src: "https://github.com/ocaml/dune/releases/download/3.7.0/dune-3.7.0.tbz"
+  src:
+    "https://github.com/ocaml/dune/releases/download/3.10.0/dune-3.10.0.tbz"
   checksum: [
-    "sha256=e2d637c9d080318fedf5e71d2a29fb367624f82ac4a26e83df2b3a03550528b8"
-    "sha512=586e47ee45cd53a8c13095bde0b47de99aad9462d0a52199362140b5b654ca862597fa9f27f729a8cc594684ac46858848f9fa76f8f06dc8dc8ab8b1186a3295"
+    "sha256=9ff03384a98a8df79852cc674f0b4738ba8aec17029b6e2eeb514f895e710355"
+    "sha512=8133cdcc5499a6bf21cd65b4fc8b12445ae39366731006773fcd3b348c553a8d89d004db161c655aa167a2a3653b7919d32b27f29217106ef762bd01b43afc76"
   ]
 }
-x-commit-hash: "d3d628f2eda2278bd2df6e37452d8693f367fcfd"
+x-commit-hash: "fc382520272012638088848d7f3dd1ef6687a284"

packages/upstream-extra/cinaps.v0.15.1/opam

@@ -1,32 +1,30 @@
 opam-version: "2.0"
+name: "cinaps"
+version: "v0.15.1"
+synopsis: "Trivial metaprogramming tool"
+description: """\
+Cinaps is a trivial Metaprogramming tool using the OCaml toplevel.  It
+is based on the same idea as expectation tests. The user write some
+OCaml code inside special comments and cinaps make sure that what
+follows is what is printed by the OCaml code."""
 maintainer: "Jane Street developers"
-authors: ["Jane Street Group, LLC"]
+authors: "Jane Street Group, LLC"
+license: "MIT"
 homepage: "https://github.com/ocaml-ppx/cinaps"
 bug-reports: "https://github.com/ocaml-ppx/cinaps/issues"
-dev-repo: "git+https://github.com/ocaml-ppx/cinaps.git"
-license: "MIT"
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-]
 depends: [
   "ocaml" {>= "4.04"}
   "dune" {>= "2.0.0"}
-  "re"   {>= "1.8.0"}
+  "re" {>= "1.8.0"}
   "base-unix"
 ]
-synopsis: "Trivial metaprogramming tool"
-description: "
-Cinaps is a trivial Metaprogramming tool using the OCaml toplevel.  It
-is based on the same idea as expectation tests. The user write some
-OCaml code inside special comments and cinaps make sure that what
-follows is what is printed by the OCaml code.
-"
-x-commit-hash: "86f2f05c4605572022cdb794c5542d220fb14be5"
+build: ["dune" "build" "-p" name "-j" jobs]
+dev-repo: "git+https://github.com/ocaml-ppx/cinaps.git"
 url {
-  src:
-    "https://github.com/ocaml-ppx/cinaps/archive/v0.15.1.tar.gz"
+  src: "https://github.com/ocaml-ppx/cinaps/archive/v0.15.1.tar.gz"
   checksum: [
     "sha256=1be18e70f5d8a6b03566c3619b62836a26094fc7208fde46ab7b32ee64116170"
     "sha512=ca53a9da8aa71ce7cddf7e24778e9c4d3f3e5784209da85a5a6b2d5af83cd8ad769fbe3009d2757ebf4a25ca39d76af00ebc693b1b01c3b53c8775ea479123a5"
   ]
 }
+x-commit-hash: "86f2f05c4605572022cdb794c5542d220fb14be5"

packages/upstream-extra/conf-jq.1/opam

@@ -17,7 +17,7 @@ depexts: [
   ["jq"] {os-distribution = "rhel"}
   ["epel-release" "jq"] {os-distribution = "centos"}
   ["jq"] {os-distribution = "alpine"}
-  ["jq"] {os-family = "suse"}
+  ["jq"] {os-family = "suse" | os-family = "opensuse"}
   ["jq"] {os-distribution = "ol"}
   ["jq"] {os-distribution = "arch"}
   ["jq"] {os = "freebsd"}

packages/upstream-extra/conf-xen.1/opam

@@ -6,7 +6,7 @@ description:
   "This package can only install if the Xen headers are installed on the system."
 maintainer: "[email protected]"
 authors: "[email protected]"
-license: "GPL-2.0-only AND LGPL-3.0-only"
+license: ["GPL-2.0-only" "LGPL-3.0-only"]
 homepage: "https://xenproject.org/"
 bug-reports: "https://github.com/ocaml/opam-repository/issues"
 available: os != "macos"
@@ -19,7 +19,7 @@ depexts: [
   ["xen-devel"] {os-distribution = "fedora"}
   ["xen-devel"] {os-distribution = "rhel"}
   ["xen-devel"] {os-distribution = "ol"}
-  ["xen-devel"] {os-family = "suse"}
+  ["xen-devel"] {os-family = "suse" | os-family = "opensuse"}
   ["xen-dom0-libs-devel" "xen-libs-devel"] {os = "xenserver"}
   ["xenstore"] {os-distribution = "arch"}
   ["xen-tools"] {os = "freebsd"}

packages/upstream-extra/dot-merlin-reader.4.6/opam → packages/upstream-extra/dot-merlin-reader.4.9/opam

@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "dot-merlin-reader"
-version: "4.6"
+version: "4.9"
 synopsis: "Reads config files for merlin"
 description: """\
 Helper process: reads .merlin files and outputs the normalized content to
@@ -11,9 +11,9 @@ license: "MIT"
 homepage: "https://github.com/ocaml/merlin"
 bug-reports: "https://github.com/ocaml/merlin/issues"
 depends: [
-  "ocaml" {>= "4.08"}
+  "ocaml" {>= "4.08" & < "6.0"}
   "dune" {>= "2.9.0"}
-  "merlin-lib" {>= "4.6"}
+  "merlin-lib" {>= "4.9"}
   "ocamlfind" {>= "1.6.0"}
 ]
 build: [
@@ -23,10 +23,10 @@ build: [
 dev-repo: "git+https://github.com/ocaml/merlin.git"
 url {
   src:
-    "https://github.com/ocaml/merlin/releases/download/v4.6-414/merlin-4.6-414.tbz"
+    "https://github.com/ocaml/merlin/releases/download/v4.9-414/merlin-4.9-414.tbz"
   checksum: [
-    "sha256=02ebd70a3c77d8940163dbe4c40774a448ed145ea84e0ad3d5ff5324410393ce"
-    "sha512=7373fadf05c692c9f054c7fe6a7d4bdfeefe237b9df432024ef9923782ee72e09021c0c3fba869da8347728105cb2d3ff0aa94b0c5eb09811bb25aa8da9fb520"
+    "sha256=e23fc47813591269ff9d27c820988e520a662c89dd0af7ea652b21517499cbfd"
+    "sha512=2199f963368597d10cc197e41ebb883f6a166018c9da3fe259c354550df41b713781003598a2fe5956b0a4ae96f8c07ba33831d3cf6f9d494b731944f87e491e"
   ]
 }
-x-commit-hash: "be753d9412387aedcf32aba88a1be9bcd33d97ba"
+x-commit-hash: "df75a4550704c113ac29505fd68ef9b7893d4bf5"

packages/upstream-extra/fiber.3.7.0/opam

@@ -0,0 +1,41 @@
+opam-version: "2.0"
+name: "fiber"
+version: "3.7.0"
+synopsis: "Dune's monadic structured concurrency library"
+maintainer: "Jane Street Group, LLC <[email protected]>"
+authors: "Jane Street Group, LLC <[email protected]>"
+license: "MIT"
+homepage: "https://github.com/ocaml-dune/fiber"
+bug-reports: "https://github.com/ocaml-dune/fiber/issues"
+depends: [
+  "dune" {>= "3.6"}
+  "ocaml" {>= "4.08"}
+  "ppx_expect" {with-test}
+  "dyn"
+  "stdune"
+  "odoc" {with-doc}
+]
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test & ocaml:version >= "4.13"}
+    "@doc" {with-doc}
+  ]
+]
+dev-repo: "git+https://github.com/ocaml-dune/fiber.git"
+url {
+  src:
+    "https://github.com/ocaml-dune/fiber/releases/download/3.7.0/fiber-lwt-3.7.0.tbz"
+  checksum: [
+    "sha256=8648a15ae93fe6942999ce36887429a3913b62829c4714e520cc0e7a1c3b9682"
+    "sha512=348b28b28ffd87de035e90753f677658e8ad58421caf3ac086e4c0bbab8508fa5fe2f55d137c425afaf790ebcf45291e16d70eac5cb766b6d9786f042b58b19b"
+  ]
+}
+x-commit-hash: "dd66893a530759da26b66bd1c8939fd77f369afb"