diff --git a/.github/unused-upstream.txt b/.github/unused-upstream.txt
index 2073933f9..8eb408cb9 100644
--- a/.github/unused-upstream.txt
+++ b/.github/unused-upstream.txt
@@ -7,6 +7,7 @@ ocamlformat
 ocamlformat-lib
 ocp-indent
 syslog-message
+trace
 tyre
 tyxml
 uuseg
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 964bb98bc..d4d10708a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ocaml-version: ["4.14.1"]
+        ocaml-version: ["4.14.1", "4.14.2"]
         experimental: [false]
           # include:
           # - ocaml-version: "5.2.0"
diff --git a/packages/ocaml/ocaml-base-compiler.4.14.2/files/ocaml-base-compiler.install b/packages/ocaml/ocaml-base-compiler.4.14.2/files/ocaml-base-compiler.install
new file mode 100644
index 000000000..4f1481379
--- /dev/null
+++ b/packages/ocaml/ocaml-base-compiler.4.14.2/files/ocaml-base-compiler.install
@@ -0,0 +1 @@
+share_root: ["config.cache" {"ocaml/config.cache"}]
diff --git a/packages/ocaml/ocaml-base-compiler.4.14.2/opam b/packages/ocaml/ocaml-base-compiler.4.14.2/opam
new file mode 100644
index 000000000..4fc4e4027
--- /dev/null
+++ b/packages/ocaml/ocaml-base-compiler.4.14.2/opam
@@ -0,0 +1,51 @@
+opam-version: "2.0"
+name: "ocaml-base-compiler"
+version: "4.14.2"
+synopsis: "Official release 4.14.2"
+maintainer: "platform@lists.ocaml.org"
+authors: "Xavier Leroy and many contributors"
+license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception"
+homepage: "https://ocaml.org"
+bug-reports: "https://github.com/ocaml/opam-repository/issues"
+depends: [
+  "ocaml" {= "4.14.2" & post}
+  "base-unix" {post}
+  "base-bigarray" {post}
+  "base-threads" {post}
+  "ocaml-options-vanilla" {post}
+]
+conflict-class: "ocaml-core-compiler"
+flags: compiler
+setenv: CAML_LD_LIBRARY_PATH = "%{lib}%/stublibs"
+build: [
+  [
+    "./configure"
+    "--prefix=%{prefix}%"
+    "--docdir=%{doc}%/ocaml"
+    "-C"
+    "CC=cc" {os = "openbsd" | os = "macos"}
+    "ASPP=cc -c" {os = "openbsd" | os = "macos"}
+  ]
+  [make "-j%{jobs}%"]
+]
+install: [make "install"]
+post-messages: [
+  """\
+A failure in the middle of the build may be caused by build parallelism
+   (enabled by default).
+   Please file a bug report at https://github.com/ocaml/opam-repository/issues"""
+    {failure & jobs > "1"}
+  """\
+You can try installing again including --jobs=1
+   to force a sequential build instead."""
+    {failure & jobs > "1" & opam-version >= "2.0.5"}
+]
+dev-repo: "git+https://github.com/ocaml/ocaml"
+extra-files: [
+  "ocaml-base-compiler.install" "md5=3e969b841df1f51ca448e6e6295cb451"
+]
+url {
+  src: "https://github.com/ocaml/ocaml/archive/4.14.2.tar.gz"
+  checksum:
+    "sha256=c2d706432f93ba85bd3383fa451d74543c32a4e84a1afaf3e8ace18f7f097b43"
+}
diff --git a/packages/ocaml/ocaml-system.4.14.2/files/gen_ocaml_config.ml.in b/packages/ocaml/ocaml-system.4.14.2/files/gen_ocaml_config.ml.in
new file mode 100644
index 000000000..fdc510a6d
--- /dev/null
+++ b/packages/ocaml/ocaml-system.4.14.2/files/gen_ocaml_config.ml.in
@@ -0,0 +1,43 @@
+let () =
+  let exe = ".exe" in
+  let ocamlc =
+    let (base, suffix) =
+      let s = Sys.executable_name in
+      if Filename.check_suffix s exe then
+        (Filename.chop_suffix s exe, exe)
+      else
+        (s, "") in
+    base ^ "c" ^ suffix in
+  if Sys.ocaml_version <> "%{_:version}%" then
+    (Printf.eprintf
+       "ERROR: The compiler found at %%s has version %%s,\n\
+        and this package requires %{_:version}%.\n\
+        You should use e.g. 'opam switch create %{_:name}%.%%s' \
+        instead."
+       ocamlc Sys.ocaml_version Sys.ocaml_version;
+     exit 1)
+  else
+  let ocamlc_digest = Digest.to_hex (Digest.file ocamlc) in
+  let libdir =
+    if Sys.command (ocamlc^" -where > %{_:name}%.config") = 0 then
+      let ic = open_in "%{_:name}%.config" in
+      let r = input_line ic in
+      close_in ic;
+      Sys.remove "%{_:name}%.config";
+      r
+    else
+      failwith "Bad return from 'ocamlc -where'"
+  in
+  let graphics = Filename.concat libdir "graphics.cmi" in
+  let graphics_digest =
+    if Sys.file_exists graphics then
+      Digest.to_hex (Digest.file graphics)
+    else
+      String.make 32 '0'
+  in
+  let oc = open_out "%{_:name}%.config" in
+  Printf.fprintf oc "opam-version: \"2.0\"\n\
+                     file-depends: [ [ %%S %%S ] [ %%S %%S ] ]\n\
+                     variables { path: %%S }\n"
+    ocamlc ocamlc_digest graphics graphics_digest (Filename.dirname ocamlc);
+  close_out oc
diff --git a/packages/ocaml/ocaml-system.4.14.2/opam b/packages/ocaml/ocaml-system.4.14.2/opam
new file mode 100644
index 000000000..8b6c654f0
--- /dev/null
+++ b/packages/ocaml/ocaml-system.4.14.2/opam
@@ -0,0 +1,24 @@
+opam-version: "2.0"
+name: "ocaml-system"
+version: "4.14.2"
+synopsis: "The OCaml compiler (system version, from outside of opam)"
+maintainer: "platform@lists.ocaml.org"
+authors: "Xavier Leroy and many contributors"
+license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception"
+homepage: "https://ocaml.org"
+bug-reports: "https://github.com/ocaml/opam-repository/issues"
+depends: [
+  "ocaml" {post}
+  "base-unix" {post}
+  "base-threads" {post}
+  "base-bigarray" {post}
+]
+conflict-class: "ocaml-core-compiler"
+available: sys-ocaml-version = "4.14.2"
+flags: compiler
+build: ["ocaml" "gen_ocaml_config.ml"]
+substs: "gen_ocaml_config.ml"
+dev-repo: "git+https://github.com/ocaml/ocaml"
+extra-files: [
+  "gen_ocaml_config.ml.in" "md5=093e7bec1ec95f9e4c6a313d73c5d840"
+]
diff --git a/packages/ocaml/ocaml.4.14.2/opam b/packages/ocaml/ocaml.4.14.2/opam
new file mode 100644
index 000000000..dd03ce5a0
--- /dev/null
+++ b/packages/ocaml/ocaml.4.14.2/opam
@@ -0,0 +1,36 @@
+opam-version: "2.0"
+name: "ocaml"
+version: "4.14.2"
+synopsis: "The OCaml compiler (virtual package)"
+description: """\
+This package requires a matching implementation of OCaml,
+and polls it to initialise specific variables like `ocaml:native-dynlink`"""
+maintainer: "platform@lists.ocaml.org"
+authors: [
+  "Xavier Leroy"
+  "Damien Doligez"
+  "Alain Frisch"
+  "Jacques Garrigue"
+  "Didier Rémy"
+  "Jérôme Vouillon"
+]
+license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception"
+homepage: "https://ocaml.org"
+bug-reports: "https://github.com/ocaml/opam-repository/issues"
+depends: [
+  "ocaml-config" {>= "2"}
+  "ocaml-base-compiler" {>= "4.14.2~" & < "4.14.3~"} |
+  "ocaml-variants" {>= "4.14.2~" & < "4.14.3~"} |
+  "ocaml-system" {>= "4.14.2" & < "4.14.3~"} |
+  "dkml-base-compiler" {>= "4.14.2~" & < "4.14.3~"}
+]
+flags: conf
+setenv: [
+  [CAML_LD_LIBRARY_PATH = "%{_:stubsdir}%"]
+  [CAML_LD_LIBRARY_PATH += "%{lib}%/stublibs"]
+  [OCAML_TOPLEVEL_PATH = "%{toplevel}%"]
+]
+build: [
+  "ocaml" "%{ocaml-config:share}%/gen_ocaml_config.ml" _:version _:name
+]
+build-env: CAML_LD_LIBRARY_PATH = ""
diff --git a/packages/upstream-extra/bechamel-notty.0.3.0/opam b/packages/upstream-extra/bechamel-notty.0.5.0/opam
similarity index 68%
rename from packages/upstream-extra/bechamel-notty.0.3.0/opam
rename to packages/upstream-extra/bechamel-notty.0.5.0/opam
index 517f270ef..3782b926a 100644
--- a/packages/upstream-extra/bechamel-notty.0.3.0/opam
+++ b/packages/upstream-extra/bechamel-notty.0.5.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "bechamel-notty"
-version: "0.3.0"
+version: "0.5.0"
 synopsis: "CLI generator for bechamel's output"
 description: """\
 A simple tool to generate a CLI output with notty
@@ -25,10 +25,10 @@ build: [
 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"
+    "https://github.com/mirage/bechamel/releases/download/v0.5.0/bechamel-0.5.0.tbz"
   checksum: [
-    "sha256=d719040841a1a3be6f93699ae9bf1f8cb2c5d294f0218c0bc0a735386c2d71a0"
-    "sha512=dc1233d4dcf01a997a3fcbafc116df0aae22ea5a6c98c09e200e4aa984c558976c8290b3e14b1156519ad12a6cc4b1b9fa4adf3dc2458d373d77a07fb9f7acff"
+    "sha256=2f9aa544395fa62ea067352782988bf94d977162d4d3ee6e321e49a29c5ec868"
+    "sha512=80af7d3015fd3e63514b6241190f7fc96a1329480d98526dc426c8e24fdf2f196917a9bdae72ac7234e21b2835c38a5ac989cfc00360d9530afe52f97f58c79f"
   ]
 }
-x-commit-hash: "adf2b19fe09be6f405f11a69e15845529a5d80b7"
+x-commit-hash: "e6d903bcea41542dde87c5304317357065d1762c"
diff --git a/packages/upstream-extra/bechamel.0.3.0/opam b/packages/upstream-extra/bechamel.0.5.0/opam
similarity index 66%
rename from packages/upstream-extra/bechamel.0.3.0/opam
rename to packages/upstream-extra/bechamel.0.5.0/opam
index 962a771b1..9e1f067be 100644
--- a/packages/upstream-extra/bechamel.0.3.0/opam
+++ b/packages/upstream-extra/bechamel.0.5.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "bechamel"
-version: "0.3.0"
+version: "0.5.0"
 synopsis: "Yet Another Benchmark in OCaml"
 description: """\
 BEnchmark for a CHAMEL/camel/caml which
@@ -16,8 +16,7 @@ depends: [
   "ocaml" {>= "4.08.0"}
   "dune" {>= "2.0.0"}
   "fmt" {>= "0.9.0"}
-  "base-bytes"
-  "stdlib-shims"
+  "alcotest" {with-test}
 ]
 build: [
   ["dune" "build" "-p" name "-j" jobs]
@@ -26,10 +25,10 @@ build: [
 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"
+    "https://github.com/mirage/bechamel/releases/download/v0.5.0/bechamel-0.5.0.tbz"
   checksum: [
-    "sha256=d719040841a1a3be6f93699ae9bf1f8cb2c5d294f0218c0bc0a735386c2d71a0"
-    "sha512=dc1233d4dcf01a997a3fcbafc116df0aae22ea5a6c98c09e200e4aa984c558976c8290b3e14b1156519ad12a6cc4b1b9fa4adf3dc2458d373d77a07fb9f7acff"
+    "sha256=2f9aa544395fa62ea067352782988bf94d977162d4d3ee6e321e49a29c5ec868"
+    "sha512=80af7d3015fd3e63514b6241190f7fc96a1329480d98526dc426c8e24fdf2f196917a9bdae72ac7234e21b2835c38a5ac989cfc00360d9530afe52f97f58c79f"
   ]
 }
-x-commit-hash: "adf2b19fe09be6f405f11a69e15845529a5d80b7"
+x-commit-hash: "e6d903bcea41542dde87c5304317357065d1762c"
diff --git a/packages/upstream-extra/chrome-trace.3.14.0/opam b/packages/upstream-extra/chrome-trace.3.15.2/opam
similarity index 67%
rename from packages/upstream-extra/chrome-trace.3.14.0/opam
rename to packages/upstream-extra/chrome-trace.3.15.2/opam
index 6bcbcb15b..b4406b303 100644
--- a/packages/upstream-extra/chrome-trace.3.14.0/opam
+++ b/packages/upstream-extra/chrome-trace.3.15.2/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "chrome-trace"
-version: "3.14.0"
+version: "3.15.2"
 synopsis: "Chrome trace event generation library"
 description:
   "This library offers no backwards compatibility guarantees. Use at your own risk."
@@ -24,10 +24,10 @@ build: [
 dev-repo: "git+https://github.com/ocaml/dune.git"
 url {
   src:
-    "https://github.com/ocaml/dune/releases/download/3.14.0/dune-3.14.0.tbz"
+    "https://github.com/ocaml/dune/releases/download/3.15.2/dune-3.15.2.tbz"
   checksum: [
-    "sha256=f4d09d89162621fdff424c253fa50c4920d2179fb5b3d1debab7bbe97c68b2fc"
-    "sha512=f5ead1a9a0cc26e00a762e83e107b47c3c3fe9b44d9e505547c385c7938208d4fdcc91a8099512e76ea4a426f3543445b4d75ef0b621dc7dbfdcbb615bc0b999"
+    "sha256=f959980542ca85909b3f3f8e9be65c2b8a375f3a4e3bd83c7ad7a07f2e077933"
+    "sha512=d752b8c09130cf3d564b3a524e3148783b581daa3f9a61d0f52bf4d6995ef73258e71877dbfd8b7516f9a4bac5ad973e80f4fed596df9446e704acc724aac55e"
   ]
 }
-x-commit-hash: "73250f00372d3f28a25963ded6138728f4202663"
+x-commit-hash: "c28817c416ac0b381f6a6938236419ab5d86d6e1"
diff --git a/packages/upstream-extra/conf-jq.1/opam b/packages/upstream-extra/conf-jq.1/opam
index 676452bde..9b48e854d 100644
--- a/packages/upstream-extra/conf-jq.1/opam
+++ b/packages/upstream-extra/conf-jq.1/opam
@@ -13,6 +13,7 @@ flags: conf
 build: ["jq" "--version"]
 depexts: [
   ["jq"] {os-family = "debian"}
+  ["jq"] {os-family = "ubuntu"}
   ["jq"] {os-distribution = "fedora"}
   ["jq"] {os-distribution = "rhel"}
   ["epel-release" "jq"] {os-distribution = "centos"}
diff --git a/packages/upstream-extra/conf-ncurses.1/opam b/packages/upstream-extra/conf-ncurses.1/opam
index e4ade4d22..8c04034e3 100644
--- a/packages/upstream-extra/conf-ncurses.1/opam
+++ b/packages/upstream-extra/conf-ncurses.1/opam
@@ -23,6 +23,7 @@ build:
      os != "openbsd"}
 depexts: [
   ["ncurses-dev"] {os-family = "debian"}
+  ["lib64ncurses-dev"] {os-family = "ubuntu"}
   ["ncurses"] {os-distribution = "nixos"}
   ["ncurses-dev"] {os-distribution = "alpine"}
   ["ncurses-devel"] {os-distribution = "fedora"}
@@ -32,4 +33,5 @@ depexts: [
   ["ncurses-devel"] {os-family = "suse"}
   ["ncurses"] {os-distribution = "arch"}
   ["ncurses"] {os = "win32" & os-distribution = "cygwinports"}
+  ["ncurses"] {os = "freebsd"}
 ]
diff --git a/packages/upstream-extra/conf-ruby.1.0.0/opam b/packages/upstream-extra/conf-ruby.1.0.0/opam
index a7b1bea1f..444894b3f 100644
--- a/packages/upstream-extra/conf-ruby.1.0.0/opam
+++ b/packages/upstream-extra/conf-ruby.1.0.0/opam
@@ -16,9 +16,11 @@ depexts: [
   ["ruby"] {os-distribution = "arch"}
   ["ruby"] {os-distribution = "centos"}
   ["ruby"] {os-family = "debian"}
+  ["ruby"] {os-family = "ubuntu"}
   ["ruby"] {os-distribution = "fedora"}
   ["dev-lang/ruby"] {os-distribution = "gentoo"}
   ["ruby"] {os-distribution = "homebrew" & os = "macos"}
+  ["ruby"] {os = "freebsd"}
   ["ruby"] {os = "netbsd"}
   ["ruby"] {os-distribution = "nixos"}
   ["ruby"] {os = "openbsd"}
diff --git a/packages/upstream-extra/conf-xen.1/opam b/packages/upstream-extra/conf-xen.1/opam
index b15641db9..cf0db9ebd 100644
--- a/packages/upstream-extra/conf-xen.1/opam
+++ b/packages/upstream-extra/conf-xen.1/opam
@@ -15,6 +15,7 @@ build: ["sh" "-exc" "cc -c $CFLAGS -I/usr/local/include test.c"]
 depexts: [
   ["xen-dev"] {os-distribution = "alpine"}
   ["libxen-dev"] {os-family = "debian"}
+  ["libxen-dev"] {os-family = "ubuntu"}
   ["xen-devel"] {os-distribution = "centos"}
   ["xen-devel"] {os-distribution = "fedora"}
   ["xen-devel"] {os-distribution = "rhel"}
diff --git a/packages/upstream-extra/dot-merlin-reader.4.9/opam b/packages/upstream-extra/dot-merlin-reader.4.9/opam
index ee484f6fb..069c5f6e8 100644
--- a/packages/upstream-extra/dot-merlin-reader.4.9/opam
+++ b/packages/upstream-extra/dot-merlin-reader.4.9/opam
@@ -13,7 +13,7 @@ bug-reports: "https://github.com/ocaml/merlin/issues"
 depends: [
   "ocaml" {>= "4.08" & < "6.0"}
   "dune" {>= "2.9.0"}
-  "merlin-lib" {>= "4.9"}
+  "merlin-lib" {>= "4.9" & < "4.14-502"}
   "ocamlfind" {>= "1.6.0"}
 ]
 build: [
diff --git a/packages/upstream-extra/dune-rpc.3.14.0/opam b/packages/upstream-extra/dune-rpc.3.15.2/opam
similarity index 68%
rename from packages/upstream-extra/dune-rpc.3.14.0/opam
rename to packages/upstream-extra/dune-rpc.3.15.2/opam
index 939254c1b..2fe161d35 100644
--- a/packages/upstream-extra/dune-rpc.3.14.0/opam
+++ b/packages/upstream-extra/dune-rpc.3.15.2/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "dune-rpc"
-version: "3.14.0"
+version: "3.15.2"
 synopsis: "Communicate with dune using rpc"
 description: "Library to connect and control a running dune instance"
 maintainer: "Jane Street Group, LLC <opensource@janestreet.com>"
@@ -28,10 +28,10 @@ build: [
 dev-repo: "git+https://github.com/ocaml/dune.git"
 url {
   src:
-    "https://github.com/ocaml/dune/releases/download/3.14.0/dune-3.14.0.tbz"
+    "https://github.com/ocaml/dune/releases/download/3.15.2/dune-3.15.2.tbz"
   checksum: [
-    "sha256=f4d09d89162621fdff424c253fa50c4920d2179fb5b3d1debab7bbe97c68b2fc"
-    "sha512=f5ead1a9a0cc26e00a762e83e107b47c3c3fe9b44d9e505547c385c7938208d4fdcc91a8099512e76ea4a426f3543445b4d75ef0b621dc7dbfdcbb615bc0b999"
+    "sha256=f959980542ca85909b3f3f8e9be65c2b8a375f3a4e3bd83c7ad7a07f2e077933"
+    "sha512=d752b8c09130cf3d564b3a524e3148783b581daa3f9a61d0f52bf4d6995ef73258e71877dbfd8b7516f9a4bac5ad973e80f4fed596df9446e704acc724aac55e"
   ]
 }
-x-commit-hash: "73250f00372d3f28a25963ded6138728f4202663"
+x-commit-hash: "c28817c416ac0b381f6a6938236419ab5d86d6e1"
diff --git a/packages/upstream-extra/merlin-lib.4.13-414/opam b/packages/upstream-extra/merlin-lib.4.14-414/opam
similarity index 68%
rename from packages/upstream-extra/merlin-lib.4.13-414/opam
rename to packages/upstream-extra/merlin-lib.4.14-414/opam
index f48529746..ae234c18a 100644
--- a/packages/upstream-extra/merlin-lib.4.13-414/opam
+++ b/packages/upstream-extra/merlin-lib.4.14-414/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "merlin-lib"
-version: "4.13-414"
+version: "4.14-414"
 synopsis: "Merlin's libraries"
 description: """\
 These libraries provides access to low-level compiler interfaces and the
@@ -26,10 +26,10 @@ build: [
 dev-repo: "git+https://github.com/ocaml/merlin.git"
 url {
   src:
-    "https://github.com/ocaml/merlin/releases/download/v4.13-414/merlin-4.13-414.tbz"
+    "https://github.com/ocaml/merlin/releases/download/v4.14-414/merlin-4.14-414.tbz"
   checksum: [
-    "sha256=025cf1a93ba1e40916f5d9cf22fe7569bbfbaf403f54e4b724e4f92078b1db03"
-    "sha512=cf7e292a515122756bd614eedbf11cc09108e6afab77cd5805428207b3ca5a98494ee43ad59fcfb667b48fe0874f0a8359882b3c14ee270769f99c41e176d455"
+    "sha256=79018ccaa37c1501dd5c4d5cf78bc3420d641b1e82443662981c5472d973993d"
+    "sha512=ebefec44c7f54b10aa85895baacecf778930ee0c4cd5a257836755ccadd9018c20379511e254efa98ed7d48fff9ba9eeb93b45a722cc1d2d61f51570cc57985d"
   ]
 }
-x-commit-hash: "b06a4e4f976100c23173d715f1b35cd91f8131f0"
+x-commit-hash: "7017cc271403487756e412349f3718a8ba2e6a36"
diff --git a/packages/upstream-extra/merlin.4.13-414/opam b/packages/upstream-extra/merlin.4.14-414/opam
similarity index 86%
rename from packages/upstream-extra/merlin.4.13-414/opam
rename to packages/upstream-extra/merlin.4.14-414/opam
index 18c942567..55848abf7 100644
--- a/packages/upstream-extra/merlin.4.13-414/opam
+++ b/packages/upstream-extra/merlin.4.14-414/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "merlin"
-version: "4.13-414"
+version: "4.14-414"
 synopsis:
   "Editor helper, provides completion, typing and source browsing in Vim and Emacs"
 description:
@@ -73,10 +73,10 @@ See https://github.com/OCamlPro/opam-user-setup"""
 dev-repo: "git+https://github.com/ocaml/merlin.git"
 url {
   src:
-    "https://github.com/ocaml/merlin/releases/download/v4.13-414/merlin-4.13-414.tbz"
+    "https://github.com/ocaml/merlin/releases/download/v4.14-414/merlin-4.14-414.tbz"
   checksum: [
-    "sha256=025cf1a93ba1e40916f5d9cf22fe7569bbfbaf403f54e4b724e4f92078b1db03"
-    "sha512=cf7e292a515122756bd614eedbf11cc09108e6afab77cd5805428207b3ca5a98494ee43ad59fcfb667b48fe0874f0a8359882b3c14ee270769f99c41e176d455"
+    "sha256=79018ccaa37c1501dd5c4d5cf78bc3420d641b1e82443662981c5472d973993d"
+    "sha512=ebefec44c7f54b10aa85895baacecf778930ee0c4cd5a257836755ccadd9018c20379511e254efa98ed7d48fff9ba9eeb93b45a722cc1d2d61f51570cc57985d"
   ]
 }
-x-commit-hash: "b06a4e4f976100c23173d715f1b35cd91f8131f0"
+x-commit-hash: "7017cc271403487756e412349f3718a8ba2e6a36"
diff --git a/packages/upstream-extra/ocamlc-loc.3.14.0/opam b/packages/upstream-extra/ocamlc-loc.3.15.2/opam
similarity index 69%
rename from packages/upstream-extra/ocamlc-loc.3.14.0/opam
rename to packages/upstream-extra/ocamlc-loc.3.15.2/opam
index 64240002d..ebbae9daf 100644
--- a/packages/upstream-extra/ocamlc-loc.3.14.0/opam
+++ b/packages/upstream-extra/ocamlc-loc.3.15.2/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ocamlc-loc"
-version: "3.14.0"
+version: "3.15.2"
 synopsis: "Parse ocaml compiler output into structured form"
 description:
   "This library offers no backwards compatibility guarantees. Use at your own risk."
@@ -28,10 +28,10 @@ build: [
 dev-repo: "git+https://github.com/ocaml/dune.git"
 url {
   src:
-    "https://github.com/ocaml/dune/releases/download/3.14.0/dune-3.14.0.tbz"
+    "https://github.com/ocaml/dune/releases/download/3.15.2/dune-3.15.2.tbz"
   checksum: [
-    "sha256=f4d09d89162621fdff424c253fa50c4920d2179fb5b3d1debab7bbe97c68b2fc"
-    "sha512=f5ead1a9a0cc26e00a762e83e107b47c3c3fe9b44d9e505547c385c7938208d4fdcc91a8099512e76ea4a426f3543445b4d75ef0b621dc7dbfdcbb615bc0b999"
+    "sha256=f959980542ca85909b3f3f8e9be65c2b8a375f3a4e3bd83c7ad7a07f2e077933"
+    "sha512=d752b8c09130cf3d564b3a524e3148783b581daa3f9a61d0f52bf4d6995ef73258e71877dbfd8b7516f9a4bac5ad973e80f4fed596df9446e704acc724aac55e"
   ]
 }
-x-commit-hash: "73250f00372d3f28a25963ded6138728f4202663"
+x-commit-hash: "c28817c416ac0b381f6a6938236419ab5d86d6e1"
diff --git a/packages/upstream-extra/ocamlformat-rpc-lib.0.26.1/opam b/packages/upstream-extra/ocamlformat-rpc-lib.0.26.2/opam
similarity index 77%
rename from packages/upstream-extra/ocamlformat-rpc-lib.0.26.1/opam
rename to packages/upstream-extra/ocamlformat-rpc-lib.0.26.2/opam
index dc3312514..dbf25f535 100644
--- a/packages/upstream-extra/ocamlformat-rpc-lib.0.26.1/opam
+++ b/packages/upstream-extra/ocamlformat-rpc-lib.0.26.2/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ocamlformat-rpc-lib"
-version: "0.26.1"
+version: "0.26.2"
 synopsis: "Auto-formatter for OCaml code (RPC mode)"
 description:
   "OCamlFormat is a tool to automatically format OCaml code in a uniform style. This package defines a RPC interface to OCamlFormat"
@@ -42,10 +42,10 @@ build: [
 dev-repo: "git+https://github.com/ocaml-ppx/ocamlformat.git"
 url {
   src:
-    "https://github.com/ocaml-ppx/ocamlformat/releases/download/0.26.1/ocamlformat-0.26.1.tbz"
+    "https://github.com/ocaml-ppx/ocamlformat/releases/download/0.26.2/ocamlformat-0.26.2.tbz"
   checksum: [
-    "sha256=da006e427f15b9ec612fb808d446599bd9b7c3ee25abeb3d555747a70d74c6d7"
-    "sha512=b7413f8dc47ba3a2372e89d59cae54f9a602ab81e31cd14ed986a831111080b79a5a3cc45dac04d8ffae5054c35bf29fe9559f145c76c87a30e191ed5400942a"
+    "sha256=2e4f596bf7aa367a844fe83ba0f6b0bf14b2a65179ddc082363fe9793d0375c5"
+    "sha512=b03d57462e65b11aa9f78dd5c4548251e8d1c5a1c9662f7502bdb10472aeb9df33c1d407350767a5223fbff9c01d53de85bafacd0274b49abc4b43701b159bee"
   ]
 }
-x-commit-hash: "6734dfc1992eb782f0a936ce3cd7c78b7c1d39d3"
+x-commit-hash: "f5727b32127730a2722f86c7119eb6d8f884e26d"
diff --git a/packages/upstream-extra/odoc-parser.2.4.1/opam b/packages/upstream-extra/odoc-parser.2.4.2/opam
similarity index 71%
rename from packages/upstream-extra/odoc-parser.2.4.1/opam
rename to packages/upstream-extra/odoc-parser.2.4.2/opam
index fd9ceda0a..3f1df359d 100644
--- a/packages/upstream-extra/odoc-parser.2.4.1/opam
+++ b/packages/upstream-extra/odoc-parser.2.4.2/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "odoc-parser"
-version: "2.4.1"
+version: "2.4.2"
 synopsis: "Parser for ocaml documentation comments"
 description: """\
 Odoc_parser is a library for parsing the contents of OCaml documentation
@@ -36,10 +36,10 @@ build: [
 ]
 dev-repo: "git+https://github.com/ocaml/odoc.git"
 url {
-  src: "https://github.com/ocaml/odoc/releases/download/2.4.1/odoc-2.4.1.tbz"
+  src: "https://github.com/ocaml/odoc/releases/download/2.4.2/odoc-2.4.2.tbz"
   checksum: [
-    "sha256=b814a0b9020b503eb67f17d1d9a969d052b63d8cdc7cdfa5fb793b137558cedb"
-    "sha512=8ed2ed6ef705c00a2c90b7c57e7e5c747247e3406f1b7415a46db7cbd19d02678db40be761984d627f4fa2d9b38f696c77d8b5d40108e12563e101d07949821c"
+    "sha256=563cfdbb26ec8a30e737a9cf285a06e0bbae953f48e25bbb0f69f7a99c2ba40b"
+    "sha512=8d48c99e0c253791177dd65287ce5cee47e7c6805e33f3ae0cf6c8e7d349128f26eebbe36459c31429c11519ad5979dbe36fbcb9403a5fde199a69976a3fb3a6"
   ]
 }
-x-commit-hash: "0e671097a35ef938ea390a6bb894f25d8dc847a8"
+x-commit-hash: "85644b01ca86d1061766908bba3653ced2c15ce4"
diff --git a/packages/upstream-extra/odoc.2.4.1/opam b/packages/upstream-extra/odoc.2.4.2/opam
similarity index 84%
rename from packages/upstream-extra/odoc.2.4.1/opam
rename to packages/upstream-extra/odoc.2.4.2/opam
index 55fd156d1..7ec7d6638 100644
--- a/packages/upstream-extra/odoc.2.4.1/opam
+++ b/packages/upstream-extra/odoc.2.4.2/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "odoc"
-version: "2.4.1"
+version: "2.4.2"
 synopsis: "OCaml Documentation Generator"
 description: """\
 **odoc** is a powerful and flexible documentation generator for OCaml. It reads *doc comments*, demarcated by `(** ... *)`, and transforms them into a variety of output formats, including HTML, LaTeX, and man pages.
@@ -39,7 +39,7 @@ depends: [
   "cppo" {build & >= "1.1.0"}
   "dune" {>= "3.7.0"}
   "fpath"
-  "ocaml" {>= "4.02.0" & < "5.2"}
+  "ocaml" {>= "4.02.0"}
   "result"
   "tyxml" {>= "4.4.0"}
   "fmt"
@@ -49,7 +49,7 @@ depends: [
   "conf-jq" {with-test}
   "ppx_expect" {with-test}
   "bos" {with-test}
-  "crunch" {> "1.1.0"}
+  "crunch" {> "2.0.0"}
   ("ocaml" {< "4.07.0" & with-test} | "bisect_ppx" {with-test & > "2.5.0"})
 ]
 build: [
@@ -68,10 +68,10 @@ build: [
 ]
 dev-repo: "git+https://github.com/ocaml/odoc.git"
 url {
-  src: "https://github.com/ocaml/odoc/releases/download/2.4.1/odoc-2.4.1.tbz"
+  src: "https://github.com/ocaml/odoc/releases/download/2.4.2/odoc-2.4.2.tbz"
   checksum: [
-    "sha256=b814a0b9020b503eb67f17d1d9a969d052b63d8cdc7cdfa5fb793b137558cedb"
-    "sha512=8ed2ed6ef705c00a2c90b7c57e7e5c747247e3406f1b7415a46db7cbd19d02678db40be761984d627f4fa2d9b38f696c77d8b5d40108e12563e101d07949821c"
+    "sha256=563cfdbb26ec8a30e737a9cf285a06e0bbae953f48e25bbb0f69f7a99c2ba40b"
+    "sha512=8d48c99e0c253791177dd65287ce5cee47e7c6805e33f3ae0cf6c8e7d349128f26eebbe36459c31429c11519ad5979dbe36fbcb9403a5fde199a69976a3fb3a6"
   ]
 }
-x-commit-hash: "0e671097a35ef938ea390a6bb894f25d8dc847a8"
+x-commit-hash: "85644b01ca86d1061766908bba3653ced2c15ce4"
diff --git a/packages/upstream-extra/qcheck-ounit.0.21.2/opam b/packages/upstream-extra/qcheck-ounit.0.21.3/opam
similarity index 72%
rename from packages/upstream-extra/qcheck-ounit.0.21.2/opam
rename to packages/upstream-extra/qcheck-ounit.0.21.3/opam
index 71525341a..57af6a637 100644
--- a/packages/upstream-extra/qcheck-ounit.0.21.2/opam
+++ b/packages/upstream-extra/qcheck-ounit.0.21.3/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "qcheck-ounit"
-version: "0.21.2"
+version: "0.21.3"
 synopsis: "OUnit backend for qcheck"
 maintainer: "simon.cruanes.2007@m4x.org"
 authors: "the qcheck contributors"
@@ -11,7 +11,6 @@ doc: "http://c-cube.github.io/qcheck/"
 bug-reports: "https://github.com/c-cube/qcheck/issues"
 depends: [
   "dune" {>= "2.8.0"}
-  "base-bytes"
   "base-unix"
   "qcheck-core" {= version}
   "ounit2"
@@ -25,9 +24,9 @@ build: [
 ]
 dev-repo: "git+https://github.com/c-cube/qcheck.git"
 url {
-  src: "https://github.com/c-cube/qcheck/archive/v0.21.2.tar.gz"
+  src: "https://github.com/c-cube/qcheck/archive/v0.21.3.tar.gz"
   checksum: [
-    "md5=b8e3728fc1b534ee01e3c2b7e2b30bb3"
-    "sha512=67ff77a66ccf046dfede9123a322002f232a0a65b8ce1890795a4a4ba247bc5413f988e7cfd53412418036c2b907e4cbcd7dcd39d7f1fd2481aee60107b075cc"
+    "md5=8930042156873aa8dfa433d7c1bf8463"
+    "sha512=89d8a8a1990cfa8cd839e732f4cc89d68811ae0cc04732668e1e2691e1eb6e3c525f75936bdb261aebdaa3a8845eb717128b0bf21884bbda80d64ba957d2e6e1"
   ]
 }
diff --git a/packages/upstream-extra/qcheck.0.21.2/opam b/packages/upstream-extra/qcheck.0.21.3/opam
similarity index 74%
rename from packages/upstream-extra/qcheck.0.21.2/opam
rename to packages/upstream-extra/qcheck.0.21.3/opam
index 52dd5e1b6..85b38ee6a 100644
--- a/packages/upstream-extra/qcheck.0.21.2/opam
+++ b/packages/upstream-extra/qcheck.0.21.3/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "qcheck"
-version: "0.21.2"
+version: "0.21.3"
 synopsis: "Compatibility package for qcheck"
 maintainer: "simon.cruanes.2007@m4x.org"
 authors: "the qcheck contributors"
@@ -11,7 +11,6 @@ doc: "http://c-cube.github.io/qcheck/"
 bug-reports: "https://github.com/c-cube/qcheck/issues"
 depends: [
   "dune" {>= "2.8.0"}
-  "base-bytes"
   "base-unix"
   "qcheck-core" {= version}
   "qcheck-ounit" {= version}
@@ -29,9 +28,9 @@ build: [
 ]
 dev-repo: "git+https://github.com/c-cube/qcheck.git"
 url {
-  src: "https://github.com/c-cube/qcheck/archive/v0.21.2.tar.gz"
+  src: "https://github.com/c-cube/qcheck/archive/v0.21.3.tar.gz"
   checksum: [
-    "md5=b8e3728fc1b534ee01e3c2b7e2b30bb3"
-    "sha512=67ff77a66ccf046dfede9123a322002f232a0a65b8ce1890795a4a4ba247bc5413f988e7cfd53412418036c2b907e4cbcd7dcd39d7f1fd2481aee60107b075cc"
+    "md5=8930042156873aa8dfa433d7c1bf8463"
+    "sha512=89d8a8a1990cfa8cd839e732f4cc89d68811ae0cc04732668e1e2691e1eb6e3c525f75936bdb261aebdaa3a8845eb717128b0bf21884bbda80d64ba957d2e6e1"
   ]
 }
diff --git a/packages/upstream-extra/utop.2.13.1/opam b/packages/upstream-extra/utop.2.14.0/opam
similarity index 79%
rename from packages/upstream-extra/utop.2.13.1/opam
rename to packages/upstream-extra/utop.2.14.0/opam
index 9d0ec4039..6feed108f 100644
--- a/packages/upstream-extra/utop.2.13.1/opam
+++ b/packages/upstream-extra/utop.2.14.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "utop"
-version: "2.13.1"
+version: "2.14.0"
 synopsis: "Universal toplevel for OCaml"
 description:
   "utop is an improved toplevel (i.e., Read-Eval-Print Loop or REPL) for OCaml. It can run in a terminal or in Emacs. It supports line edition, history, real-time and context sensitive completion, colors, and more. It integrates with the Tuareg mode in Emacs."
@@ -43,10 +43,10 @@ build: [
 dev-repo: "git+https://github.com/ocaml-community/utop.git"
 url {
   src:
-    "https://github.com/ocaml-community/utop/releases/download/2.13.1/utop-2.13.1.tbz"
+    "https://github.com/ocaml-community/utop/releases/download/2.14.0/utop-2.14.0.tbz"
   checksum: [
-    "sha256=b04ec2a394d1a6a28a79444c58f66eab77b7f74401f4714aa6e6f1c2125a6ffd"
-    "sha512=37b116f408a8d8448e5faf99805e3c26a8bc0c149a64e2be75d261b1de9aca176982e95fb0d128e5072f22da99375d0691d23093d4b21d5fb9a26b034c262c51"
+    "sha256=0fd5a9bc5b458524a71463a1fe0cd16f9b7be13673ae303118b7216e0d273ba9"
+    "sha512=d64a5ab671424279be13ebd080deac7ee46e2c9bc3abcfc37a6dff164124cc3abc52801527c35d9160ec868f9b8f334880026aaeaad02e507112fd8392094845"
   ]
 }
-x-commit-hash: "5b98d2845bf8e46a253593578cf0371d773f6da0"
+x-commit-hash: "d4f6f5f7337eeeac9507801c8f147fff518f9d69"
diff --git a/packages/upstream-extra/xdg.3.14.0/opam b/packages/upstream-extra/xdg.3.15.2/opam
similarity index 67%
rename from packages/upstream-extra/xdg.3.14.0/opam
rename to packages/upstream-extra/xdg.3.15.2/opam
index c947bdd20..2e9cdc6c3 100644
--- a/packages/upstream-extra/xdg.3.14.0/opam
+++ b/packages/upstream-extra/xdg.3.15.2/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "xdg"
-version: "3.14.0"
+version: "3.15.2"
 synopsis: "XDG Base Directory Specification"
 description:
   "https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html"
@@ -24,10 +24,10 @@ build: [
 dev-repo: "git+https://github.com/ocaml/dune.git"
 url {
   src:
-    "https://github.com/ocaml/dune/releases/download/3.14.0/dune-3.14.0.tbz"
+    "https://github.com/ocaml/dune/releases/download/3.15.2/dune-3.15.2.tbz"
   checksum: [
-    "sha256=f4d09d89162621fdff424c253fa50c4920d2179fb5b3d1debab7bbe97c68b2fc"
-    "sha512=f5ead1a9a0cc26e00a762e83e107b47c3c3fe9b44d9e505547c385c7938208d4fdcc91a8099512e76ea4a426f3543445b4d75ef0b621dc7dbfdcbb615bc0b999"
+    "sha256=f959980542ca85909b3f3f8e9be65c2b8a375f3a4e3bd83c7ad7a07f2e077933"
+    "sha512=d752b8c09130cf3d564b3a524e3148783b581daa3f9a61d0f52bf4d6995ef73258e71877dbfd8b7516f9a4bac5ad973e80f4fed596df9446e704acc724aac55e"
   ]
 }
-x-commit-hash: "73250f00372d3f28a25963ded6138728f4202663"
+x-commit-hash: "c28817c416ac0b381f6a6938236419ab5d86d6e1"
diff --git a/packages/upstream/batteries.3.7.2/opam b/packages/upstream/batteries.3.8.0/opam
similarity index 83%
rename from packages/upstream/batteries.3.7.2/opam
rename to packages/upstream/batteries.3.8.0/opam
index 4ddd92da1..df836a0fe 100644
--- a/packages/upstream/batteries.3.7.2/opam
+++ b/packages/upstream/batteries.3.8.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "batteries"
-version: "3.7.2"
+version: "3.8.0"
 synopsis: "A community-maintained standard library extension"
 maintainer: [
   "Cedric Cellier <rixed@happyleptic.org>"
@@ -17,7 +17,7 @@ bug-reports:
   "https://github.com/ocaml-batteries-team/batteries-included/issues"
 depends: [
   "dune" {>= "2.7"}
-  "ocaml" {>= "4.05" & < "5.2"}
+  "ocaml" {>= "4.05" & < "5.3"}
   "camlp-streams"
   "ocamlfind" {>= "1.5.3"}
   "qtest" {with-test & >= "2.5"}
@@ -46,9 +46,9 @@ dev-repo:
   "git+https://github.com/ocaml-batteries-team/batteries-included.git"
 url {
   src:
-    "https://github.com/ocaml-batteries-team/batteries-included/archive/refs/tags/v3.7.2.tar.gz"
+    "https://github.com/ocaml-batteries-team/batteries-included/archive/refs/tags/v3.8.0.tar.gz"
   checksum: [
-    "md5=1fd7bddce07cf5d244fc9427f7b5e4d4"
-    "sha512=c0f2a0fdc8253e0ea999d8d4c58bfbf32b18d251a2e1d9656bf279de5f01a33e9aabac3af4d95f465f8b671e7711ebd37218043face233340a0c11b08fa62f78"
+    "md5=b691e5870f876c6e590d6aa51b4c5457"
+    "sha512=3b0643ff337cd70da8c4b77887d212e82d043a7163fca36588be12186bc86bbcf0d56b13349325f12eabb96c846204c88560786342f50af7bf4e20b9480d3964"
   ]
 }
diff --git a/packages/upstream/cohttp.5.2.0/opam b/packages/upstream/cohttp.5.2.0/opam
index 43fcc6f24..9bd68e2a2 100644
--- a/packages/upstream/cohttp.5.2.0/opam
+++ b/packages/upstream/cohttp.5.2.0/opam
@@ -34,7 +34,7 @@ homepage: "https://github.com/mirage/ocaml-cohttp"
 doc: "https://mirage.github.io/ocaml-cohttp/"
 bug-reports: "https://github.com/mirage/ocaml-cohttp/issues"
 depends: [
-  "ocaml" {>= "4.08"}
+  ("ocaml" {>= "4.08" & < "5.0"} | ("ocaml" {>= "5.0"} & "base-bytes"))
   "dune" {>= "2.0"}
   "re" {>= "1.9.0"}
   "uri" {>= "2.0.0"}
diff --git a/packages/upstream/conduit-async.6.2.1/opam b/packages/upstream/conduit-async.6.2.2/opam
similarity index 74%
rename from packages/upstream/conduit-async.6.2.1/opam
rename to packages/upstream/conduit-async.6.2.2/opam
index 868352041..7e6761cd3 100644
--- a/packages/upstream/conduit-async.6.2.1/opam
+++ b/packages/upstream/conduit-async.6.2.2/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "conduit-async"
-version: "6.2.1"
+version: "6.2.2"
 synopsis: "A network connection establishment library for Async"
 maintainer: "anil@recoil.org"
 authors: [
@@ -34,10 +34,10 @@ build: [
 dev-repo: "git+https://github.com/mirage/ocaml-conduit.git"
 url {
   src:
-    "https://github.com/mirage/ocaml-conduit/releases/download/v6.2.1/conduit-6.2.1.tbz"
+    "https://github.com/mirage/ocaml-conduit/releases/download/v6.2.2/conduit-6.2.2.tbz"
   checksum: [
-    "sha256=59d5e7b62437be489b0b79ce11ff90ac04ef39c683e4cefca8587afdc2f55bbb"
-    "sha512=c8e12d843d73cc776850f1b77e805380ac64f6c81b7bc4516befdeacf4785aeb638a0ccc62d7c1990c66edda6bf679c59c93210ffefeafed9a5fa3ec1bfedeca"
+    "sha256=58eabf878fe2a5612f5a4f2b484ff749a5febbea3b3ceeb9af43ac235f2b2445"
+    "sha512=ab8ee5c2b9d879869181d5dfe111aefeefaa10063d89f21d5fc6023e8a7b83738b246dcadce7d583f5b8e918026cdb73cc66b32a8d5c2f874966fa37d5e67719"
   ]
 }
-x-commit-hash: "2977ef8b910d8283f6bd7f96305af5006ee7c7dd"
+x-commit-hash: "18130daf3907388ecb03ab99192fd1ce98561ca8"
diff --git a/packages/upstream/conduit-lwt-unix.6.2.1/opam b/packages/upstream/conduit-lwt-unix.6.2.2/opam
similarity index 76%
rename from packages/upstream/conduit-lwt-unix.6.2.1/opam
rename to packages/upstream/conduit-lwt-unix.6.2.2/opam
index 15716f4fd..69318703d 100644
--- a/packages/upstream/conduit-lwt-unix.6.2.1/opam
+++ b/packages/upstream/conduit-lwt-unix.6.2.2/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "conduit-lwt-unix"
-version: "6.2.1"
+version: "6.2.2"
 synopsis: "A network connection establishment library for Lwt_unix"
 maintainer: "anil@recoil.org"
 authors: [
@@ -38,10 +38,10 @@ build: [
 dev-repo: "git+https://github.com/mirage/ocaml-conduit.git"
 url {
   src:
-    "https://github.com/mirage/ocaml-conduit/releases/download/v6.2.1/conduit-6.2.1.tbz"
+    "https://github.com/mirage/ocaml-conduit/releases/download/v6.2.2/conduit-6.2.2.tbz"
   checksum: [
-    "sha256=59d5e7b62437be489b0b79ce11ff90ac04ef39c683e4cefca8587afdc2f55bbb"
-    "sha512=c8e12d843d73cc776850f1b77e805380ac64f6c81b7bc4516befdeacf4785aeb638a0ccc62d7c1990c66edda6bf679c59c93210ffefeafed9a5fa3ec1bfedeca"
+    "sha256=58eabf878fe2a5612f5a4f2b484ff749a5febbea3b3ceeb9af43ac235f2b2445"
+    "sha512=ab8ee5c2b9d879869181d5dfe111aefeefaa10063d89f21d5fc6023e8a7b83738b246dcadce7d583f5b8e918026cdb73cc66b32a8d5c2f874966fa37d5e67719"
   ]
 }
-x-commit-hash: "2977ef8b910d8283f6bd7f96305af5006ee7c7dd"
+x-commit-hash: "18130daf3907388ecb03ab99192fd1ce98561ca8"
diff --git a/packages/upstream/conduit-lwt.6.2.1/opam b/packages/upstream/conduit-lwt.6.2.2/opam
similarity index 70%
rename from packages/upstream/conduit-lwt.6.2.1/opam
rename to packages/upstream/conduit-lwt.6.2.2/opam
index d3287349b..a12db988d 100644
--- a/packages/upstream/conduit-lwt.6.2.1/opam
+++ b/packages/upstream/conduit-lwt.6.2.2/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "conduit-lwt"
-version: "6.2.1"
+version: "6.2.2"
 synopsis: "A portable network connection establishment library using Lwt"
 maintainer: "anil@recoil.org"
 authors: [
@@ -26,10 +26,10 @@ build: [
 dev-repo: "git+https://github.com/mirage/ocaml-conduit.git"
 url {
   src:
-    "https://github.com/mirage/ocaml-conduit/releases/download/v6.2.1/conduit-6.2.1.tbz"
+    "https://github.com/mirage/ocaml-conduit/releases/download/v6.2.2/conduit-6.2.2.tbz"
   checksum: [
-    "sha256=59d5e7b62437be489b0b79ce11ff90ac04ef39c683e4cefca8587afdc2f55bbb"
-    "sha512=c8e12d843d73cc776850f1b77e805380ac64f6c81b7bc4516befdeacf4785aeb638a0ccc62d7c1990c66edda6bf679c59c93210ffefeafed9a5fa3ec1bfedeca"
+    "sha256=58eabf878fe2a5612f5a4f2b484ff749a5febbea3b3ceeb9af43ac235f2b2445"
+    "sha512=ab8ee5c2b9d879869181d5dfe111aefeefaa10063d89f21d5fc6023e8a7b83738b246dcadce7d583f5b8e918026cdb73cc66b32a8d5c2f874966fa37d5e67719"
   ]
 }
-x-commit-hash: "2977ef8b910d8283f6bd7f96305af5006ee7c7dd"
+x-commit-hash: "18130daf3907388ecb03ab99192fd1ce98561ca8"
diff --git a/packages/upstream/conduit.6.2.1/opam b/packages/upstream/conduit.6.2.2/opam
similarity index 84%
rename from packages/upstream/conduit.6.2.1/opam
rename to packages/upstream/conduit.6.2.2/opam
index 4f830cc73..707bc1dc7 100644
--- a/packages/upstream/conduit.6.2.1/opam
+++ b/packages/upstream/conduit.6.2.2/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "conduit"
-version: "6.2.1"
+version: "6.2.2"
 synopsis: "A network connection establishment library"
 description: """\
 The `conduit` library takes care of establishing and listening for
@@ -49,10 +49,10 @@ build: [
 dev-repo: "git+https://github.com/mirage/ocaml-conduit.git"
 url {
   src:
-    "https://github.com/mirage/ocaml-conduit/releases/download/v6.2.1/conduit-6.2.1.tbz"
+    "https://github.com/mirage/ocaml-conduit/releases/download/v6.2.2/conduit-6.2.2.tbz"
   checksum: [
-    "sha256=59d5e7b62437be489b0b79ce11ff90ac04ef39c683e4cefca8587afdc2f55bbb"
-    "sha512=c8e12d843d73cc776850f1b77e805380ac64f6c81b7bc4516befdeacf4785aeb638a0ccc62d7c1990c66edda6bf679c59c93210ffefeafed9a5fa3ec1bfedeca"
+    "sha256=58eabf878fe2a5612f5a4f2b484ff749a5febbea3b3ceeb9af43ac235f2b2445"
+    "sha512=ab8ee5c2b9d879869181d5dfe111aefeefaa10063d89f21d5fc6023e8a7b83738b246dcadce7d583f5b8e918026cdb73cc66b32a8d5c2f874966fa37d5e67719"
   ]
 }
-x-commit-hash: "2977ef8b910d8283f6bd7f96305af5006ee7c7dd"
+x-commit-hash: "18130daf3907388ecb03ab99192fd1ce98561ca8"
diff --git a/packages/upstream/conf-libffi.2.0.0/opam b/packages/upstream/conf-libffi.2.0.0/opam
index 51d98456f..50a7abad1 100644
--- a/packages/upstream/conf-libffi.2.0.0/opam
+++ b/packages/upstream/conf-libffi.2.0.0/opam
@@ -19,6 +19,7 @@ depexts: [
   ["libffi"] {os = "macos" & os-distribution = "macports"}
   ["libffi-dev"] {os-distribution = "alpine"}
   ["libffi-dev"] {os-family = "debian"}
+  ["libffi-dev"] {os-family = "ubuntu"}
   ["libffi-devel"] {os-distribution = "centos"}
   ["libffi-devel"] {os-distribution = "fedora"}
   ["libffi-devel"] {os-distribution = "mageia"}
diff --git a/packages/upstream/conf-perl.2/opam b/packages/upstream/conf-perl.2/opam
index aa61f4ab7..73306587c 100644
--- a/packages/upstream/conf-perl.2/opam
+++ b/packages/upstream/conf-perl.2/opam
@@ -13,6 +13,7 @@ flags: conf
 build: ["perl" "--version"]
 depexts: [
   ["perl"] {os-family = "debian"}
+  ["perl"] {os-family = "ubuntu"}
   ["perl"] {os-distribution = "alpine"}
   ["perl"] {os-distribution = "nixos"}
   ["perl"] {os-distribution = "arch"}
diff --git a/packages/upstream/conf-pkg-config.3/opam b/packages/upstream/conf-pkg-config.3/opam
index 4db291d9d..7a1fedafc 100644
--- a/packages/upstream/conf-pkg-config.3/opam
+++ b/packages/upstream/conf-pkg-config.3/opam
@@ -12,7 +12,10 @@ license: "GPL-1.0-or-later"
 homepage: "http://www.freedesktop.org/wiki/Software/pkg-config/"
 bug-reports: "https://github.com/ocaml/opam-repository/issues"
 flags: conf
-build: ["pkg-config" "--help"] {os != "openbsd"}
+build: [
+  ["pkg-config" "--help"] {os != "openbsd" & os != "win32"}
+  ["pkgconf" "--version"] {os = "win32"}
+]
 depexts: [
   ["pkg-config"] {os-family = "debian" | os-family = "ubuntu"}
   ["pkgconf"] {os-distribution = "arch"}
@@ -22,7 +25,7 @@ depexts: [
   ["pkgconfig"] {os-distribution = "rhel" & os-version <= "7"}
   ["pkgconfig"] {os-distribution = "ol" & os-version <= "7"}
   ["pkgconf"] {os-distribution = "alpine"}
-  ["pkgconfig"] {os-distribution = "nixos"}
+  ["pkg-config"] {os-distribution = "nixos"}
   ["pkg-config"] {os = "macos" & os-distribution = "homebrew"}
   ["pkgconfig"] {os = "macos" & os-distribution = "macports"}
   ["pkgconf"] {os = "freebsd"}
@@ -30,4 +33,5 @@ depexts: [
   ["pkgconf-pkg-config"] {os-distribution = "centos" & os-version >= "8"}
   ["pkgconf-pkg-config"] {os-distribution = "ol" & os-version >= "8"}
   ["system:pkgconf"] {os = "win32" & os-distribution = "cygwinports"}
+  ["pkgconf"] {os = "win32" & os-distribution = "cygwin"}
 ]
diff --git a/packages/upstream/ctypes-foreign.0.21.1/opam b/packages/upstream/ctypes-foreign.0.22.0/opam
similarity index 93%
rename from packages/upstream/ctypes-foreign.0.21.1/opam
rename to packages/upstream/ctypes-foreign.0.22.0/opam
index 9ad406236..8dfe2a288 100644
--- a/packages/upstream/ctypes-foreign.0.21.1/opam
+++ b/packages/upstream/ctypes-foreign.0.22.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ctypes-foreign"
-version: "0.21.1"
+version: "0.22.0"
 synopsis: "Dynamic access to foreign C libraries using Ctypes"
 description: """\
 This installs the `ctypes-foreign` interface which
@@ -46,6 +46,6 @@ build: [
 dev-repo: "git+https://github.com/yallop/ocaml-ctypes.git"
 url {
   src:
-    "https://github.com/yallop/ocaml-ctypes/archive/refs/tags/0.21.1.tar.gz"
-  checksum: "md5=8b201d932741c5096854e5eb39139b90"
+    "https://github.com/yallop/ocaml-ctypes/archive/refs/tags/0.22.0.tar.gz"
+  checksum: "md5=8a301a3e3b79156448a6659859ad506c"
 }
diff --git a/packages/upstream/ctypes.0.21.1/opam b/packages/upstream/ctypes.0.22.0/opam
similarity index 95%
rename from packages/upstream/ctypes.0.21.1/opam
rename to packages/upstream/ctypes.0.22.0/opam
index 779e86565..4081b9a12 100644
--- a/packages/upstream/ctypes.0.21.1/opam
+++ b/packages/upstream/ctypes.0.22.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ctypes"
-version: "0.21.1"
+version: "0.22.0"
 synopsis: "Combinators for binding to C libraries without writing any C"
 description: """\
 ctypes is a library for binding to C libraries using pure OCaml. The primary
@@ -55,6 +55,6 @@ build: [
 dev-repo: "git+https://github.com/yallop/ocaml-ctypes.git"
 url {
   src:
-    "https://github.com/yallop/ocaml-ctypes/archive/refs/tags/0.21.1.tar.gz"
-  checksum: "md5=8b201d932741c5096854e5eb39139b90"
+    "https://github.com/yallop/ocaml-ctypes/archive/refs/tags/0.22.0.tar.gz"
+  checksum: "md5=8a301a3e3b79156448a6659859ad506c"
 }
diff --git a/packages/upstream/dune-build-info.3.14.0/opam b/packages/upstream/dune-build-info.3.15.2/opam
similarity index 74%
rename from packages/upstream/dune-build-info.3.14.0/opam
rename to packages/upstream/dune-build-info.3.15.2/opam
index 06ab963a1..f0fde99f0 100644
--- a/packages/upstream/dune-build-info.3.14.0/opam
+++ b/packages/upstream/dune-build-info.3.15.2/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "dune-build-info"
-version: "3.14.0"
+version: "3.15.2"
 synopsis: "Embed build information inside executable"
 description: """\
 The build-info library allows to access information about how the
@@ -29,10 +29,10 @@ build: [
 dev-repo: "git+https://github.com/ocaml/dune.git"
 url {
   src:
-    "https://github.com/ocaml/dune/releases/download/3.14.0/dune-3.14.0.tbz"
+    "https://github.com/ocaml/dune/releases/download/3.15.2/dune-3.15.2.tbz"
   checksum: [
-    "sha256=f4d09d89162621fdff424c253fa50c4920d2179fb5b3d1debab7bbe97c68b2fc"
-    "sha512=f5ead1a9a0cc26e00a762e83e107b47c3c3fe9b44d9e505547c385c7938208d4fdcc91a8099512e76ea4a426f3543445b4d75ef0b621dc7dbfdcbb615bc0b999"
+    "sha256=f959980542ca85909b3f3f8e9be65c2b8a375f3a4e3bd83c7ad7a07f2e077933"
+    "sha512=d752b8c09130cf3d564b3a524e3148783b581daa3f9a61d0f52bf4d6995ef73258e71877dbfd8b7516f9a4bac5ad973e80f4fed596df9446e704acc724aac55e"
   ]
 }
-x-commit-hash: "73250f00372d3f28a25963ded6138728f4202663"
+x-commit-hash: "c28817c416ac0b381f6a6938236419ab5d86d6e1"
diff --git a/packages/upstream/dune-configurator.3.14.0/opam b/packages/upstream/dune-configurator.3.15.2/opam
similarity index 74%
rename from packages/upstream/dune-configurator.3.14.0/opam
rename to packages/upstream/dune-configurator.3.15.2/opam
index 71c8adb49..8bcc2e70c 100644
--- a/packages/upstream/dune-configurator.3.14.0/opam
+++ b/packages/upstream/dune-configurator.3.15.2/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "dune-configurator"
-version: "3.14.0"
+version: "3.15.2"
 synopsis: "Helper library for gathering system configuration"
 description: """\
 dune-configurator is a small library that helps writing OCaml scripts that
@@ -33,10 +33,10 @@ build: [
 dev-repo: "git+https://github.com/ocaml/dune.git"
 url {
   src:
-    "https://github.com/ocaml/dune/releases/download/3.14.0/dune-3.14.0.tbz"
+    "https://github.com/ocaml/dune/releases/download/3.15.2/dune-3.15.2.tbz"
   checksum: [
-    "sha256=f4d09d89162621fdff424c253fa50c4920d2179fb5b3d1debab7bbe97c68b2fc"
-    "sha512=f5ead1a9a0cc26e00a762e83e107b47c3c3fe9b44d9e505547c385c7938208d4fdcc91a8099512e76ea4a426f3543445b4d75ef0b621dc7dbfdcbb615bc0b999"
+    "sha256=f959980542ca85909b3f3f8e9be65c2b8a375f3a4e3bd83c7ad7a07f2e077933"
+    "sha512=d752b8c09130cf3d564b3a524e3148783b581daa3f9a61d0f52bf4d6995ef73258e71877dbfd8b7516f9a4bac5ad973e80f4fed596df9446e704acc724aac55e"
   ]
 }
-x-commit-hash: "73250f00372d3f28a25963ded6138728f4202663"
+x-commit-hash: "c28817c416ac0b381f6a6938236419ab5d86d6e1"
diff --git a/packages/upstream/dune-private-libs.3.14.0/opam b/packages/upstream/dune-private-libs.3.15.2/opam
similarity index 73%
rename from packages/upstream/dune-private-libs.3.14.0/opam
rename to packages/upstream/dune-private-libs.3.15.2/opam
index 6726e99c7..210f01b6b 100644
--- a/packages/upstream/dune-private-libs.3.14.0/opam
+++ b/packages/upstream/dune-private-libs.3.15.2/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "dune-private-libs"
-version: "3.14.0"
+version: "3.15.2"
 synopsis: "Private libraries of Dune"
 description: """\
 !!!!!!!!!!!!!!!!!!!!!!
@@ -34,10 +34,10 @@ build: [
 dev-repo: "git+https://github.com/ocaml/dune.git"
 url {
   src:
-    "https://github.com/ocaml/dune/releases/download/3.14.0/dune-3.14.0.tbz"
+    "https://github.com/ocaml/dune/releases/download/3.15.2/dune-3.15.2.tbz"
   checksum: [
-    "sha256=f4d09d89162621fdff424c253fa50c4920d2179fb5b3d1debab7bbe97c68b2fc"
-    "sha512=f5ead1a9a0cc26e00a762e83e107b47c3c3fe9b44d9e505547c385c7938208d4fdcc91a8099512e76ea4a426f3543445b4d75ef0b621dc7dbfdcbb615bc0b999"
+    "sha256=f959980542ca85909b3f3f8e9be65c2b8a375f3a4e3bd83c7ad7a07f2e077933"
+    "sha512=d752b8c09130cf3d564b3a524e3148783b581daa3f9a61d0f52bf4d6995ef73258e71877dbfd8b7516f9a4bac5ad973e80f4fed596df9446e704acc724aac55e"
   ]
 }
-x-commit-hash: "73250f00372d3f28a25963ded6138728f4202663"
+x-commit-hash: "c28817c416ac0b381f6a6938236419ab5d86d6e1"
diff --git a/packages/upstream/dune-site.3.14.0/opam b/packages/upstream/dune-site.3.15.2/opam
similarity index 65%
rename from packages/upstream/dune-site.3.14.0/opam
rename to packages/upstream/dune-site.3.15.2/opam
index 010fde03b..5a9be29ab 100644
--- a/packages/upstream/dune-site.3.14.0/opam
+++ b/packages/upstream/dune-site.3.15.2/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "dune-site"
-version: "3.14.0"
+version: "3.15.2"
 synopsis: "Embed locations information inside executable and libraries"
 maintainer: "Jane Street Group, LLC <opensource@janestreet.com>"
 authors: "Jane Street Group, LLC <opensource@janestreet.com>"
@@ -22,10 +22,10 @@ build: [
 dev-repo: "git+https://github.com/ocaml/dune.git"
 url {
   src:
-    "https://github.com/ocaml/dune/releases/download/3.14.0/dune-3.14.0.tbz"
+    "https://github.com/ocaml/dune/releases/download/3.15.2/dune-3.15.2.tbz"
   checksum: [
-    "sha256=f4d09d89162621fdff424c253fa50c4920d2179fb5b3d1debab7bbe97c68b2fc"
-    "sha512=f5ead1a9a0cc26e00a762e83e107b47c3c3fe9b44d9e505547c385c7938208d4fdcc91a8099512e76ea4a426f3543445b4d75ef0b621dc7dbfdcbb615bc0b999"
+    "sha256=f959980542ca85909b3f3f8e9be65c2b8a375f3a4e3bd83c7ad7a07f2e077933"
+    "sha512=d752b8c09130cf3d564b3a524e3148783b581daa3f9a61d0f52bf4d6995ef73258e71877dbfd8b7516f9a4bac5ad973e80f4fed596df9446e704acc724aac55e"
   ]
 }
-x-commit-hash: "73250f00372d3f28a25963ded6138728f4202663"
+x-commit-hash: "c28817c416ac0b381f6a6938236419ab5d86d6e1"
diff --git a/packages/upstream/dune.3.14.0/opam b/packages/upstream/dune.3.15.2/opam
similarity index 82%
rename from packages/upstream/dune.3.14.0/opam
rename to packages/upstream/dune.3.15.2/opam
index 945b35100..b99c95f5f 100644
--- a/packages/upstream/dune.3.14.0/opam
+++ b/packages/upstream/dune.3.15.2/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "dune"
-version: "3.14.0"
+version: "3.15.2"
 synopsis: "Fast, portable, and opinionated build system"
 description: """\
 Dune is a build system that was designed to simplify the release of
@@ -56,10 +56,10 @@ build: [
 dev-repo: "git+https://github.com/ocaml/dune.git"
 url {
   src:
-    "https://github.com/ocaml/dune/releases/download/3.14.0/dune-3.14.0.tbz"
+    "https://github.com/ocaml/dune/releases/download/3.15.2/dune-3.15.2.tbz"
   checksum: [
-    "sha256=f4d09d89162621fdff424c253fa50c4920d2179fb5b3d1debab7bbe97c68b2fc"
-    "sha512=f5ead1a9a0cc26e00a762e83e107b47c3c3fe9b44d9e505547c385c7938208d4fdcc91a8099512e76ea4a426f3543445b4d75ef0b621dc7dbfdcbb615bc0b999"
+    "sha256=f959980542ca85909b3f3f8e9be65c2b8a375f3a4e3bd83c7ad7a07f2e077933"
+    "sha512=d752b8c09130cf3d564b3a524e3148783b581daa3f9a61d0f52bf4d6995ef73258e71877dbfd8b7516f9a4bac5ad973e80f4fed596df9446e704acc724aac55e"
   ]
 }
-x-commit-hash: "73250f00372d3f28a25963ded6138728f4202663"
+x-commit-hash: "c28817c416ac0b381f6a6938236419ab5d86d6e1"
diff --git a/packages/upstream/dyn.3.14.0/opam b/packages/upstream/dyn.3.15.2/opam
similarity index 65%
rename from packages/upstream/dyn.3.14.0/opam
rename to packages/upstream/dyn.3.15.2/opam
index 10dc0a5ba..80a2a59cc 100644
--- a/packages/upstream/dyn.3.14.0/opam
+++ b/packages/upstream/dyn.3.15.2/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "dyn"
-version: "3.14.0"
+version: "3.15.2"
 synopsis: "Dynamic type"
 description: "Dynamic type"
 maintainer: "Jane Street Group, LLC <opensource@janestreet.com>"
@@ -25,10 +25,10 @@ build: [
 dev-repo: "git+https://github.com/ocaml/dune.git"
 url {
   src:
-    "https://github.com/ocaml/dune/releases/download/3.14.0/dune-3.14.0.tbz"
+    "https://github.com/ocaml/dune/releases/download/3.15.2/dune-3.15.2.tbz"
   checksum: [
-    "sha256=f4d09d89162621fdff424c253fa50c4920d2179fb5b3d1debab7bbe97c68b2fc"
-    "sha512=f5ead1a9a0cc26e00a762e83e107b47c3c3fe9b44d9e505547c385c7938208d4fdcc91a8099512e76ea4a426f3543445b4d75ef0b621dc7dbfdcbb615bc0b999"
+    "sha256=f959980542ca85909b3f3f8e9be65c2b8a375f3a4e3bd83c7ad7a07f2e077933"
+    "sha512=d752b8c09130cf3d564b3a524e3148783b581daa3f9a61d0f52bf4d6995ef73258e71877dbfd8b7516f9a4bac5ad973e80f4fed596df9446e704acc724aac55e"
   ]
 }
-x-commit-hash: "73250f00372d3f28a25963ded6138728f4202663"
+x-commit-hash: "c28817c416ac0b381f6a6938236419ab5d86d6e1"
diff --git a/packages/upstream/hmap.0.8.1/opam b/packages/upstream/hmap.0.8.1/opam
new file mode 100644
index 000000000..72b65e9f4
--- /dev/null
+++ b/packages/upstream/hmap.0.8.1/opam
@@ -0,0 +1,30 @@
+opam-version: "2.0"
+name: "hmap"
+version: "0.8.1"
+synopsis: "Heterogeneous value maps for OCaml"
+description: """\
+Hmap provides heterogeneous value maps for OCaml. These maps bind keys
+to values with arbitrary types. Keys witness the type of the value
+they are bound to which allows to add and lookup bindings in a type
+safe manner.
+
+Hmap has no dependency and is distributed under the ISC license."""
+maintainer: "Daniel Bünzli <daniel.buenzl i@erratique.ch>"
+authors: "Daniel Bünzli <daniel.buenzl i@erratique.ch>"
+license: "ISC"
+tags: ["data-structure" "org:erratique"]
+homepage: "http://erratique.ch/software/hmap"
+doc: "http://erratique.ch/software/hmap/doc"
+bug-reports: "http://github.com/dbuenzli/hmap/issues"
+depends: [
+  "ocaml" {>= "4.02.0"}
+  "ocamlfind" {build}
+  "ocamlbuild" {build}
+  "topkg" {build}
+]
+build: ["ocaml" "pkg/pkg.ml" "build" "--pinned" "%{pinned}%"]
+dev-repo: "git+http://erratique.ch/repos/hmap.git"
+url {
+  src: "http://erratique.ch/software/hmap/releases/hmap-0.8.1.tbz"
+  checksum: "md5=04169252265a11d852e1547445177196"
+}
diff --git a/packages/upstream/json-data-encoding.1.0.0/opam b/packages/upstream/json-data-encoding.1.0.1/opam
similarity index 72%
rename from packages/upstream/json-data-encoding.1.0.0/opam
rename to packages/upstream/json-data-encoding.1.0.1/opam
index 4d9699a5a..886d95c8b 100644
--- a/packages/upstream/json-data-encoding.1.0.0/opam
+++ b/packages/upstream/json-data-encoding.1.0.1/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "json-data-encoding"
-version: "1.0.0"
+version: "1.0.1"
 synopsis: "Type-safe encoding to and decoding from JSON"
 maintainer: "contact@nomadic-labs.com"
 authors: ["Nomadic Labs" "Ocamlpro"]
@@ -24,14 +24,15 @@ conflicts: [
 ]
 build: [
   ["dune" "build" "-j" jobs "-p" name]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+  ["dune" "runtest" "-p" name "-j" jobs]
+    {with-test & !ocaml-option-bytecode-only:installed}
 ]
 dev-repo: "git+https://gitlab.com/nomadic-labs/json-data-encoding"
 url {
   src:
-    "https://gitlab.com/nomadic-labs/data-encoding/-/archive/v1.0.0/data-encoding-v1.0.0.tar.gz"
+    "https://gitlab.com/nomadic-labs/data-encoding/-/archive/v1.0.1/data-encoding-v1.0.1.tar.gz"
   checksum: [
-    "md5=d15b03873f0ccc333b60bfcdf0595766"
-    "sha512=0a5355bae421b5d155eeff7ad333cce32cf317b88ac69a07be715ff9a4cd05c8e1715de4917ed8f67789070175654ea3e332a348e586d5005e8772f5672c4a6f"
+    "md5=82d6e7783274595c82cff4562e2b06a2"
+    "sha512=df5d00dfef8afeada8a6aee2a97d491a2ce20cfe90aed203848f6098ba05ba60e2ee9d1afc0c6c07cf32dad3f8e34c0b55cf900ef1f2e7a72d704f07fd32e651"
   ]
 }
diff --git a/packages/upstream/mirage-crypto-ec.0.10.7/opam b/packages/upstream/mirage-crypto-ec.0.10.7/opam
index 58e8d94b1..0986625c8 100644
--- a/packages/upstream/mirage-crypto-ec.0.10.7/opam
+++ b/packages/upstream/mirage-crypto-ec.0.10.7/opam
@@ -37,7 +37,7 @@ depends: [
   "mirage-crypto-pk" {with-test & = version}
   "hex" {with-test}
   "alcotest" {with-test}
-  "asn1-combinators" {with-test & >= "0.2.5"}
+  "asn1-combinators" {with-test & >= "0.2.5" & < "0.3.0"}
   "ppx_deriving_yojson" {with-test}
   "ppx_deriving" {with-test}
   "yojson" {with-test & >= "1.6.0"}
diff --git a/packages/upstream/mirage-crypto-pk.0.10.7/opam b/packages/upstream/mirage-crypto-pk.0.10.7/opam
index f9165be10..c872233a4 100644
--- a/packages/upstream/mirage-crypto-pk.0.10.7/opam
+++ b/packages/upstream/mirage-crypto-pk.0.10.7/opam
@@ -17,7 +17,7 @@ depends: [
   "ocaml" {>= "4.08.0"}
   "dune" {>= "2.6"}
   "ounit2" {with-test}
-  "randomconv" {with-test & >= "0.1.3"}
+  "randomconv" {with-test & >= "0.1.3" & < "0.2.0"}
   "cstruct" {>= "6.00"}
   "mirage-crypto" {= version}
   "mirage-crypto-rng" {= version}
diff --git a/packages/upstream/mirage-crypto-rng.0.10.7/opam b/packages/upstream/mirage-crypto-rng.0.10.7/opam
index 313128181..3aec2a287 100644
--- a/packages/upstream/mirage-crypto-rng.0.10.7/opam
+++ b/packages/upstream/mirage-crypto-rng.0.10.7/opam
@@ -23,7 +23,7 @@ depends: [
   "logs"
   "mirage-crypto" {= version}
   "ounit2" {with-test}
-  "randomconv" {with-test & >= "0.1.3"}
+  "randomconv" {with-test & >= "0.1.3" & < "0.2.0"}
   "mtime" {>= "1.0.0"}
   "lwt" {>= "4.0.0"}
 ]
diff --git a/packages/upstream/ocaml-compiler-libs.v0.12.4/opam b/packages/upstream/ocaml-compiler-libs.v0.12.4/opam
index 3c8c3f4ea..0cdc18c67 100644
--- a/packages/upstream/ocaml-compiler-libs.v0.12.4/opam
+++ b/packages/upstream/ocaml-compiler-libs.v0.12.4/opam
@@ -12,7 +12,7 @@ homepage: "https://github.com/janestreet/ocaml-compiler-libs"
 bug-reports: "https://github.com/janestreet/ocaml-compiler-libs/issues"
 depends: [
   "dune" {>= "2.8"}
-  "ocaml" {>= "4.04.1"}
+  "ocaml" {>= "4.04.1" & < "5.2.0"}
   "odoc" {with-doc}
 ]
 build: [
diff --git a/packages/upstream/ocaml-version.3.6.4/opam b/packages/upstream/ocaml-version.3.6.7/opam
similarity index 83%
rename from packages/upstream/ocaml-version.3.6.4/opam
rename to packages/upstream/ocaml-version.3.6.7/opam
index f597e2668..cc247e9c5 100644
--- a/packages/upstream/ocaml-version.3.6.4/opam
+++ b/packages/upstream/ocaml-version.3.6.7/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ocaml-version"
-version: "3.6.4"
+version: "3.6.7"
 synopsis: "Manipulate, parse and generate OCaml compiler version strings"
 description: """\
 This library provides facilities to parse version numbers of the OCaml compiler, and enumerates the various official OCaml releases and configuration variants.
@@ -47,10 +47,10 @@ build: [
 dev-repo: "git+https://github.com/ocurrent/ocaml-version.git"
 url {
   src:
-    "https://github.com/ocurrent/ocaml-version/releases/download/v3.6.4/ocaml-version-3.6.4.tbz"
+    "https://github.com/ocurrent/ocaml-version/releases/download/v3.6.7/ocaml-version-3.6.7.tbz"
   checksum: [
-    "sha256=270bcebfe43881ebc09c897bde5ea3b90737b7673ee4100f8c0c6cff321872dc"
-    "sha512=bc431d9984c6341a08ca8ce68dcead9cbf6a7954aa10966b32ba1d8df0beb363d1ecfcff373b7afc3b301a681dd131fe588bfdb965f2c983db6061f361fec40a"
+    "sha256=d50ffd5b669d33edb0d889c476a71de4888d90008d58336038d210ced28f810c"
+    "sha512=128c2777152d6050a1cc07e520876aa7bef380459dd6a3dbcc8e42352afcbd7ebb8f8ef1751beb865346d49ba6f0c2dc45359f2367e5d4c53906008fc51d95eb"
   ]
 }
-x-commit-hash: "bf2f60c037aa84c41a38f0275c87df9e822d99e2"
+x-commit-hash: "1fd32aebc48b86a81e3f825229180f530a94729a"
diff --git a/packages/upstream/ocamlformat-lib.0.26.1/opam b/packages/upstream/ocamlformat-lib.0.26.2/opam
similarity index 82%
rename from packages/upstream/ocamlformat-lib.0.26.1/opam
rename to packages/upstream/ocamlformat-lib.0.26.2/opam
index 2472fa6aa..25b87b15f 100644
--- a/packages/upstream/ocamlformat-lib.0.26.1/opam
+++ b/packages/upstream/ocamlformat-lib.0.26.2/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ocamlformat-lib"
-version: "0.26.1"
+version: "0.26.2"
 synopsis: "OCaml Code Formatter"
 description:
   "OCamlFormat is a tool to automatically format OCaml code in a uniform style."
@@ -60,10 +60,10 @@ build: [
 dev-repo: "git+https://github.com/ocaml-ppx/ocamlformat.git"
 url {
   src:
-    "https://github.com/ocaml-ppx/ocamlformat/releases/download/0.26.1/ocamlformat-0.26.1.tbz"
+    "https://github.com/ocaml-ppx/ocamlformat/releases/download/0.26.2/ocamlformat-0.26.2.tbz"
   checksum: [
-    "sha256=da006e427f15b9ec612fb808d446599bd9b7c3ee25abeb3d555747a70d74c6d7"
-    "sha512=b7413f8dc47ba3a2372e89d59cae54f9a602ab81e31cd14ed986a831111080b79a5a3cc45dac04d8ffae5054c35bf29fe9559f145c76c87a30e191ed5400942a"
+    "sha256=2e4f596bf7aa367a844fe83ba0f6b0bf14b2a65179ddc082363fe9793d0375c5"
+    "sha512=b03d57462e65b11aa9f78dd5c4548251e8d1c5a1c9662f7502bdb10472aeb9df33c1d407350767a5223fbff9c01d53de85bafacd0274b49abc4b43701b159bee"
   ]
 }
-x-commit-hash: "6734dfc1992eb782f0a936ce3cd7c78b7c1d39d3"
+x-commit-hash: "f5727b32127730a2722f86c7119eb6d8f884e26d"
diff --git a/packages/upstream/ocamlformat.0.26.1/opam b/packages/upstream/ocamlformat.0.26.2/opam
similarity index 83%
rename from packages/upstream/ocamlformat.0.26.1/opam
rename to packages/upstream/ocamlformat.0.26.2/opam
index 700776054..adf491804 100644
--- a/packages/upstream/ocamlformat.0.26.1/opam
+++ b/packages/upstream/ocamlformat.0.26.2/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ocamlformat"
-version: "0.26.1"
+version: "0.26.2"
 synopsis: "Auto-formatter for OCaml code"
 description: """\
 **ocamlformat** is a code formatter for OCaml. It comes with opinionated default settings but is also fully customizable to suit your coding style.
@@ -25,7 +25,7 @@ license: "MIT AND LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 homepage: "https://github.com/ocaml-ppx/ocamlformat"
 bug-reports: "https://github.com/ocaml-ppx/ocamlformat/issues"
 depends: [
-  "ocaml" {>= "4.08" & < "5.2"}
+  "ocaml" {>= "4.08"}
   "cmdliner" {with-test = "false" & >= "1.1.0" | with-test & >= "1.2.0"}
   "dune" {>= "2.8"}
   "ocamlformat-lib" {= version}
@@ -50,10 +50,10 @@ build: [
 dev-repo: "git+https://github.com/ocaml-ppx/ocamlformat.git"
 url {
   src:
-    "https://github.com/ocaml-ppx/ocamlformat/releases/download/0.26.1/ocamlformat-0.26.1.tbz"
+    "https://github.com/ocaml-ppx/ocamlformat/releases/download/0.26.2/ocamlformat-0.26.2.tbz"
   checksum: [
-    "sha256=da006e427f15b9ec612fb808d446599bd9b7c3ee25abeb3d555747a70d74c6d7"
-    "sha512=b7413f8dc47ba3a2372e89d59cae54f9a602ab81e31cd14ed986a831111080b79a5a3cc45dac04d8ffae5054c35bf29fe9559f145c76c87a30e191ed5400942a"
+    "sha256=2e4f596bf7aa367a844fe83ba0f6b0bf14b2a65179ddc082363fe9793d0375c5"
+    "sha512=b03d57462e65b11aa9f78dd5c4548251e8d1c5a1c9662f7502bdb10472aeb9df33c1d407350767a5223fbff9c01d53de85bafacd0274b49abc4b43701b159bee"
   ]
 }
-x-commit-hash: "6734dfc1992eb782f0a936ce3cd7c78b7c1d39d3"
+x-commit-hash: "f5727b32127730a2722f86c7119eb6d8f884e26d"
diff --git a/packages/upstream/opentelemetry-client-ocurl.0.7/opam b/packages/upstream/opentelemetry-client-ocurl.0.9/opam
similarity index 76%
rename from packages/upstream/opentelemetry-client-ocurl.0.7/opam
rename to packages/upstream/opentelemetry-client-ocurl.0.9/opam
index ad296a020..1fde6e129 100644
--- a/packages/upstream/opentelemetry-client-ocurl.0.7/opam
+++ b/packages/upstream/opentelemetry-client-ocurl.0.9/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "opentelemetry-client-ocurl"
-version: "0.7"
+version: "0.9"
 synopsis: "Collector client for opentelemetry, using http + ezcurl"
 maintainer: [
   "Simon Cruanes <simon.cruanes.2007@m4x.org>"
@@ -40,10 +40,10 @@ build: [
 dev-repo: "git+https://github.com/imandra-ai/ocaml-opentelemetry.git"
 url {
   src:
-    "https://github.com/imandra-ai/ocaml-opentelemetry/releases/download/v0.7/opentelemetry-0.7.tbz"
+    "https://github.com/imandra-ai/ocaml-opentelemetry/releases/download/v0.9/opentelemetry-0.9.tbz"
   checksum: [
-    "sha256=a5de04aa33f5b66e4a63377fd868a839814a4ee229c98c84a04bd49926a38e1d"
-    "sha512=f0f9956cb6a605826018794a8fa866b5bda622d2aaa82c4cca5e10262ae163a99512ee22ed4ef0c3af0bb4eeabc7aee736fe7830c585879b029b5ef6d4ef2b05"
+    "sha256=400e6fcaff55b92e65d5c082d0262a7c2fc91b385dac0f18ed28405db2669978"
+    "sha512=9f4d2329dec682bb2a839d1c7065f35bc557fc8ef5996c5923cf05af716e6519b0ce66316687e74232cf93baa5c1df4899d1bdd4b4f4b44468bb8b3f57619913"
   ]
 }
-x-commit-hash: "5a78805addcc09f08e374a4d7b37a4128bcabe69"
+x-commit-hash: "f9233113b130b7426e5d14ec3eee5c24c4bdd71e"
diff --git a/packages/upstream/opentelemetry.0.7/opam b/packages/upstream/opentelemetry.0.9/opam
similarity index 77%
rename from packages/upstream/opentelemetry.0.7/opam
rename to packages/upstream/opentelemetry.0.9/opam
index 4ba86d459..bf6cde9d8 100644
--- a/packages/upstream/opentelemetry.0.7/opam
+++ b/packages/upstream/opentelemetry.0.9/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "opentelemetry"
-version: "0.7"
+version: "0.9"
 synopsis: "Instrumentation for https://opentelemetry.io"
 maintainer: [
   "Simon Cruanes <simon.cruanes.2007@m4x.org>"
@@ -16,6 +16,7 @@ depends: [
   "dune" {>= "2.9"}
   "ocaml" {>= "4.08"}
   "ptime"
+  "hmap"
   "ambient-context"
   "odoc" {with-doc}
   "alcotest" {with-test}
@@ -25,7 +26,7 @@ depends: [
 ]
 depopts: ["trace"]
 conflicts: [
-  "trace" {< "0.4" | >= "0.7"}
+  "trace" {< "0.7"}
 ]
 build: [
   ["dune" "subst"] {dev}
@@ -46,10 +47,10 @@ build: [
 dev-repo: "git+https://github.com/imandra-ai/ocaml-opentelemetry.git"
 url {
   src:
-    "https://github.com/imandra-ai/ocaml-opentelemetry/releases/download/v0.7/opentelemetry-0.7.tbz"
+    "https://github.com/imandra-ai/ocaml-opentelemetry/releases/download/v0.9/opentelemetry-0.9.tbz"
   checksum: [
-    "sha256=a5de04aa33f5b66e4a63377fd868a839814a4ee229c98c84a04bd49926a38e1d"
-    "sha512=f0f9956cb6a605826018794a8fa866b5bda622d2aaa82c4cca5e10262ae163a99512ee22ed4ef0c3af0bb4eeabc7aee736fe7830c585879b029b5ef6d4ef2b05"
+    "sha256=400e6fcaff55b92e65d5c082d0262a7c2fc91b385dac0f18ed28405db2669978"
+    "sha512=9f4d2329dec682bb2a839d1c7065f35bc557fc8ef5996c5923cf05af716e6519b0ce66316687e74232cf93baa5c1df4899d1bdd4b4f4b44468bb8b3f57619913"
   ]
 }
-x-commit-hash: "5a78805addcc09f08e374a4d7b37a4128bcabe69"
+x-commit-hash: "f9233113b130b7426e5d14ec3eee5c24c4bdd71e"
diff --git a/packages/upstream/ordering.3.14.0/opam b/packages/upstream/ordering.3.15.2/opam
similarity index 64%
rename from packages/upstream/ordering.3.14.0/opam
rename to packages/upstream/ordering.3.15.2/opam
index 41e730595..0e8de4eff 100644
--- a/packages/upstream/ordering.3.14.0/opam
+++ b/packages/upstream/ordering.3.15.2/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ordering"
-version: "3.14.0"
+version: "3.15.2"
 synopsis: "Element ordering"
 description: "Element ordering"
 maintainer: "Jane Street Group, LLC <opensource@janestreet.com>"
@@ -23,10 +23,10 @@ build: [
 dev-repo: "git+https://github.com/ocaml/dune.git"
 url {
   src:
-    "https://github.com/ocaml/dune/releases/download/3.14.0/dune-3.14.0.tbz"
+    "https://github.com/ocaml/dune/releases/download/3.15.2/dune-3.15.2.tbz"
   checksum: [
-    "sha256=f4d09d89162621fdff424c253fa50c4920d2179fb5b3d1debab7bbe97c68b2fc"
-    "sha512=f5ead1a9a0cc26e00a762e83e107b47c3c3fe9b44d9e505547c385c7938208d4fdcc91a8099512e76ea4a426f3543445b4d75ef0b621dc7dbfdcbb615bc0b999"
+    "sha256=f959980542ca85909b3f3f8e9be65c2b8a375f3a4e3bd83c7ad7a07f2e077933"
+    "sha512=d752b8c09130cf3d564b3a524e3148783b581daa3f9a61d0f52bf4d6995ef73258e71877dbfd8b7516f9a4bac5ad973e80f4fed596df9446e704acc724aac55e"
   ]
 }
-x-commit-hash: "73250f00372d3f28a25963ded6138728f4202663"
+x-commit-hash: "c28817c416ac0b381f6a6938236419ab5d86d6e1"
diff --git a/packages/upstream/ppx_deriving_hash.0.1.1/opam b/packages/upstream/ppx_deriving_hash.0.1.2/opam
similarity index 70%
rename from packages/upstream/ppx_deriving_hash.0.1.1/opam
rename to packages/upstream/ppx_deriving_hash.0.1.2/opam
index 61d5ca0bd..fa946b6e1 100644
--- a/packages/upstream/ppx_deriving_hash.0.1.1/opam
+++ b/packages/upstream/ppx_deriving_hash.0.1.2/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ppx_deriving_hash"
-version: "0.1.1"
+version: "0.1.2"
 synopsis: "[@@deriving hash]"
 description:
   "Deriver for standard hash functions without extra dependencies."
@@ -32,10 +32,10 @@ build: [
 dev-repo: "git+https://github.com/sim642/ppx_deriving_hash.git"
 url {
   src:
-    "https://github.com/sim642/ppx_deriving_hash/releases/download/0.1.1/ppx_deriving_hash-0.1.1.tbz"
+    "https://github.com/sim642/ppx_deriving_hash/releases/download/0.1.2/ppx_deriving_hash-0.1.2.tbz"
   checksum: [
-    "sha256=bdaaac5ab278eee6ded154e405eb7fa8a2dd2b7483032628ce56ef21ae062f24"
-    "sha512=2f19db33fe08c7deb196c7040d649713e5a45389b4cc4074f49b25c9744cd9c70fcd6cdb4814981418d4a7120eecddbeabb7f63688080517c777000dba857655"
+    "sha256=b2cdce00b0fef439b9c2dc20bd0d1248bec2bb4c56ba6c0a98b04a3c387815af"
+    "sha512=3bd89f1215439a20aa81f8eae46574d8b80800a059ce4590774616e5ec349f73f010e0126c3390909942f8c5c258b67ab0ef10df7a5084322861a542a4ec8399"
   ]
 }
-x-commit-hash: "221737ebcfed3dfe8d6af981739c7c335c4822e6"
+x-commit-hash: "c916f11a2365b3fe2ab77096b6073ebf62ea082b"
diff --git a/packages/upstream/ppxlib.0.32.0/opam b/packages/upstream/ppxlib.0.32.1/opam
similarity index 78%
rename from packages/upstream/ppxlib.0.32.0/opam
rename to packages/upstream/ppxlib.0.32.1/opam
index 408e2320d..d8cf504ad 100644
--- a/packages/upstream/ppxlib.0.32.0/opam
+++ b/packages/upstream/ppxlib.0.32.1/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ppxlib"
-version: "0.32.0"
+version: "0.32.1"
 synopsis: "Standard infrastructure for ppx rewriters"
 description: """\
 Ppxlib is the standard infrastructure for ppx rewriters
@@ -21,7 +21,7 @@ doc: "https://ocaml-ppx.github.io/ppxlib/"
 bug-reports: "https://github.com/ocaml-ppx/ppxlib/issues"
 depends: [
   "dune" {>= "2.7"}
-  "ocaml" {>= "4.04.1" & < "5.2.0" & != "5.1.0~alpha1"}
+  "ocaml" {>= "4.04.1" & < "5.3.0"}
   "ocaml-compiler-libs" {>= "v0.11.0"}
   "ppx_derivers" {>= "1.0"}
   "sexplib0" {>= "v0.12"}
@@ -34,6 +34,8 @@ depends: [
 ]
 conflicts: [
   "ocaml-migrate-parsetree" {< "2.0.0"}
+  "ocaml-base-compiler" {= "5.1.0~alpha1"}
+  "ocaml-variants" {= "5.1.0~alpha1+options"}
   "base-effects"
 ]
 build: [
@@ -53,10 +55,10 @@ build: [
 dev-repo: "git+https://github.com/ocaml-ppx/ppxlib.git"
 url {
   src:
-    "https://github.com/ocaml-ppx/ppxlib/releases/download/0.32.0/ppxlib-0.32.0.tbz"
+    "https://github.com/ocaml-ppx/ppxlib/releases/download/0.32.1/ppxlib-0.32.1.tbz"
   checksum: [
-    "sha256=507cc73ccf895f22eeb5257a2243838c18a38a09105fcff55eeef9148555422b"
-    "sha512=73fef8ab8761bfbfde6ae87cc51eaacc5a5c937f0d628a890f0abdb2bffbf073932c25287a9e3baa2a1947c37f3dfa7f83ddd33c440e2e800971015addc97cd2"
+    "sha256=9dbad8bcb1c8b4f3df3f58bca60a5ed23d86531f0da34b4196c86bd585c09d7f"
+    "sha512=7b93b622b119478dde03adcf4993e73ea937c91c280e453ccee631c682d8589ecb31841f11d6a14966239954e22e000da8afbe25a0f089532c7210b698c52553"
   ]
 }
-x-commit-hash: "ad46a4c87f99a44dc70b2ec4c42caec2ccacc3c3"
+x-commit-hash: "cd138a752ae6f21ad649c531b3b2276f332b3bb0"
diff --git a/packages/upstream/qcheck-core.0.21.2/opam b/packages/upstream/qcheck-core.0.21.3/opam
similarity index 72%
rename from packages/upstream/qcheck-core.0.21.2/opam
rename to packages/upstream/qcheck-core.0.21.3/opam
index ab141e7a3..4ee7225ca 100644
--- a/packages/upstream/qcheck-core.0.21.2/opam
+++ b/packages/upstream/qcheck-core.0.21.3/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "qcheck-core"
-version: "0.21.2"
+version: "0.21.3"
 synopsis: "Core qcheck library"
 maintainer: "simon.cruanes.2007@m4x.org"
 authors: "the qcheck contributors"
@@ -11,7 +11,6 @@ doc: "http://c-cube.github.io/qcheck/"
 bug-reports: "https://github.com/c-cube/qcheck/issues"
 depends: [
   "dune" {>= "2.8.0"}
-  "base-bytes"
   "base-unix"
   "alcotest" {with-test}
   "odoc" {with-doc}
@@ -27,9 +26,9 @@ build: [
 ]
 dev-repo: "git+https://github.com/c-cube/qcheck.git"
 url {
-  src: "https://github.com/c-cube/qcheck/archive/v0.21.2.tar.gz"
+  src: "https://github.com/c-cube/qcheck/archive/v0.21.3.tar.gz"
   checksum: [
-    "md5=b8e3728fc1b534ee01e3c2b7e2b30bb3"
-    "sha512=67ff77a66ccf046dfede9123a322002f232a0a65b8ce1890795a4a4ba247bc5413f988e7cfd53412418036c2b907e4cbcd7dcd39d7f1fd2481aee60107b075cc"
+    "md5=8930042156873aa8dfa433d7c1bf8463"
+    "sha512=89d8a8a1990cfa8cd839e732f4cc89d68811ae0cc04732668e1e2691e1eb6e3c525f75936bdb261aebdaa3a8845eb717128b0bf21884bbda80d64ba957d2e6e1"
   ]
 }
diff --git a/packages/upstream/stdune.3.14.0/opam b/packages/upstream/stdune.3.15.2/opam
similarity index 70%
rename from packages/upstream/stdune.3.14.0/opam
rename to packages/upstream/stdune.3.15.2/opam
index ecb7c685a..9c8a7f8b7 100644
--- a/packages/upstream/stdune.3.14.0/opam
+++ b/packages/upstream/stdune.3.15.2/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "stdune"
-version: "3.14.0"
+version: "3.15.2"
 synopsis: "Dune's unstable standard library"
 description:
   "This library offers no backwards compatibility guarantees. Use at your own risk."
@@ -29,10 +29,10 @@ build: [
 dev-repo: "git+https://github.com/ocaml/dune.git"
 url {
   src:
-    "https://github.com/ocaml/dune/releases/download/3.14.0/dune-3.14.0.tbz"
+    "https://github.com/ocaml/dune/releases/download/3.15.2/dune-3.15.2.tbz"
   checksum: [
-    "sha256=f4d09d89162621fdff424c253fa50c4920d2179fb5b3d1debab7bbe97c68b2fc"
-    "sha512=f5ead1a9a0cc26e00a762e83e107b47c3c3fe9b44d9e505547c385c7938208d4fdcc91a8099512e76ea4a426f3543445b4d75ef0b621dc7dbfdcbb615bc0b999"
+    "sha256=f959980542ca85909b3f3f8e9be65c2b8a375f3a4e3bd83c7ad7a07f2e077933"
+    "sha512=d752b8c09130cf3d564b3a524e3148783b581daa3f9a61d0f52bf4d6995ef73258e71877dbfd8b7516f9a4bac5ad973e80f4fed596df9446e704acc724aac55e"
   ]
 }
-x-commit-hash: "73250f00372d3f28a25963ded6138728f4202663"
+x-commit-hash: "c28817c416ac0b381f6a6938236419ab5d86d6e1"
diff --git a/packages/upstream/trace.0.7/opam b/packages/upstream/trace.0.7/opam
new file mode 100644
index 000000000..073042bc2
--- /dev/null
+++ b/packages/upstream/trace.0.7/opam
@@ -0,0 +1,46 @@
+opam-version: "2.0"
+name: "trace"
+version: "0.7"
+synopsis:
+  "A stub for tracing/observability, agnostic in how data is collected"
+maintainer: "Simon Cruanes"
+authors: "Simon Cruanes"
+license: "MIT"
+tags: ["trace" "tracing" "observability" "profiling"]
+homepage: "https://github.com/c-cube/ocaml-trace"
+bug-reports: "https://github.com/c-cube/ocaml-trace/issues"
+depends: [
+  "ocaml" {>= "4.08"}
+  "dune" {>= "2.9"}
+  "odoc" {with-doc}
+]
+depopts: [
+  "hmap"
+  "mtime" {>= "2.0"}
+]
+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/c-cube/ocaml-trace.git"
+url {
+  src:
+    "https://github.com/c-cube/ocaml-trace/releases/download/v0.7/trace-0.7.tbz"
+  checksum: [
+    "sha256=ebd0be29b30b49536c9659882790b9f0c121ffb06c0bec2eaeba8cfed4909339"
+    "sha512=d14b72db713315093c931351b9b04d2fd5ce793a8595970fa31cbf71477516ef25de129adddf4075514581fe9ea3e27d998530efacb17c0d00bb5616b8d18b91"
+  ]
+}
+x-commit-hash: "62063f3f941224b6532d588f0926cd3a22cc194a"
diff --git a/packages/upstream/x509.0.16.5/opam b/packages/upstream/x509.0.16.5/opam
index bd73e3ed6..13fceb1ab 100644
--- a/packages/upstream/x509.0.16.5/opam
+++ b/packages/upstream/x509.0.16.5/opam
@@ -23,7 +23,7 @@ depends: [
   "ocaml" {>= "4.08.0"}
   "dune" {>= "1.2"}
   "cstruct" {>= "6.0.0"}
-  "asn1-combinators" {>= "0.2.0"}
+  "asn1-combinators" {>= "0.2.0" & < "0.3.0"}
   "ptime"
   "base64" {>= "3.3.0"}
   "mirage-crypto"
diff --git a/packages/xs-extra/cohttp-posix.master/opam b/packages/xs-extra/cohttp-posix.master/opam
index 62e5a3961..82bd187a8 100644
--- a/packages/xs-extra/cohttp-posix.master/opam
+++ b/packages/xs-extra/cohttp-posix.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
 maintainer: "xen-api@lists.xen.org"
 authors: "xen-api@lists.xen.org"
diff --git a/packages/xs-extra/ezxenstore.master/opam b/packages/xs-extra/ezxenstore.master/opam
index a04230e6f..8f3559864 100644
--- a/packages/xs-extra/ezxenstore.master/opam
+++ b/packages/xs-extra/ezxenstore.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+
 opam-version: "2.0"
 maintainer: "xapi project maintainers"
 authors: ["Jonathan Ludlam"]
diff --git a/packages/xs-extra/forkexec.master/opam b/packages/xs-extra/forkexec.master/opam
index 6e9cd4df4..a3296ea97 100644
--- a/packages/xs-extra/forkexec.master/opam
+++ b/packages/xs-extra/forkexec.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
 maintainer: "xen-api@lists.xen.org"
 authors: "xen-api@lists.xen.org"
@@ -19,6 +21,7 @@ depends: [
   "xapi-log"
   "xapi-stdext-pervasives"
   "xapi-stdext-unix"
+  "xapi-tracing"
 ]
 synopsis: "Sub-process control service for xapi"
 description:
diff --git a/packages/xs-extra/gzip.master/opam b/packages/xs-extra/gzip.master/opam
index 8e7be0f37..59901c80e 100644
--- a/packages/xs-extra/gzip.master/opam
+++ b/packages/xs-extra/gzip.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
 maintainer: "xen-api@lists.xen.org"
 authors: "xen-api@lists.xen.org"
diff --git a/packages/xs-extra/http-lib.master/opam b/packages/xs-extra/http-lib.master/opam
index 7a09878b4..cbea47b7d 100644
--- a/packages/xs-extra/http-lib.master/opam
+++ b/packages/xs-extra/http-lib.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
 maintainer: "xen-api@lists.xen.org"
 authors: "xen-api@lists.xen.org"
diff --git a/packages/xs-extra/message-switch-async.master/opam b/packages/xs-extra/message-switch-async.master/opam
index a68286730..1192cb6cb 100644
--- a/packages/xs-extra/message-switch-async.master/opam
+++ b/packages/xs-extra/message-switch-async.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
 name: "message-switch-async"
 maintainer: "xen-api@lists.xen.org"
diff --git a/packages/xs-extra/message-switch-cli.master/opam b/packages/xs-extra/message-switch-cli.master/opam
index dbf5de7d8..d576f9f3a 100644
--- a/packages/xs-extra/message-switch-cli.master/opam
+++ b/packages/xs-extra/message-switch-cli.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
 name: "message-switch-cli"
 maintainer: "xen-api@lists.xen.org"
diff --git a/packages/xs-extra/message-switch-core.master/opam b/packages/xs-extra/message-switch-core.master/opam
index 7ec11e91d..44e2983cc 100644
--- a/packages/xs-extra/message-switch-core.master/opam
+++ b/packages/xs-extra/message-switch-core.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
 name: "message-switch-core"
 maintainer: "xen-api@lists.xen.org"
@@ -20,6 +22,7 @@ depends: [
   "ppx_sexp_conv"
   "rpclib"
   "sexplib"
+  "xapi-log"
 ]
 synopsis: "A simple store-and-forward message switch"
 description: """
diff --git a/packages/xs-extra/message-switch-lwt.master/opam b/packages/xs-extra/message-switch-lwt.master/opam
index 766fbbcea..a52b3eca1 100644
--- a/packages/xs-extra/message-switch-lwt.master/opam
+++ b/packages/xs-extra/message-switch-lwt.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
 name: "message-switch-lwt"
 maintainer: "xen-api@lists.xen.org"
diff --git a/packages/xs-extra/message-switch-unix.master/opam b/packages/xs-extra/message-switch-unix.master/opam
index f21bd6e18..64fd72db2 100644
--- a/packages/xs-extra/message-switch-unix.master/opam
+++ b/packages/xs-extra/message-switch-unix.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
 name: "message-switch-unix"
 maintainer: "xen-api@lists.xen.org"
diff --git a/packages/xs-extra/message-switch.master/opam b/packages/xs-extra/message-switch.master/opam
index 5322fe9f4..39cf5bea1 100644
--- a/packages/xs-extra/message-switch.master/opam
+++ b/packages/xs-extra/message-switch.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
 name: "message-switch"
 maintainer: "xen-api@lists.xen.org"
diff --git a/packages/xs-extra/pciutil.master/opam b/packages/xs-extra/pciutil.master/opam
index fb0823e55..e4c52c162 100644
--- a/packages/xs-extra/pciutil.master/opam
+++ b/packages/xs-extra/pciutil.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
 maintainer: "xen-api@lists.xen.org"
 authors: "xen-api@lists.xen.org"
diff --git a/packages/xs-extra/rrd-transport.master/opam b/packages/xs-extra/rrd-transport.master/opam
index 11fed3d55..aa031f213 100644
--- a/packages/xs-extra/rrd-transport.master/opam
+++ b/packages/xs-extra/rrd-transport.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
 maintainer: "xen-api@lists.xen.org"
 authors: "John Else"
diff --git a/packages/xs-extra/rrd2csv.master/opam b/packages/xs-extra/rrd2csv.master/opam
index 0f5982442..cb36ed57a 100644
--- a/packages/xs-extra/rrd2csv.master/opam
+++ b/packages/xs-extra/rrd2csv.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+
 opam-version: "2.0"
 name: "rrd2csv"
 maintainer: "opam-devel@lists.ocaml.org"
diff --git a/packages/xs-extra/rrdd-plugin.master/opam b/packages/xs-extra/rrdd-plugin.master/opam
index 2c889ba1a..093a8396b 100644
--- a/packages/xs-extra/rrdd-plugin.master/opam
+++ b/packages/xs-extra/rrdd-plugin.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
 maintainer: "xen-api@lists.xen.org"
 authors: "xen-api@lists.xen.org"
diff --git a/packages/xs-extra/rrdd-plugins.master/opam b/packages/xs-extra/rrdd-plugins.master/opam
index 9db3f7e4a..e0a4ac91a 100644
--- a/packages/xs-extra/rrdd-plugins.master/opam
+++ b/packages/xs-extra/rrdd-plugins.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+
 opam-version: "2.0"
 name: "rrdd-plugins"
 maintainer: "xs-devel@lists.xenserver.org"
diff --git a/packages/xs-extra/rrddump.master/opam b/packages/xs-extra/rrddump.master/opam
index c97c7947e..b52fb1cb4 100644
--- a/packages/xs-extra/rrddump.master/opam
+++ b/packages/xs-extra/rrddump.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
 synopsis: "Tool to dump RRD contents to XML format"
 description: "Tool to dump RRD contents to XML format"
diff --git a/packages/xs-extra/safe-resources.master/opam b/packages/xs-extra/safe-resources.master/opam
index b02f53a13..18c9270b9 100644
--- a/packages/xs-extra/safe-resources.master/opam
+++ b/packages/xs-extra/safe-resources.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
 maintainer: "xen-api@lists.xen.org"
 authors: "xen-api@lists.xen.org"
diff --git a/packages/xs-extra/sexpr.master/opam b/packages/xs-extra/sexpr.master/opam
index 0448d5c4d..49226ada7 100644
--- a/packages/xs-extra/sexpr.master/opam
+++ b/packages/xs-extra/sexpr.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
 maintainer: "xen-api@lists.xen.org"
 authors: "xen-api@lists.xen.org"
diff --git a/packages/xs-extra/stunnel.master/opam b/packages/xs-extra/stunnel.master/opam
index 1e96c54c8..3831cdec0 100644
--- a/packages/xs-extra/stunnel.master/opam
+++ b/packages/xs-extra/stunnel.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
 maintainer: "xen-api@lists.xen.org"
 authors: "xen-api@lists.xen.org"
diff --git a/packages/xs-extra/uuid.master/opam b/packages/xs-extra/uuid.master/opam
index daa9cee8d..fa7da3a73 100644
--- a/packages/xs-extra/uuid.master/opam
+++ b/packages/xs-extra/uuid.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
 maintainer: "xen-api@lists.xen.org"
 authors: "xen-api@lists.xen.org"
diff --git a/packages/xs-extra/varstored-guard.master/opam b/packages/xs-extra/varstored-guard.master/opam
index d58715bcc..2e794c930 100644
--- a/packages/xs-extra/varstored-guard.master/opam
+++ b/packages/xs-extra/varstored-guard.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
 maintainer: "xen-api@lists.xen.org"
 authors: [ "xen-api@lists.xen.org" ]
diff --git a/packages/xs-extra/vhd-format-lwt.master/opam b/packages/xs-extra/vhd-format-lwt.master/opam
index 34e716c5c..eac244d61 100644
--- a/packages/xs-extra/vhd-format-lwt.master/opam
+++ b/packages/xs-extra/vhd-format-lwt.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+
 opam-version: "2.0"
 name: "vhd-format-lwt"
 synopsis: "Lwt interface to read/write VHD format data"
@@ -22,9 +24,9 @@ depends: [
   "lwt" {>= "3.2.0"}
   "mirage-block" {>= "2.0.1"}
   "ounit2" {with-test}
-  "vhd-format"
+  "vhd-format" {= version}
   "dune" {>= "1.0"}
-  "io-page" {with-test & >= "2.4.0" & < "3.0.0"}
+  "io-page" {with-test & >= "2.4.0"}
 ]
 available: os = "linux" | os = "macos"
 build: [
diff --git a/packages/xs-extra/vhd-format.master/opam b/packages/xs-extra/vhd-format.master/opam
index 77a5c6ad5..896d90139 100644
--- a/packages/xs-extra/vhd-format.master/opam
+++ b/packages/xs-extra/vhd-format.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+
 opam-version: "2.0"
 name: "vhd-format"
 synopsis: "Pure OCaml library to read/write VHD format data"
diff --git a/packages/xs-extra/vhd-tool.master/opam b/packages/xs-extra/vhd-tool.master/opam
index 52cf0e72d..c1f8135c9 100644
--- a/packages/xs-extra/vhd-tool.master/opam
+++ b/packages/xs-extra/vhd-tool.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
 maintainer: "xen-api@lists.xen.org"
 authors: [ "xen-api@lists.xen.org" ]
diff --git a/packages/xs-extra/wsproxy.master/opam b/packages/xs-extra/wsproxy.master/opam
index 5a5fdd009..baceb5d55 100644
--- a/packages/xs-extra/wsproxy.master/opam
+++ b/packages/xs-extra/wsproxy.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+
 opam-version: "2.0"
 name: "wsproxy"
 maintainer: "xen-api@lists.xen.org"
diff --git a/packages/xs-extra/xapi-cli-protocol.master/opam b/packages/xs-extra/xapi-cli-protocol.master/opam
index 65ba997bf..ba721dfa9 100644
--- a/packages/xs-extra/xapi-cli-protocol.master/opam
+++ b/packages/xs-extra/xapi-cli-protocol.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
 maintainer: "xen-api@lists.xen.org"
 authors: [ "xen-api@lists.xen.org" ]
diff --git a/packages/xs-extra/xapi-client.master/opam b/packages/xs-extra/xapi-client.master/opam
index 090922e0c..e440122eb 100644
--- a/packages/xs-extra/xapi-client.master/opam
+++ b/packages/xs-extra/xapi-client.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
 maintainer: "xen-api@lists.xen.org"
 authors: [ "xen-api@lists.xen.org" ]
diff --git a/packages/xs-extra/xapi-compression.master/opam b/packages/xs-extra/xapi-compression.master/opam
index 6947af885..5395517c0 100644
--- a/packages/xs-extra/xapi-compression.master/opam
+++ b/packages/xs-extra/xapi-compression.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
 maintainer: "xen-api@lists.xen.org"
 authors: "xen-api@lists.xen.org"
diff --git a/packages/xs-extra/xapi-consts.master/opam b/packages/xs-extra/xapi-consts.master/opam
index 90271150f..506569a98 100644
--- a/packages/xs-extra/xapi-consts.master/opam
+++ b/packages/xs-extra/xapi-consts.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
 maintainer: "xen-api@lists.xen.org"
 authors: [ "xen-api@lists.xen.org" ]
diff --git a/packages/xs-extra/xapi-datamodel.master/opam b/packages/xs-extra/xapi-datamodel.master/opam
index b3ee146ed..d31a2178b 100644
--- a/packages/xs-extra/xapi-datamodel.master/opam
+++ b/packages/xs-extra/xapi-datamodel.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
 maintainer: "xen-api@lists.xen.org"
 authors: [ "xen-api@lists.xen.org" ]
diff --git a/packages/xs-extra/xapi-expiry-alerts.master/opam b/packages/xs-extra/xapi-expiry-alerts.master/opam
index 308c0d543..178652b00 100644
--- a/packages/xs-extra/xapi-expiry-alerts.master/opam
+++ b/packages/xs-extra/xapi-expiry-alerts.master/opam
@@ -1,19 +1,23 @@
+# This file is generated by dune, edit dune-project instead
+
 opam-version: "2.0"
 name: "xapi-expiry-alerts"
-version: "master"
-synopsis: "A library to send expiration-related alerts"
+synopsis: "A library to send expiration-related alerts and removing outdated ones"
 description: """\
 The interface of this library is 'alert', upon calling this API, any
 existing outdated messages will be removed first, and a new message
 will be created only if it does not exist in Xapi.Message records
 yet."""
 maintainer: "xen-api@lists.xen.org"
-authors: "xen-api@lists.xen.org"
+authors: [ "Pau Ruiz Safont" "Gang Ji" ]
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 homepage: "https://github.com/xapi-project/xen-api"
 bug-reports: "https://github.com/xapi-project/xen-api/issues"
 depends: [
+  "alcotest" {with-test}
   "ocaml"
-  "dune" {build & >= "1.4"}
+  "dune"
+  "astring"
   "xapi-client"
   "xapi-consts"
   "xapi-types"
diff --git a/packages/xs-extra/xapi-forkexecd.master/opam b/packages/xs-extra/xapi-forkexecd.master/opam
index 1c81daf10..51ce3a48d 100644
--- a/packages/xs-extra/xapi-forkexecd.master/opam
+++ b/packages/xs-extra/xapi-forkexecd.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
 maintainer: "xen-api@lists.xen.org"
 authors: "xen-api@lists.xen.org"
diff --git a/packages/xs-extra/xapi-idl.master/opam b/packages/xs-extra/xapi-idl.master/opam
index 26a263352..ca186b7a1 100644
--- a/packages/xs-extra/xapi-idl.master/opam
+++ b/packages/xs-extra/xapi-idl.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
 authors: "Dave Scott"
 homepage: "https://github.com/xapi-project/xen-api"
@@ -11,11 +13,13 @@ depends: [
   "ocaml"
   "dune"
   "alcotest" {with-test}
+  "cohttp-posix"
   "fmt" {with-test}
   "astring"
   "cmdliner"
   "cohttp"
   "fd-send-recv"
+  "ipaddr"
   "logs"
   "lwt" {>= "5.0.0"}
   "message-switch-async" {with-test}
diff --git a/packages/xs-extra/xapi-log.master/opam b/packages/xs-extra/xapi-log.master/opam
index 502e26940..416fb3894 100644
--- a/packages/xs-extra/xapi-log.master/opam
+++ b/packages/xs-extra/xapi-log.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
 maintainer: "xen-api@lists.xen.org"
 authors: "xen-api@lists.xen.org"
diff --git a/packages/xs-extra/xapi-nbd.master/opam b/packages/xs-extra/xapi-nbd.master/opam
index ef77689ee..b42a11f00 100644
--- a/packages/xs-extra/xapi-nbd.master/opam
+++ b/packages/xs-extra/xapi-nbd.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
 maintainer: "xen-api@lists.xen.org"
 authors: ["dave.scott@citrix.com"]
diff --git a/packages/xs-extra/xapi-networkd.master/opam b/packages/xs-extra/xapi-networkd.master/opam
index b661773e0..6a3f122d1 100644
--- a/packages/xs-extra/xapi-networkd.master/opam
+++ b/packages/xs-extra/xapi-networkd.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
 maintainer: "xen-api@lists.xen.org"
 authors: "jonathan.ludlam@eu.citrix.com"
diff --git a/packages/xs-extra/xapi-open-uri.master/opam b/packages/xs-extra/xapi-open-uri.master/opam
index 1542395ad..31da3b422 100644
--- a/packages/xs-extra/xapi-open-uri.master/opam
+++ b/packages/xs-extra/xapi-open-uri.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
 maintainer: "xen-api@lists.xen.org"
 authors: "xen-api@lists.xen.org"
diff --git a/packages/xs-extra/xapi-rrd-transport-utils.master/opam b/packages/xs-extra/xapi-rrd-transport-utils.master/opam
index 236e9e439..08f473824 100644
--- a/packages/xs-extra/xapi-rrd-transport-utils.master/opam
+++ b/packages/xs-extra/xapi-rrd-transport-utils.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
 maintainer: "xen-api@lists.xen.org"
 authors: "John Else"
diff --git a/packages/xs-extra/xapi-rrd-transport.master/opam b/packages/xs-extra/xapi-rrd-transport.master/opam
index 0fd8ff4ef..e9882d24b 100644
--- a/packages/xs-extra/xapi-rrd-transport.master/opam
+++ b/packages/xs-extra/xapi-rrd-transport.master/opam
@@ -1,3 +1,19 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
+build: [
+  ["dune" "subst"] {pinned}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+]
 opam-version: "2.0"
 maintainer: "xen-api@lists.xen.org"
 authors: "John Else"
diff --git a/packages/xs-extra/xapi-rrdd-plugin.master/opam b/packages/xs-extra/xapi-rrdd-plugin.master/opam
index 432db33bc..68a9ed509 100644
--- a/packages/xs-extra/xapi-rrdd-plugin.master/opam
+++ b/packages/xs-extra/xapi-rrdd-plugin.master/opam
@@ -1,3 +1,19 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
+build: [
+  ["dune" "subst"] {pinned}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+]
 opam-version: "2.0"
 maintainer: "xen-api@lists.xen.org"
 authors: "xen-api@lists.xen.org"
diff --git a/packages/xs-extra/xapi-rrdd.master/opam b/packages/xs-extra/xapi-rrdd.master/opam
index 3fed06195..cb9849da9 100644
--- a/packages/xs-extra/xapi-rrdd.master/opam
+++ b/packages/xs-extra/xapi-rrdd.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
 synopsis: "Performance monitoring daemon for xapi"
 description: """
diff --git a/packages/xs-extra/xapi-schema.master/opam b/packages/xs-extra/xapi-schema.master/opam
index 60e1dc71a..f4303e871 100644
--- a/packages/xs-extra/xapi-schema.master/opam
+++ b/packages/xs-extra/xapi-schema.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
 maintainer: "xen-api@lists.xen.org"
 authors: [ "xen-api@lists.xen.org" ]
diff --git a/packages/xs-extra/xapi-squeezed.master/opam b/packages/xs-extra/xapi-squeezed.master/opam
index fc590e1df..52dd6fdc3 100644
--- a/packages/xs-extra/xapi-squeezed.master/opam
+++ b/packages/xs-extra/xapi-squeezed.master/opam
@@ -1,5 +1,7 @@
+# This file is generated by dune, edit dune-project instead
+authors: ["xen-api@lists.xen.org"]
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
-author: "dave.scott@eu.citrix.com"
 maintainer: "xen-api@lists.xen.org"
 homepage: "https://github.com/xapi-project/xen-api"
 bug-reports: "https://github.com/xapi-project/xen-api/issues"
diff --git a/packages/xs-extra/xapi-storage-cli.master/opam b/packages/xs-extra/xapi-storage-cli.master/opam
index b8201d62b..4b9314bab 100644
--- a/packages/xs-extra/xapi-storage-cli.master/opam
+++ b/packages/xs-extra/xapi-storage-cli.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+
 opam-version: "2.0"
 name: "xapi-storage-cli"
 maintainer: "xen-api@lists.xen.org"
diff --git a/packages/xs-extra/xapi-storage-script.master/opam b/packages/xs-extra/xapi-storage-script.master/opam
index 01f859d7b..87fce518a 100644
--- a/packages/xs-extra/xapi-storage-script.master/opam
+++ b/packages/xs-extra/xapi-storage-script.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+
 opam-version: "2.0"
 name: "xapi-storage-script"
 maintainer: "xen-api@lists.xen.org"
diff --git a/packages/xs-extra/xapi-storage.master/opam b/packages/xs-extra/xapi-storage.master/opam
index 91a35266e..c6d5ae2a0 100644
--- a/packages/xs-extra/xapi-storage.master/opam
+++ b/packages/xs-extra/xapi-storage.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
 name: "xapi-storage"
 maintainer: "xen-api@lists.xen.org"
diff --git a/packages/xs-extra/xapi-tracing-export.master/opam b/packages/xs-extra/xapi-tracing-export.master/opam
new file mode 100644
index 000000000..c58065eb2
--- /dev/null
+++ b/packages/xs-extra/xapi-tracing-export.master/opam
@@ -0,0 +1,32 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
+opam-version: "2.0"
+maintainer: "xen-api@lists.xen.org"
+authors: "xen-api@lists.xen.org"
+homepage: "https://xapi-project.github.io/"
+bug-reports: "https://github.com/xapi-project/xen-api.git"
+dev-repo: "git+https://github.com/xapi-project/xen-api.git"
+build: [[ "dune" "build" "-p" name "-j" jobs ]]
+
+available: [ os = "linux" ]
+depends: [
+  "ocaml"
+  "cohttp-posix"
+  "dune"
+  "cohttp"
+  "rpclib"
+  "xapi-log"
+  "xapi-open-uri"
+  "xapi-stdext-threads"
+  "xapi-stdext-unix"
+  "xapi-tracing"
+  "zstd"
+]
+synopsis: "Library required by xapi"
+description: """
+These libraries are provided for backwards compatibility only.
+No new code should use these libraries."""
+url {
+  src:
+    "https://github.com/xapi-project/xen-api/archive/master.tar.gz"
+}
diff --git a/packages/xs-extra/xapi-tracing.master/opam b/packages/xs-extra/xapi-tracing.master/opam
index f1ecf8a4c..0d7637177 100644
--- a/packages/xs-extra/xapi-tracing.master/opam
+++ b/packages/xs-extra/xapi-tracing.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
 maintainer: "xen-api@lists.xen.org"
 authors: "xen-api@lists.xen.org"
@@ -9,15 +11,11 @@ build: [[ "dune" "build" "-p" name "-j" jobs ]]
 available: [ os = "linux" ]
 depends: [
   "ocaml"
-  "cohttp-posix"
   "dune"
-  "cohttp"
-  "rpclib"
+  "re"
+  "uri"
   "xapi-log"
-  "xapi-open-uri"
   "xapi-stdext-threads"
-  "xapi-stdext-unix"
-  "zstd"
 ]
 synopsis: "Library required by xapi"
 description: """
diff --git a/packages/xs-extra/xapi-types.master/opam b/packages/xs-extra/xapi-types.master/opam
index c3a998e50..9f69f9d39 100644
--- a/packages/xs-extra/xapi-types.master/opam
+++ b/packages/xs-extra/xapi-types.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
 maintainer: "xen-api@lists.xen.org"
 authors: [ "xen-api@lists.xen.org" ]
diff --git a/packages/xs-extra/xapi-xenopsd-cli.master/opam b/packages/xs-extra/xapi-xenopsd-cli.master/opam
index f51664661..ee20d166b 100644
--- a/packages/xs-extra/xapi-xenopsd-cli.master/opam
+++ b/packages/xs-extra/xapi-xenopsd-cli.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
 maintainer: "xen-api@lists.xen.org"
 authors: [ "xen-api@lists.xen.org" ]
diff --git a/packages/xs-extra/xapi-xenopsd-simulator.master/opam b/packages/xs-extra/xapi-xenopsd-simulator.master/opam
index af6746862..1ad22ebd2 100644
--- a/packages/xs-extra/xapi-xenopsd-simulator.master/opam
+++ b/packages/xs-extra/xapi-xenopsd-simulator.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
 name: "xapi-xenopsd-simulator"
 maintainer: "xen-api@lists.xen.org"
diff --git a/packages/xs-extra/xapi-xenopsd-xc.master/opam b/packages/xs-extra/xapi-xenopsd-xc.master/opam
index a04907128..9a355cd3f 100644
--- a/packages/xs-extra/xapi-xenopsd-xc.master/opam
+++ b/packages/xs-extra/xapi-xenopsd-xc.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
 name: "xapi-xenopsd-xc"
 maintainer: "xen-api@lists.xen.org"
diff --git a/packages/xs-extra/xapi-xenopsd.master/opam b/packages/xs-extra/xapi-xenopsd.master/opam
index 1aaf05245..c5f5c3447 100644
--- a/packages/xs-extra/xapi-xenopsd.master/opam
+++ b/packages/xs-extra/xapi-xenopsd.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
 name: "xapi-xenopsd"
 maintainer: "xen-api@lists.xen.org"
@@ -38,6 +40,7 @@ depends: [
   "xapi-stdext-threads"
   "xapi-stdext-unix"
   "xapi-tracing"
+  "xapi-tracing-export"
   "xenstore_transport" {with-test}
   "xmlm"
   "zstd"
diff --git a/packages/xs-extra/xapi.master/opam b/packages/xs-extra/xapi.master/opam
index 9703cfa45..e414d694b 100644
--- a/packages/xs-extra/xapi.master/opam
+++ b/packages/xs-extra/xapi.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
 maintainer: "xen-api@lists.xen.org"
 authors: [ "xen-api@lists.xen.org" ]
@@ -22,6 +24,7 @@ depends: [
   "domain-name"
   "ezxenstore"
   "fmt" {with-test}
+  "hex"
   "http-lib" {with-test} # the public library is only used for testing
   "ipaddr"
   "mirage-crypto" {with-test}
@@ -34,6 +37,7 @@ depends: [
   "pciutil"
   "ppx_deriving_rpc"
   "ppx_sexp_conv"
+  "ppx_deriving"
   "rpclib"
   "rrdd-plugin"
   "rresult"
diff --git a/packages/xs-extra/xe.master/opam b/packages/xs-extra/xe.master/opam
index 8884529da..eb83012f6 100644
--- a/packages/xs-extra/xe.master/opam
+++ b/packages/xs-extra/xe.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
 maintainer: "xen-api@lists.xen.org"
 authors: [ "xen-api@lists.xen.org" ]
diff --git a/packages/xs-extra/xen-api-client-async.master/opam b/packages/xs-extra/xen-api-client-async.master/opam
index 6aa8a3120..c53b756b7 100644
--- a/packages/xs-extra/xen-api-client-async.master/opam
+++ b/packages/xs-extra/xen-api-client-async.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+
 opam-version: "2.0"
 maintainer: "xen-api@lists.xen.org"
 authors: [ "David Scott" "Anil Madhavapeddy" "Jerome Maloberti" "John Else" "Jon Ludlam" "Thomas Sanders" "Mike McClurg" ]
diff --git a/packages/xs-extra/xen-api-client-lwt.master/opam b/packages/xs-extra/xen-api-client-lwt.master/opam
index 81633c40c..3ac1592ec 100644
--- a/packages/xs-extra/xen-api-client-lwt.master/opam
+++ b/packages/xs-extra/xen-api-client-lwt.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+
 opam-version: "2.0"
 maintainer: "xen-api@lists.xen.org"
 authors: [ "David Scott" "Anil Madhavapeddy" "Jerome Maloberti" "John Else" "Jon Ludlam" "Thomas Sanders" "Mike McClurg" ]
diff --git a/packages/xs-extra/xen-api-client.master/opam b/packages/xs-extra/xen-api-client.master/opam
index 3b2b8b6f2..0aa625df2 100644
--- a/packages/xs-extra/xen-api-client.master/opam
+++ b/packages/xs-extra/xen-api-client.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+
 opam-version: "2.0"
 maintainer: "xen-api@lists.xen.org"
 authors: [ "David Scott" "Anil Madhavapeddy" "Jerome Maloberti" "John Else" "Jon Ludlam" "Thomas Sanders" "Mike McClurg" ]
diff --git a/packages/xs-extra/xen-api-sdk.master/opam b/packages/xs-extra/xen-api-sdk.master/opam
index ee1ca829e..588eb1a5a 100644
--- a/packages/xs-extra/xen-api-sdk.master/opam
+++ b/packages/xs-extra/xen-api-sdk.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+
 opam-version: "2.0"
 name: "xen-api-sdk"
 synopsis: "Xen API SDK generation code"
diff --git a/packages/xs-extra/xml-light2.master/opam b/packages/xs-extra/xml-light2.master/opam
index 1c6db3e0c..da5264648 100644
--- a/packages/xs-extra/xml-light2.master/opam
+++ b/packages/xs-extra/xml-light2.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
 maintainer: "xen-api@lists.xen.org"
 authors: "xen-api@lists.xen.org"
diff --git a/packages/xs-extra/zstd.master/opam b/packages/xs-extra/zstd.master/opam
index 8e7be0f37..59901c80e 100644
--- a/packages/xs-extra/zstd.master/opam
+++ b/packages/xs-extra/zstd.master/opam
@@ -1,3 +1,5 @@
+# This file is generated by dune, edit dune-project instead
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
 maintainer: "xen-api@lists.xen.org"
 authors: "xen-api@lists.xen.org"
diff --git a/tools/generate-opam-sources.sh b/tools/generate-opam-sources.sh
index daa5e0624..2ece50c88 100755
--- a/tools/generate-opam-sources.sh
+++ b/tools/generate-opam-sources.sh
@@ -57,6 +57,7 @@ xapi-storage              $XAPI/xen-api
 xapi-storage-cli          $XAPI/xen-api
 xapi-storage-script       $XAPI/xen-api
 xapi-tracing              $XAPI/xen-api
+xapi-tracing-export       $XAPI/xen-api
 xapi-types                $XAPI/xen-api
 xapi-xenopsd              $XAPI/xen-api
 xapi-xenopsd-cli          $XAPI/xen-api