diff --git a/packages/upstream-extra/camomile.1.0.2/opam b/packages/upstream-extra/camomile.1.0.2/opam
deleted file mode 100644
index 960ab8a07..000000000
--- a/packages/upstream-extra/camomile.1.0.2/opam
+++ /dev/null
@@ -1,34 +0,0 @@
-opam-version: "2.0"
-name: "camomile"
-version: "1.0.2"
-synopsis: "A Unicode library"
-description: """\
-Camomile is a Unicode library for OCaml. Camomile provides Unicode character
-type, UTF-8, UTF-16, UTF-32 strings, conversion to/from about 200 encodings,
-collation and locale-sensitive case mappings, and more. The library is currently
-designed for Unicode Standard 3.2."""
-maintainer: "yoriyuki.y@gmail.com"
-authors: "Yoriyuki Yamagata"
-license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception"
-homepage: "https://github.com/yoriyuki/Camomile"
-doc: "https://yoriyuki.github.io/Camomile/"
-bug-reports: "https://github.com/yoriyuki/Camomile/issues"
-depends: [
-  "dune" {>= "1.11"}
-  "ocaml" {>= "4.02.3"}
-]
-available: arch != "ppc64"
-build: [
-  ["ocaml" "configure.ml" "--share" "%{share}%/camomile"]
-  ["dune" "subst"] {dev}
-  ["dune" "build" "-p" name "-j" jobs "@install" "@doc" {with-doc}]
-]
-dev-repo: "git+https://github.com/yoriyuki/Camomile.git"
-url {
-  src:
-    "https://github.com/yoriyuki/Camomile/releases/download/1.0.2/camomile-1.0.2.tbz"
-  checksum: [
-    "sha256=f0a419b0affc36500f83b086ffaa36c545560cee5d57e84b729e8f851b3d1632"
-    "sha512=7586422e68779476206027c6ebbe19b677fbe459153221f7c952c7fae374c5c8232249cb76fdb1f482069707aa1580be827cd39693906142988268b7f0e7f6d0"
-  ]
-}
diff --git a/packages/upstream-extra/charInfo_width.1.1.0/opam b/packages/upstream-extra/charInfo_width.1.1.0/opam
deleted file mode 100644
index 8d2ed29f0..000000000
--- a/packages/upstream-extra/charInfo_width.1.1.0/opam
+++ /dev/null
@@ -1,28 +0,0 @@
-opam-version: "2.0"
-name: "charInfo_width"
-version: "1.1.0"
-synopsis: "Determine column width for a character"
-description:
-  "This module is implemented purely in OCaml and the width function follows the prototype of POSIX's wcwidth."
-maintainer: "zandoye@gmail.com"
-authors: "ZAN DoYe"
-license: "MIT"
-homepage: "https://github.com/kandu/charinfo_width/"
-bug-reports: "https://github.com/kandu/charinfo_width/issues"
-depends: [
-  "ocaml" {>= "4.02.3"}
-  "result"
-  "camomile" {>= "1.0.0" & < "2.0~"}
-  "dune"
-  "ppx_expect" {with-test & < "v0.15"}
-]
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs]
-    {with-test & ocaml:version >= "4.04.0"}
-]
-dev-repo: "git+https://github.com/kandu/charinfo_width.git"
-url {
-  src: "https://github.com/kandu/charInfo_width/archive/1.1.0.tar.gz"
-  checksum: "md5=a539436d1da4aeb93711303f107bec7e"
-}
diff --git a/packages/upstream-extra/dot-merlin-reader.4.1/opam b/packages/upstream-extra/dot-merlin-reader.4.5/opam
similarity index 54%
rename from packages/upstream-extra/dot-merlin-reader.4.1/opam
rename to packages/upstream-extra/dot-merlin-reader.4.5/opam
index c56f7bc33..1eba61559 100644
--- a/packages/upstream-extra/dot-merlin-reader.4.1/opam
+++ b/packages/upstream-extra/dot-merlin-reader.4.5/opam
@@ -1,20 +1,20 @@
 opam-version: "2.0"
 name: "dot-merlin-reader"
-version: "4.1"
+version: "4.5"
 synopsis: "Reads config files for merlin"
 description:
   "Helper process: reads .merlin files and gives the normalized content to merlin"
 maintainer: "defree@gmail.com"
 authors: "The Merlin team"
+license: "MIT"
 homepage: "https://github.com/ocaml/merlin"
 bug-reports: "https://github.com/ocaml/merlin/issues"
 depends: [
-  "ocaml" {>= "4.06.1"}
-  "dune" {>= "2.7.0"}
+  "ocaml" {>= "4.08.0" & < "5.0.0"}
+  "dune" {>= "2.9.0"}
   "yojson" {>= "1.6.0"}
   "ocamlfind" {>= "1.6.0"}
-  "csexp" {>= "1.2.3"}
-  "result" {>= "1.5"}
+  "csexp" {>= "1.5.1"}
 ]
 build: [
   ["dune" "subst"] {dev}
@@ -23,10 +23,10 @@ build: [
 dev-repo: "git+https://github.com/ocaml/merlin.git"
 url {
   src:
-    "https://github.com/ocaml/merlin/releases/download/v4.1/dot-merlin-reader-v4.1.tbz"
+    "https://github.com/ocaml/merlin/releases/download/v4.6-413/merlin-4.6-413.tbz"
   checksum: [
-    "sha256=14a36d6fb8646a5df4530420a7861722f1a4ee04753717947305e3676031e7cd"
-    "sha512=65fd4ab08904c05651a7ef8971802ffaa428daa920765dbcf162e3c56e8047e4c9e4356daa45efccce7c73a586635c8f6cf8118fd3059789de9aff68579bd436"
+    "sha256=f3dd371f84c4e85fefd8ac355e97297571222c875bf6595882de36cd247d90ee"
+    "sha512=fe88a52c4c3c94505da142fbb7d400fce11bfafe6e47ec7cd39437308baa7122399a008bb6d0ef7b8f29636c2a51f4d49e3535136010fec198a1188293914a56"
   ]
 }
-x-commit-hash: "ab02f60994c81166820791b5f465f467d752b8dc"
+x-commit-hash: "2f422293d26b16ccf934d6d340c7a02f76e444c9"
diff --git a/packages/upstream-extra/fileutils.0.6.3/opam b/packages/upstream-extra/fileutils.0.6.3/opam
index ff68f3588..e7abee706 100644
--- a/packages/upstream-extra/fileutils.0.6.3/opam
+++ b/packages/upstream-extra/fileutils.0.6.3/opam
@@ -24,7 +24,7 @@ homepage: "https://github.com/gildor478/ocaml-fileutils"
 doc: "https://gildor478.github.io/ocaml-fileutils/"
 bug-reports: "https://github.com/gildor478/ocaml-fileutils/issues"
 depends: [
-  "ocaml" {>= "4.03"}
+  "ocaml" {>= "4.03" & < "5.0"}
   "base-unix"
   "base-bytes"
   "stdlib-shims"
diff --git a/packages/upstream-extra/lambda-term.3.1.0/opam b/packages/upstream-extra/lambda-term.3.3.1/opam
similarity index 57%
rename from packages/upstream-extra/lambda-term.3.1.0/opam
rename to packages/upstream-extra/lambda-term.3.3.1/opam
index 7fc735b82..510ab03eb 100644
--- a/packages/upstream-extra/lambda-term.3.1.0/opam
+++ b/packages/upstream-extra/lambda-term.3.3.1/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "lambda-term"
-version: "3.1.0"
+version: "3.3.1"
 synopsis: "Terminal manipulation library for OCaml"
 description: """\
 Lambda-term is a cross-platform library for manipulating the terminal. It
@@ -10,28 +10,43 @@ to provide a higher level functional interface to terminal manipulation than,
 for example, ncurses, by providing a native OCaml interface instead of bindings
 to a C library. Lambda-term integrates with zed to provide text edition
 facilities in console applications."""
-maintainer: "jeremie@dimino.org"
+maintainer: "opam-devel@lists.ocaml.org"
 authors: "Jérémie Dimino"
 license: "BSD-3-Clause"
 homepage: "https://github.com/ocaml-community/lambda-term"
 bug-reports: "https://github.com/ocaml-community/lambda-term/issues"
 depends: [
-  "ocaml" {>= "4.02.3"}
+  "dune" {>= "3.0"}
+  "ocaml" {>= "4.08.0"}
+  "logs"
   "lwt" {>= "4.2.0"}
-  "lwt_log"
-  "react"
-  "zed" {>= "3.1.0" & < "4.0"}
-  "camomile" {>= "1.0.1"}
   "lwt_react"
   "mew_vi" {>= "0.5.0" & < "0.6.0"}
-  "dune" {>= "1.1.0"}
+  "react"
+  "zed" {>= "3.2.0" & < "4.0"}
+  "odoc" {with-doc}
 ]
 build: [
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
 ]
 dev-repo: "git+https://github.com/ocaml-community/lambda-term.git"
 url {
-  src: "https://github.com/ocaml-community/lambda-term/archive/3.1.0.tar.gz"
-  checksum: "md5=78180c04ecfc8060b23d7d0014f24196"
+  src:
+    "https://github.com/ocaml-community/lambda-term/releases/download/3.3.1/lambda-term-3.3.1.tbz"
+  checksum: [
+    "sha256=5b77cbe096d56ae9157cb1fb55fb4e9028c89e841b1d2bfad4f13d8a1395db3c"
+    "sha512=d7968ad000c9c7e899ffb7fdd0016009f41c71d9fad4897decbe66ea24140ab1ee8428fd550c7b8016e7f6343f41e7abd53b52b5f2bf6bb85b4de64f12ac9161"
+  ]
 }
+x-commit-hash: "f6b1940863e94d437a0578e19076a342bc9b5a70"
diff --git a/packages/upstream-extra/lwt_react.1.1.5/opam b/packages/upstream-extra/lwt_react.1.2.0/opam
similarity index 62%
rename from packages/upstream-extra/lwt_react.1.1.5/opam
rename to packages/upstream-extra/lwt_react.1.2.0/opam
index 7013fde65..f5dd39817 100644
--- a/packages/upstream-extra/lwt_react.1.1.5/opam
+++ b/packages/upstream-extra/lwt_react.1.2.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "lwt_react"
-version: "1.1.5"
+version: "1.2.0"
 synopsis: "Helpers for using React with Lwt"
 maintainer: "Anton Bachin <antonbachin@yahoo.com>"
 authors: "Jérémie Dimino"
@@ -11,15 +11,16 @@ bug-reports: "https://github.com/ocsigen/lwt/issues"
 depends: [
   "dune" {>= "1.8.0"}
   "lwt" {>= "3.0.0"}
-  "ocaml"
+  "ocaml" {>= "4.08"}
   "react" {>= "1.0.0"}
+  "cppo" {build & >= "1.1.0"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/ocsigen/lwt.git"
 url {
-  src: "https://github.com/ocsigen/lwt/archive/refs/tags/5.5.0.tar.gz"
+  src: "https://github.com/ocsigen/lwt/archive/5.6.0.tar.gz"
   checksum: [
-    "md5=94272fac89c5bf21a89c102b8a8f35a5"
-    "sha512=8951b94555e930634375816d71815b9d85daad6ffb7dab24864661504d11be26575ab0b237196c54693efa372a9b69cdc1d5068a20a250dc0bbb4a3c03c5fda1"
+    "md5=e63979ee40a80d5b9e9e5545f33323b4"
+    "sha512=d616389bc9e0da11f25843ab7541ac2d40c9543700a89455f14115b339bbe58cef2b8acf0ae97fd54e15a4cb93149cfe1ebfda301aa93933045f76b7d9344160"
   ]
 }
diff --git a/packages/upstream-extra/merlin.4.4-413/opam b/packages/upstream-extra/merlin.4.6-413/opam
similarity index 81%
rename from packages/upstream-extra/merlin.4.4-413/opam
rename to packages/upstream-extra/merlin.4.6-413/opam
index 32db0ec12..0fa4a1e11 100644
--- a/packages/upstream-extra/merlin.4.4-413/opam
+++ b/packages/upstream-extra/merlin.4.6-413/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "merlin"
-version: "4.4-413"
+version: "4.6-413"
 synopsis:
   "Editor helper, provides completion, typing and source browsing in Vim and Emacs"
 description:
@@ -13,15 +13,17 @@ bug-reports: "https://github.com/ocaml/merlin/issues"
 depends: [
   "ocaml" {>= "4.13" & < "4.14"}
   "dune" {>= "2.9.0"}
-  "dot-merlin-reader" {>= "4.0"}
-  "yojson" {>= "1.6.0"}
+  "dot-merlin-reader" {>= "4.2"}
+  "yojson" {>= "2.0.0"}
   "conf-jq" {with-test}
-  "csexp" {>= "1.2.3"}
-  "result" {>= "1.5"}
+  "csexp" {>= "1.5.1"}
   "menhir" {dev}
   "menhirLib" {dev}
   "menhirSdk" {dev}
 ]
+conflicts: [
+  "seq" {!= "base"}
+]
 build: [
   ["dune" "subst"] {dev}
   ["dune" "build" "-p" name "-j" jobs]
@@ -69,10 +71,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.4-413/merlin-4.4-413.tbz"
+    "https://github.com/ocaml/merlin/releases/download/v4.6-413/merlin-4.6-413.tbz"
   checksum: [
-    "sha256=609edc65b23b6ead83f98af0c90180e5c8f98b0619a9257828f9f18b9f8095c6"
-    "sha512=b0bf3c7d72dfc7c70e22d60afca5b7fee71a35127839181fdb46e1e15a230e58765960548c545bbef4fdab180291c738cacb724b9ecf284eee5640ebef07c4ff"
+    "sha256=f3dd371f84c4e85fefd8ac355e97297571222c875bf6595882de36cd247d90ee"
+    "sha512=fe88a52c4c3c94505da142fbb7d400fce11bfafe6e47ec7cd39437308baa7122399a008bb6d0ef7b8f29636c2a51f4d49e3535136010fec198a1188293914a56"
   ]
 }
-x-commit-hash: "7607238326a9352cbee9ecf612669e28ae9fa36e"
+x-commit-hash: "2f422293d26b16ccf934d6d340c7a02f76e444c9"
diff --git a/packages/upstream-extra/odoc.2.1.0/opam b/packages/upstream-extra/odoc.2.1.1/opam
similarity index 73%
rename from packages/upstream-extra/odoc.2.1.0/opam
rename to packages/upstream-extra/odoc.2.1.1/opam
index 9cd754e78..cd158a24f 100644
--- a/packages/upstream-extra/odoc.2.1.0/opam
+++ b/packages/upstream-extra/odoc.2.1.1/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "odoc"
-version: "2.1.0"
+version: "2.1.1"
 synopsis: "OCaml documentation generator"
 description: """\
 Odoc is a documentation generator for OCaml. It reads doc comments,
@@ -20,7 +20,7 @@ homepage: "http://github.com/ocaml/odoc"
 doc: "https://ocaml.github.io/odoc/"
 bug-reports: "https://github.com/ocaml/odoc/issues"
 depends: [
-  "odoc-parser" {>= "0.9.0"}
+  "odoc-parser" {>= "0.9.0" & < "2.0.0"}
   "astring"
   "cmdliner" {>= "1.0.0"}
   "cppo" {build & >= "1.1.0"}
@@ -31,7 +31,7 @@ depends: [
   "tyxml" {>= "4.3.0"}
   "fmt"
   "ocamlfind" {with-test}
-  "yojson" {with-test}
+  "yojson" {< "2.0.0" & with-test}
   ("ocaml" {< "4.04.1" & with-test} | "sexplib0" {with-test})
   "conf-jq" {with-test}
   "ppx_expect" {with-test}
@@ -45,10 +45,10 @@ build: [
 ]
 dev-repo: "git+https://github.com/ocaml/odoc.git"
 url {
-  src: "https://github.com/ocaml/odoc/releases/download/2.1.0/odoc-2.1.0.tbz"
+  src: "https://github.com/ocaml/odoc/releases/download/2.1.1/odoc-2.1.1.tbz"
   checksum: [
-    "sha256=65a2523a50ee368164f1f24f75866a6a36cdb0d00039c3006ec824351d4e4967"
-    "sha512=cf4d7e884b94a9b9c4bcb62d4423d7289d7bbbf2642c5eacf9577b76eb835cf6ecc79d2384d36d174d2e9d8f758b5082c0c4bf8f66b5c6db4e9805dc3fc9ee1a"
+    "sha256=f574dbd28cd0fc3a2b95525c4bb95ddf6d1f6408bb4fe12157fa537884f987fd"
+    "sha512=1c545c281a7022a167f028fff8cec6fb3f2f82da0881431be74e7a4281c5353ed83bfbdb4d9d9e08af6755dbe3505c052c5e5b58cdeb08c57aed5e89c0f15e91"
   ]
 }
-x-commit-hash: "d654ee2a4ff3e1465dcf92b882c26de71f7a9986"
+x-commit-hash: "f556f10aa67f80e83d1e3e66c4b478e8efe4e18d"
diff --git a/packages/upstream-extra/ppx_yojson_conv_lib.v0.14.0/opam b/packages/upstream-extra/ppx_yojson_conv_lib.v0.15.0/opam
similarity index 77%
rename from packages/upstream-extra/ppx_yojson_conv_lib.v0.14.0/opam
rename to packages/upstream-extra/ppx_yojson_conv_lib.v0.15.0/opam
index b7e5ece0a..c6aa09b72 100644
--- a/packages/upstream-extra/ppx_yojson_conv_lib.v0.14.0/opam
+++ b/packages/upstream-extra/ppx_yojson_conv_lib.v0.15.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ppx_yojson_conv_lib"
-version: "v0.14.0"
+version: "v0.15.0"
 synopsis: "Runtime lib for ppx_yojson_conv"
 description: "Part of the Jane Street's PPX rewriters collection."
 maintainer: "Jane Street developers"
@@ -19,6 +19,7 @@ build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/ppx_yojson_conv_lib.git"
 url {
   src:
-    "https://ocaml.janestreet.com/ocaml-core/v0.14/files/ppx_yojson_conv_lib-v0.14.0.tar.gz"
-  checksum: "md5=e23c5593a7211ad4fb09e26e9a74698a"
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/ppx_yojson_conv_lib-v0.15.0.tar.gz"
+  checksum:
+    "sha256=f9d2c5eff4566ec1f1f379b186ed22c8ddd6be0909a160bc5a9ac7abc6a6b684"
 }
diff --git a/packages/upstream-extra/react.1.2.1/opam b/packages/upstream-extra/react.1.2.2/opam
similarity index 54%
rename from packages/upstream-extra/react.1.2.1/opam
rename to packages/upstream-extra/react.1.2.2/opam
index 40c6cd875..219233c40 100644
--- a/packages/upstream-extra/react.1.2.1/opam
+++ b/packages/upstream-extra/react.1.2.2/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "react"
-version: "1.2.1"
+version: "1.2.2"
 synopsis: "Declarative events and signals for OCaml"
 description: """\
 Release %%VERSION%%
@@ -11,23 +11,26 @@ events and signals. React doesn't define any primitive event or
 signal, it lets the client chooses the concrete timeline.
 
 React is made of a single, independent, module and distributed under
-the ISC license."""
+the ISC license.
+
+Homepage: <http://erratique.ch/software/react>"""
 maintainer: "Daniel Bünzli <daniel.buenzl i@erratique.ch>"
-authors: "Daniel Bünzli <daniel.buenzl i@erratique.ch>"
+authors: "The react programmers"
 license: "ISC"
 tags: ["reactive" "declarative" "signal" "event" "frp" "org:erratique"]
-homepage: "http://erratique.ch/software/react"
-doc: "http://erratique.ch/software/react/doc/React"
+homepage: "https://erratique.ch/software/react"
+doc: "https://erratique.ch/software/react/doc/"
 bug-reports: "https://github.com/dbuenzli/react/issues"
 depends: [
-  "ocaml" {>= "4.01.0"}
+  "ocaml" {>= "4.08.0"}
   "ocamlfind" {build}
   "ocamlbuild" {build}
-  "topkg" {build & >= "0.9.0"}
+  "topkg" {build & >= "1.0.3"}
 ]
-build: ["ocaml" "pkg/pkg.ml" "build" "--dev-pkg" "%{pinned}%"]
-dev-repo: "git+http://erratique.ch/repos/react.git"
+build: ["ocaml" "pkg/pkg.ml" "build" "--dev-pkg" "%{dev}%"]
+dev-repo: "git+https://erratique.ch/repos/react.git"
 url {
-  src: "http://erratique.ch/software/react/releases/react-1.2.1.tbz"
-  checksum: "md5=ce1454438ce4e9d2931248d3abba1fcc"
+  src: "https://erratique.ch/software/react/releases/react-1.2.2.tbz"
+  checksum:
+    "sha512=18cdd544d484222ba02db6bd9351571516532e7a1c107b59bbe39193837298f5c745eab6754f8bc6ff125b387be7018c6d6e6ac99f91925a5e4f53af688522b1"
 }
diff --git a/packages/upstream-extra/utop.2.9.2/opam b/packages/upstream-extra/utop.2.10.0/opam
similarity index 76%
rename from packages/upstream-extra/utop.2.9.2/opam
rename to packages/upstream-extra/utop.2.10.0/opam
index 719dac372..03c9a3881 100644
--- a/packages/upstream-extra/utop.2.9.2/opam
+++ b/packages/upstream-extra/utop.2.10.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "utop"
-version: "2.9.2"
+version: "2.10.0"
 synopsis: "Universal toplevel for OCaml"
 description: """\
 utop is an improved toplevel (i.e., Read-Eval-Print Loop or REPL) for
@@ -19,9 +19,10 @@ depends: [
   "base-threads"
   "ocamlfind" {>= "1.7.2"}
   "lambda-term" {>= "3.1.0" & < "4.0"}
+  "logs"
   "lwt"
   "lwt_react"
-  "camomile"
+  "zed" {>= "3.2.0"}
   "react" {>= "1.0.0"}
   "cppo" {build & >= "1.1.2"}
   "dune" {>= "1.0"}
@@ -34,9 +35,10 @@ build: [
 dev-repo: "git+https://github.com/ocaml-community/utop.git"
 url {
   src:
-    "https://github.com/ocaml-community/utop/releases/download/2.9.2/utop-2.9.2.tbz"
+    "https://github.com/ocaml-community/utop/releases/download/2.10.0/utop-2.10.0.tbz"
   checksum: [
-    "md5=abd1c592464ce5f31b17009954040d7c"
-    "sha512=db97275aa4bd7725a9eeec6d9155c239f3e48adf8d34b73f55caa2de32fde98862480db5e05dffc89e98efd12eb60e08d89ad34b9a92a8de0d37ccb32af07ddf"
+    "sha256=475d16a2f9ea61c602ac32673ee210c76cc768f7214987d70c069532c2782d00"
+    "sha512=becbbc3b6651978bc6729631ec8a17a4e93e21d85b00af499f10caa9553166378190e6f1b2495ce4b8c2b5952f315ca88923a761067de47b614ed16d0f0d77c4"
   ]
 }
+x-commit-hash: "e56a75d2826fbe0ba3bc27a6d19fe08e02c3216d"
diff --git a/packages/upstream-extra/zed.3.1.0/opam b/packages/upstream-extra/zed.3.2.0/opam
similarity index 58%
rename from packages/upstream-extra/zed.3.1.0/opam
rename to packages/upstream-extra/zed.3.2.0/opam
index cfbe83b8e..9d29dcfcd 100644
--- a/packages/upstream-extra/zed.3.1.0/opam
+++ b/packages/upstream-extra/zed.3.2.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "zed"
-version: "3.1.0"
+version: "3.2.0"
 synopsis: "Abstract engine for text edition in OCaml"
 description: """\
 Zed is an abstract engine for text edition. It can be used to write text
@@ -16,19 +16,37 @@ license: "BSD-3-Clause"
 homepage: "https://github.com/ocaml-community/zed"
 bug-reports: "https://github.com/ocaml-community/zed/issues"
 depends: [
+  "dune" {>= "3.0"}
   "ocaml" {>= "4.02.3"}
-  "dune" {>= "1.1.0"}
-  "base-bytes"
-  "camomile" {>= "1.0.1"}
   "react"
-  "charInfo_width" {>= "1.1.0" & < "2.0~"}
+  "result"
+  "uchar"
+  "uutf"
+  "uucp" {>= "2.0.0"}
+  "uuseg"
+  "odoc" {with-doc}
 ]
 build: [
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
 ]
 dev-repo: "git+https://github.com/ocaml-community/zed.git"
 url {
-  src: "https://github.com/ocaml-community/zed/archive/3.1.0.tar.gz"
-  checksum: "md5=51e8676ba972e5ad727633c161e404b1"
+  src:
+    "https://github.com/ocaml-community/zed/releases/download/3.2.0/zed-3.2.0.tbz"
+  checksum: [
+    "sha256=342349bd43460cf376851ac71bfc1560a087d9480fd91342a31a57426e2e513e"
+    "sha512=f122eafd7c48179e210c02fef601cc1307a32e2529a56972233c923a2ea027a17dd3494d4736b96977d696cb9673bb16c24557c972d4de60a24500ee599bed84"
+  ]
 }
+x-commit-hash: "856a733c6fc6be4f116677d199fcf46e6960d675"
diff --git a/packages/upstream/alcotest-lwt.1.5.0/opam b/packages/upstream/alcotest-lwt.1.6.0/opam
similarity index 62%
rename from packages/upstream/alcotest-lwt.1.5.0/opam
rename to packages/upstream/alcotest-lwt.1.6.0/opam
index 82892084f..6b4ddae7d 100644
--- a/packages/upstream/alcotest-lwt.1.5.0/opam
+++ b/packages/upstream/alcotest-lwt.1.6.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "alcotest-lwt"
-version: "1.5.0"
+version: "1.6.0"
 synopsis: "Lwt-based helpers for Alcotest"
 description: "Lwt-based helpers for Alcotest"
 maintainer: "thomas@gazagnaire.org"
@@ -12,9 +12,9 @@ bug-reports: "https://github.com/mirage/alcotest/issues"
 depends: [
   "dune" {>= "2.8"}
   "re" {with-test}
-  "cmdliner" {with-test}
+  "cmdliner" {with-test & >= "1.1.0"}
   "fmt"
-  "ocaml" {>= "4.03.0"}
+  "ocaml" {>= "4.05.0"}
   "alcotest" {= version}
   "lwt"
   "logs"
@@ -37,10 +37,10 @@ build: [
 dev-repo: "git+https://github.com/mirage/alcotest.git"
 url {
   src:
-    "https://github.com/mirage/alcotest/releases/download/1.5.0/alcotest-js-1.5.0.tbz"
+    "https://github.com/mirage/alcotest/releases/download/1.6.0/alcotest-1.6.0.tbz"
   checksum: [
-    "sha256=54281907e02d78995df246dc2e10ed182828294ad2059347a1e3a13354848f6c"
-    "sha512=1aea91de40795ec4f6603d510107e4b663c1a94bd223f162ad231316d8595e9e098cabbe28a46bdcb588942f3d103d8377373d533bcc7413ba3868a577469b45"
+    "sha256=fd00f9668395874ff3b1d7ef566d14efc02fa7dd34123eb25d59355be94b2329"
+    "sha512=69a7ef300ba10a9ccb1e25b1cfdb0a0abf9ca976864a52a22f0e1fae1e5d1cbeb99498c086230b839ee9da4d0fd71e63686e126ca42221537f3fdb6f6c5aae95"
   ]
 }
-x-commit-hash: "12889aa7f993ad55434443f1c447a59f18ffc9bf"
+x-commit-hash: "6be328d73513db7f32173f86a997a59904fb1ee6"
diff --git a/packages/upstream/alcotest.1.5.0/opam b/packages/upstream/alcotest.1.6.0/opam
similarity index 72%
rename from packages/upstream/alcotest.1.5.0/opam
rename to packages/upstream/alcotest.1.6.0/opam
index d5bf81b23..3aaa19437 100644
--- a/packages/upstream/alcotest.1.5.0/opam
+++ b/packages/upstream/alcotest.1.6.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "alcotest"
-version: "1.5.0"
+version: "1.6.0"
 synopsis: "Alcotest is a lightweight and colourful test framework"
 description: """\
 Alcotest exposes simple interface to perform unit tests. It exposes
@@ -20,11 +20,10 @@ doc: "https://mirage.github.io/alcotest"
 bug-reports: "https://github.com/mirage/alcotest/issues"
 depends: [
   "dune" {>= "2.8"}
-  "ocaml" {>= "4.03.0"}
+  "ocaml" {>= "4.05.0"}
   "fmt" {>= "0.8.7"}
   "astring"
-  "cmdliner" {>= "1.0.0"}
-  "cmdliner" {with-test & < "1.1.0"}
+  "cmdliner" {>= "1.1.0"}
   "re" {>= "1.7.2"}
   "stdlib-shims"
   "uutf" {>= "1.0.1"}
@@ -51,10 +50,10 @@ build: [
 dev-repo: "git+https://github.com/mirage/alcotest.git"
 url {
   src:
-    "https://github.com/mirage/alcotest/releases/download/1.5.0/alcotest-js-1.5.0.tbz"
+    "https://github.com/mirage/alcotest/releases/download/1.6.0/alcotest-1.6.0.tbz"
   checksum: [
-    "sha256=54281907e02d78995df246dc2e10ed182828294ad2059347a1e3a13354848f6c"
-    "sha512=1aea91de40795ec4f6603d510107e4b663c1a94bd223f162ad231316d8595e9e098cabbe28a46bdcb588942f3d103d8377373d533bcc7413ba3868a577469b45"
+    "sha256=fd00f9668395874ff3b1d7ef566d14efc02fa7dd34123eb25d59355be94b2329"
+    "sha512=69a7ef300ba10a9ccb1e25b1cfdb0a0abf9ca976864a52a22f0e1fae1e5d1cbeb99498c086230b839ee9da4d0fd71e63686e126ca42221537f3fdb6f6c5aae95"
   ]
 }
-x-commit-hash: "12889aa7f993ad55434443f1c447a59f18ffc9bf"
+x-commit-hash: "6be328d73513db7f32173f86a997a59904fb1ee6"
diff --git a/packages/upstream/async.v0.14.0/opam b/packages/upstream/async.v0.15.0/opam
similarity index 57%
rename from packages/upstream/async.v0.14.0/opam
rename to packages/upstream/async.v0.15.0/opam
index e9ea988da..7ef892d30 100644
--- a/packages/upstream/async.v0.14.0/opam
+++ b/packages/upstream/async.v0.15.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "async"
-version: "v0.14.0"
+version: "v0.15.0"
 synopsis: "Monadic concurrency library"
 description: """\
 Part of Jane Street's Core library
@@ -15,19 +15,22 @@ doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/async/index.html"
 bug-reports: "https://github.com/janestreet/async/issues"
 depends: [
   "ocaml" {>= "4.08.0"}
-  "async_kernel" {>= "v0.14" & < "v0.15"}
-  "async_rpc_kernel" {>= "v0.14" & < "v0.15"}
-  "async_unix" {>= "v0.14" & < "v0.15"}
-  "core" {>= "v0.14" & < "v0.15"}
-  "core_kernel" {>= "v0.14" & < "v0.15"}
-  "ppx_jane" {>= "v0.14" & < "v0.15"}
-  "textutils" {>= "v0.14" & < "v0.15"}
+  "async_kernel" {>= "v0.15" & < "v0.16"}
+  "async_rpc_kernel" {>= "v0.15" & < "v0.16"}
+  "async_unix" {>= "v0.15" & < "v0.16"}
+  "core" {>= "v0.15" & < "v0.16"}
+  "core_kernel" {>= "v0.15" & < "v0.16"}
+  "core_unix" {>= "v0.15" & < "v0.16"}
+  "ppx_jane" {>= "v0.15" & < "v0.16"}
+  "ppx_log" {>= "v0.15" & < "v0.16"}
+  "textutils" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/async.git"
 url {
   src:
-    "https://ocaml.janestreet.com/ocaml-core/v0.14/files/async-v0.14.0.tar.gz"
-  checksum: "md5=9f80cfb72e3defcc9fca50f67e23e93c"
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/async-v0.15.0.tar.gz"
+  checksum:
+    "sha256=0d3bb21c4bed1edca25ede5e4fbc76790e22379806183846baff475281a6d6a9"
 }
diff --git a/packages/upstream/async_find.v0.14.0/opam b/packages/upstream/async_find.v0.15.0/opam
similarity index 64%
rename from packages/upstream/async_find.v0.14.0/opam
rename to packages/upstream/async_find.v0.15.0/opam
index e96d79f4d..f3a84f8ba 100644
--- a/packages/upstream/async_find.v0.14.0/opam
+++ b/packages/upstream/async_find.v0.15.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "async_find"
-version: "v0.14.0"
+version: "v0.15.0"
 synopsis: "Directory traversal with Async"
 maintainer: "Jane Street developers"
 authors: "Jane Street Group, LLC"
@@ -11,15 +11,16 @@ doc:
 bug-reports: "https://github.com/janestreet/async_find/issues"
 depends: [
   "ocaml" {>= "4.08.0"}
-  "async" {>= "v0.14" & < "v0.15"}
-  "core" {>= "v0.14" & < "v0.15"}
-  "ppx_jane" {>= "v0.14" & < "v0.15"}
+  "async" {>= "v0.15" & < "v0.16"}
+  "core" {>= "v0.15" & < "v0.16"}
+  "ppx_jane" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/async_find.git"
 url {
   src:
-    "https://ocaml.janestreet.com/ocaml-core/v0.14/files/async_find-v0.14.0.tar.gz"
-  checksum: "md5=8bbb4ca5e70534f8d39e131078ffd1da"
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/async_find-v0.15.0.tar.gz"
+  checksum:
+    "sha256=8d5ef4e8fe08a41f303ec7c6caeb1279dbb590490980b4d039e22f6dbeb9bcdb"
 }
diff --git a/packages/upstream/async_inotify.v0.14.0/opam b/packages/upstream/async_inotify.v0.15.0/opam
similarity index 60%
rename from packages/upstream/async_inotify.v0.14.0/opam
rename to packages/upstream/async_inotify.v0.15.0/opam
index b65297e9f..783481dbb 100644
--- a/packages/upstream/async_inotify.v0.14.0/opam
+++ b/packages/upstream/async_inotify.v0.15.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "async_inotify"
-version: "v0.14.0"
+version: "v0.15.0"
 synopsis: "Async wrapper for inotify"
 maintainer: "Jane Street developers"
 authors: "Jane Street Group, LLC"
@@ -11,10 +11,11 @@ doc:
 bug-reports: "https://github.com/janestreet/async_inotify/issues"
 depends: [
   "ocaml" {>= "4.08.0"}
-  "async" {>= "v0.14" & < "v0.15"}
-  "async_find" {>= "v0.14" & < "v0.15"}
-  "core" {>= "v0.14" & < "v0.15"}
-  "ppx_jane" {>= "v0.14" & < "v0.15"}
+  "async" {>= "v0.15" & < "v0.16"}
+  "async_find" {>= "v0.15" & < "v0.16"}
+  "core" {>= "v0.15" & < "v0.16"}
+  "core_unix" {>= "v0.15" & < "v0.16"}
+  "ppx_jane" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
   "inotify" {>= "0.2.0"}
 ]
@@ -22,6 +23,7 @@ build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/async_inotify.git"
 url {
   src:
-    "https://ocaml.janestreet.com/ocaml-core/v0.14/files/async_inotify-v0.14.0.tar.gz"
-  checksum: "md5=02ab9c0b6727d5493c690dac47f9ce12"
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/async_inotify-v0.15.0.tar.gz"
+  checksum:
+    "sha256=a0027a1f8b2d0df0cc71f333ab86c5d17595c2eb93ed343746bf03b596c5e007"
 }
diff --git a/packages/upstream/async_kernel.v0.14.0/opam b/packages/upstream/async_kernel.v0.15.0/opam
similarity index 71%
rename from packages/upstream/async_kernel.v0.14.0/opam
rename to packages/upstream/async_kernel.v0.15.0/opam
index 4fcab82dc..7b2cbb56f 100644
--- a/packages/upstream/async_kernel.v0.14.0/opam
+++ b/packages/upstream/async_kernel.v0.15.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "async_kernel"
-version: "v0.14.0"
+version: "v0.15.0"
 synopsis: "Monadic concurrency library"
 description: """\
 Part of Jane Street's Core library
@@ -16,14 +16,16 @@ doc:
 bug-reports: "https://github.com/janestreet/async_kernel/issues"
 depends: [
   "ocaml" {>= "4.08.0"}
-  "core_kernel" {>= "v0.14" & < "v0.15"}
-  "ppx_jane" {>= "v0.14" & < "v0.15"}
+  "core" {>= "v0.15" & < "v0.16"}
+  "core_kernel" {>= "v0.15" & < "v0.16"}
+  "ppx_jane" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/async_kernel.git"
 url {
   src:
-    "https://ocaml.janestreet.com/ocaml-core/v0.14/files/async_kernel-v0.14.0.tar.gz"
-  checksum: "md5=685575f6b6152e10a6d43859735c00cf"
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/async_kernel-v0.15.0.tar.gz"
+  checksum:
+    "sha256=30753e014bb0b127ee59f10b1073b8ae476468fb2f07dc8c99dbe2ef312fc696"
 }
diff --git a/packages/upstream/async_rpc_kernel.v0.14.0/opam b/packages/upstream/async_rpc_kernel.v0.15.0/opam
similarity index 68%
rename from packages/upstream/async_rpc_kernel.v0.14.0/opam
rename to packages/upstream/async_rpc_kernel.v0.15.0/opam
index 3097070bb..a54c8b81c 100644
--- a/packages/upstream/async_rpc_kernel.v0.14.0/opam
+++ b/packages/upstream/async_rpc_kernel.v0.15.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "async_rpc_kernel"
-version: "v0.14.0"
+version: "v0.15.0"
 synopsis: "Platform-independent core of Async RPC library"
 description: """\
 Part of Jane Street's Core library
@@ -16,16 +16,17 @@ doc:
 bug-reports: "https://github.com/janestreet/async_rpc_kernel/issues"
 depends: [
   "ocaml" {>= "4.08.0"}
-  "async_kernel" {>= "v0.14" & < "v0.15"}
-  "core_kernel" {>= "v0.14" & < "v0.15"}
-  "ppx_jane" {>= "v0.14" & < "v0.15"}
-  "protocol_version_header" {>= "v0.14" & < "v0.15"}
+  "async_kernel" {>= "v0.15" & < "v0.16"}
+  "core" {>= "v0.15" & < "v0.16"}
+  "ppx_jane" {>= "v0.15" & < "v0.16"}
+  "protocol_version_header" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/async_rpc_kernel.git"
 url {
   src:
-    "https://ocaml.janestreet.com/ocaml-core/v0.14/files/async_rpc_kernel-v0.14.0.tar.gz"
-  checksum: "md5=f435ab9bfb29aa43be1e0aa6b295252b"
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/async_rpc_kernel-v0.15.0.tar.gz"
+  checksum:
+    "sha256=a791e99ccc8205ed34c7eda94ad522eb14fe33802df3acf4f0ce6316be4b581d"
 }
diff --git a/packages/upstream/async_unix.v0.14.0/opam b/packages/upstream/async_unix.v0.15.0/opam
similarity index 66%
rename from packages/upstream/async_unix.v0.14.0/opam
rename to packages/upstream/async_unix.v0.15.0/opam
index 7ec6a3b32..91f2f8af4 100644
--- a/packages/upstream/async_unix.v0.14.0/opam
+++ b/packages/upstream/async_unix.v0.15.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "async_unix"
-version: "v0.14.0"
+version: "v0.15.0"
 synopsis: "Monadic concurrency library"
 description: """\
 Part of Jane Street's Core library
@@ -16,16 +16,18 @@ doc:
 bug-reports: "https://github.com/janestreet/async_unix/issues"
 depends: [
   "ocaml" {>= "4.08.0"}
-  "async_kernel" {>= "v0.14" & < "v0.15"}
-  "core" {>= "v0.14" & < "v0.15"}
-  "core_kernel" {>= "v0.14" & < "v0.15"}
-  "ppx_jane" {>= "v0.14" & < "v0.15"}
+  "async_kernel" {>= "v0.15" & < "v0.16"}
+  "core" {>= "v0.15" & < "v0.16"}
+  "core_kernel" {>= "v0.15" & < "v0.16"}
+  "core_unix" {>= "v0.15" & < "v0.16"}
+  "ppx_jane" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/async_unix.git"
 url {
   src:
-    "https://ocaml.janestreet.com/ocaml-core/v0.14/files/async_unix-v0.14.0.tar.gz"
-  checksum: "md5=a67300edf50a56e5bac760333404c6e7"
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/async_unix-v0.15.0.tar.gz"
+  checksum:
+    "sha256=49919d67c4197fed6a980a83a5e38f3c7311081dc40480c368c5b572a9cb3bc5"
 }
diff --git a/packages/upstream/base.v0.14.2/opam b/packages/upstream/base.v0.15.1/opam
similarity index 80%
rename from packages/upstream/base.v0.14.2/opam
rename to packages/upstream/base.v0.15.1/opam
index e7a5d6f7a..483832407 100644
--- a/packages/upstream/base.v0.14.2/opam
+++ b/packages/upstream/base.v0.15.1/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "base"
-version: "v0.14.2"
+version: "v0.15.1"
 synopsis: "Full standard library replacement for OCaml"
 description: """\
 Full standard library replacement for OCaml
@@ -22,14 +22,15 @@ homepage: "https://github.com/janestreet/base"
 doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/base/index.html"
 bug-reports: "https://github.com/janestreet/base/issues"
 depends: [
-  "ocaml" {>= "4.08.0"}
-  "sexplib0" {>= "v0.14" & < "v0.15"}
+  "ocaml" {>= "4.10.0"}
+  "sexplib0" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
   "dune-configurator"
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/base.git"
 url {
-  src: "https://github.com/janestreet/base/archive/v0.14.2.tar.gz"
-  checksum: "md5=0d1a2d0322b8c446e5dda20290112e5c"
+  src: "https://github.com/janestreet/base/archive/refs/tags/v0.15.1.tar.gz"
+  checksum:
+    "sha256=755e303171ea267e3ba5af7aa8ea27537f3394d97c77d340b10f806d6ef61a14"
 }
diff --git a/packages/upstream/base64.3.5.0/opam b/packages/upstream/base64.3.5.0/opam
index c9287791f..611f455a4 100644
--- a/packages/upstream/base64.3.5.0/opam
+++ b/packages/upstream/base64.3.5.0/opam
@@ -20,6 +20,7 @@ depends: [
   "bos" {with-test}
   "rresult" {with-test}
   "alcotest" {with-test}
+  "base-bytes"
 ]
 build: [
   ["dune" "subst"] {dev}
diff --git a/packages/upstream/base_bigstring.v0.14.0/opam b/packages/upstream/base_bigstring.v0.15.0/opam
similarity index 66%
rename from packages/upstream/base_bigstring.v0.14.0/opam
rename to packages/upstream/base_bigstring.v0.15.0/opam
index d71a380ab..e3524884c 100644
--- a/packages/upstream/base_bigstring.v0.14.0/opam
+++ b/packages/upstream/base_bigstring.v0.15.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "base_bigstring"
-version: "v0.14.0"
+version: "v0.15.0"
 synopsis: "String type based on [Bigarray], for use in I/O and C-bindings"
 description:
   "String type based on [Bigarray], for use in I/O and C-bindings."
@@ -12,15 +12,17 @@ doc:
   "https://ocaml.janestreet.com/ocaml-core/latest/doc/base_bigstring/index.html"
 bug-reports: "https://github.com/janestreet/base_bigstring/issues"
 depends: [
-  "ocaml" {>= "4.07.0"}
-  "base" {>= "v0.14" & < "v0.15"}
-  "ppx_jane" {>= "v0.14" & < "v0.15"}
+  "ocaml" {>= "4.08.0"}
+  "base" {>= "v0.15" & < "v0.16"}
+  "int_repr" {>= "v0.15" & < "v0.16"}
+  "ppx_jane" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/base_bigstring.git"
 url {
   src:
-    "https://ocaml.janestreet.com/ocaml-core/v0.14/files/base_bigstring-v0.14.0.tar.gz"
-  checksum: "md5=b6c68507bef58c3e1b4df483ed516144"
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/base_bigstring-v0.15.0.tar.gz"
+  checksum:
+    "sha256=ff75f1748baf83b0244aeba4e1bfff7f2da3f3ab5a992bb8a21ab832cea1d56b"
 }
diff --git a/packages/upstream/base_quickcheck.v0.14.1/opam b/packages/upstream/base_quickcheck.v0.15.0/opam
similarity index 58%
rename from packages/upstream/base_quickcheck.v0.14.1/opam
rename to packages/upstream/base_quickcheck.v0.15.0/opam
index cce0cd02c..857d40a01 100644
--- a/packages/upstream/base_quickcheck.v0.14.1/opam
+++ b/packages/upstream/base_quickcheck.v0.15.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "base_quickcheck"
-version: "v0.14.1"
+version: "v0.15.0"
 synopsis:
   "Randomized testing framework, designed for compatibility with Base"
 description: """\
@@ -14,20 +14,22 @@ doc:
   "https://ocaml.janestreet.com/ocaml-core/latest/doc/base_quickcheck/index.html"
 bug-reports: "https://github.com/janestreet/base_quickcheck/issues"
 depends: [
-  "ocaml" {>= "4.04.2"}
-  "base" {>= "v0.14" & < "v0.15"}
-  "ppx_base" {>= "v0.14" & < "v0.15"}
-  "ppx_fields_conv" {>= "v0.14" & < "v0.15"}
-  "ppx_let" {>= "v0.14" & < "v0.15"}
-  "ppx_sexp_message" {>= "v0.14" & < "v0.15"}
-  "ppx_sexp_value" {>= "v0.14" & < "v0.15"}
-  "splittable_random" {>= "v0.14" & < "v0.15"}
+  "ocaml" {>= "4.08.0"}
+  "base" {>= "v0.15" & < "v0.16"}
+  "ppx_base" {>= "v0.15" & < "v0.16"}
+  "ppx_fields_conv" {>= "v0.15" & < "v0.16"}
+  "ppx_let" {>= "v0.15" & < "v0.16"}
+  "ppx_sexp_message" {>= "v0.15" & < "v0.16"}
+  "ppx_sexp_value" {>= "v0.15" & < "v0.16"}
+  "splittable_random" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
-  "ppxlib" {>= "0.22.0"}
+  "ppxlib" {>= "0.23.0"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/base_quickcheck.git"
 url {
-  src: "https://github.com/janestreet/base_quickcheck/archive/v0.14.1.tar.gz"
-  checksum: "md5=d04738d4499e256b752bc40fcdb9730d"
+  src:
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/base_quickcheck-v0.15.0.tar.gz"
+  checksum:
+    "sha256=360e6b8f3660398936ec88fecb9e7761370ee63acf8372d3208d4d31c00181f2"
 }
diff --git a/packages/upstream/bigarray-compat.1.0.0/opam b/packages/upstream/bigarray-compat.1.1.0/opam
similarity index 56%
rename from packages/upstream/bigarray-compat.1.0.0/opam
rename to packages/upstream/bigarray-compat.1.1.0/opam
index cce4d840a..2ad97019d 100644
--- a/packages/upstream/bigarray-compat.1.0.0/opam
+++ b/packages/upstream/bigarray-compat.1.1.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "bigarray-compat"
-version: "1.0.0"
+version: "1.1.0"
 synopsis: "Compatibility library to use Stdlib.Bigarray when possible"
 maintainer: "Lucas Pluvinage <lucas.pluvinage@gmail.com>"
 authors: "Lucas Pluvinage <lucas.pluvinage@gmail.com>"
@@ -8,7 +8,7 @@ license: "ISC"
 homepage: "https://github.com/mirage/bigarray-compat"
 bug-reports: "https://github.com/mirage/bigarray-compat/issues"
 depends: [
-  "ocaml" {>= "4.02.3" & < "5.00"}
+  "ocaml" {>= "4.02.3"}
   "dune" {>= "1.0"}
 ]
 build: [
@@ -17,9 +17,11 @@ build: [
 ]
 dev-repo: "git+https://github.com/mirage/bigarray-compat.git"
 url {
-  src: "https://github.com/mirage/bigarray-compat/archive/v1.0.0.tar.gz"
+  src:
+    "https://github.com/mirage/bigarray-compat/releases/download/v1.1.0/bigarray-compat-1.1.0.tbz"
   checksum: [
-    "md5=1cc7c25382a8900bada34aadfd66632e"
-    "sha512=c365fee15582aca35d7b05268cde29e54774ad7df7be56762b4aad78ca1409d4326ad3b34af0f1cc2c7b872837290a9cd9ff43b47987c03bba7bba32fe8a030f"
+    "sha256=434469a48d5c84e80d621b13d95eb067f8138c1650a1fd5ae6009a19b93718d5"
+    "sha512=7be283fd957ee168ce1e62835d22114da405e4b7da9619b4f2030a832d45ca210a0c8f1d1c57c92e224f3512308a8a0f0923b94f44b6f582acbe0e7728d179d4"
   ]
 }
+x-commit-hash: "2ea842ba4ab2cfee7b711f7ad927917f3179a6f9"
diff --git a/packages/upstream/bigstringaf.0.8.0/opam b/packages/upstream/bigstringaf.0.9.0/opam
similarity index 88%
rename from packages/upstream/bigstringaf.0.8.0/opam
rename to packages/upstream/bigstringaf.0.9.0/opam
index 7c35c32c8..fbb6ba493 100644
--- a/packages/upstream/bigstringaf.0.8.0/opam
+++ b/packages/upstream/bigstringaf.0.9.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "bigstringaf"
-version: "0.8.0"
+version: "0.9.0"
 synopsis: "Bigstring intrinsics and fast blits based on memcpy/memmove"
 description: """\
 Bigstring intrinsics and fast blits based on memcpy/memmove
@@ -20,8 +20,7 @@ bug-reports: "https://github.com/inhabitedtype/bigstringaf/issues"
 depends: [
   "dune" {>= "2.6.0"}
   "alcotest" {with-test}
-  "bigarray-compat"
-  "ocaml" {>= "4.03.0"}
+  "ocaml" {>= "4.08.0"}
   "conf-pkg-config" {build}
 ]
 depopts: ["ocaml-freestanding"]
@@ -38,6 +37,6 @@ build: [
 ]
 dev-repo: "git+https://github.com/inhabitedtype/bigstringaf.git"
 url {
-  src: "https://github.com/inhabitedtype/bigstringaf/archive/0.8.0.tar.gz"
-  checksum: "md5=c3b8164c1ed1eba9977dcd0c5490e61d"
+  src: "https://github.com/inhabitedtype/bigstringaf/archive/0.9.0.tar.gz"
+  checksum: "md5=0d8ceddeb7db821fd4e5235a75ae9752"
 }
diff --git a/packages/upstream/bin_prot.v0.14.0/opam b/packages/upstream/bin_prot.v0.15.0/opam
similarity index 59%
rename from packages/upstream/bin_prot.v0.14.0/opam
rename to packages/upstream/bin_prot.v0.15.0/opam
index 9d7fdb1a5..ba66e795e 100644
--- a/packages/upstream/bin_prot.v0.14.0/opam
+++ b/packages/upstream/bin_prot.v0.15.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "bin_prot"
-version: "v0.14.0"
+version: "v0.15.0"
 synopsis: "A binary protocol generator"
 description: """\
 Part of Jane Street's Core library
@@ -14,14 +14,14 @@ homepage: "https://github.com/janestreet/bin_prot"
 doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/bin_prot/index.html"
 bug-reports: "https://github.com/janestreet/bin_prot/issues"
 depends: [
-  "ocaml" {>= "4.04.2"}
-  "base" {>= "v0.14" & < "v0.15"}
-  "ppx_compare" {>= "v0.14" & < "v0.15"}
-  "ppx_custom_printf" {>= "v0.14" & < "v0.15"}
-  "ppx_fields_conv" {>= "v0.14" & < "v0.15"}
-  "ppx_optcomp" {>= "v0.14" & < "v0.15"}
-  "ppx_sexp_conv" {>= "v0.14" & < "v0.15"}
-  "ppx_variants_conv" {>= "v0.14" & < "v0.15"}
+  "ocaml" {>= "4.08.0"}
+  "base" {>= "v0.15" & < "v0.16"}
+  "ppx_compare" {>= "v0.15" & < "v0.16"}
+  "ppx_custom_printf" {>= "v0.15" & < "v0.16"}
+  "ppx_fields_conv" {>= "v0.15" & < "v0.16"}
+  "ppx_optcomp" {>= "v0.15" & < "v0.16"}
+  "ppx_sexp_conv" {>= "v0.15" & < "v0.16"}
+  "ppx_variants_conv" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
 ]
 depopts: ["mirage-xen-ocaml"]
@@ -29,6 +29,7 @@ build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/bin_prot.git"
 url {
   src:
-    "https://ocaml.janestreet.com/ocaml-core/v0.14/files/bin_prot-v0.14.0.tar.gz"
-  checksum: "md5=a4fee6c7d57a05e2420a69e16c287faf"
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/bin_prot-v0.15.0.tar.gz"
+  checksum:
+    "sha256=7a4ba0daeacfb87e9cb7e8f49afac43a9bbb64dee4801fd789f1f188059d3690"
 }
diff --git a/packages/upstream/biniou.1.2.1/opam b/packages/upstream/biniou.1.2.1/opam
deleted file mode 100644
index c561c294b..000000000
--- a/packages/upstream/biniou.1.2.1/opam
+++ /dev/null
@@ -1,46 +0,0 @@
-opam-version: "2.0"
-name: "biniou"
-version: "1.2.1"
-synopsis:
-  "Binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve"
-description: """\
-Biniou (pronounced "be new") is a binary data format designed for speed, safety,
-ease of use and backward compatibility as protocols evolve. Biniou is vastly
-equivalent to JSON in terms of functionality but allows implementations several
-times faster (4 times faster than yojson), with 25-35% space savings.
-
-Biniou data can be decoded into human-readable form without knowledge of type
-definitions except for field and variant names which are represented by 31-bit
-hashes. A program named bdump is provided for routine visualization of biniou
-data files.
-
-The program atdgen is used to derive OCaml-Biniou serializers and deserializers
-from type definitions.
-
-Biniou format specification: mjambon.github.io/atdgen-doc/biniou-format.txt"""
-maintainer: "martin@mjambon.com"
-authors: "Martin Jambon"
-license: "BSD-3-Clause"
-homepage: "https://github.com/mjambon/biniou"
-doc: "https://mjambon.github.io/biniou/"
-bug-reports: "https://github.com/mjambon/biniou/issues"
-depends: [
-  "easy-format"
-  "dune" {>= "1.10"}
-  "ocaml" {>= "4.02.3"}
-]
-build: [
-  ["dune" "subst"] {dev}
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-  ["dune" "build" "-p" name "@doc"] {with-doc}
-]
-dev-repo: "git+https://github.com/mjambon/biniou.git"
-url {
-  src:
-    "https://github.com/mjambon/biniou/releases/download/1.2.1/biniou-1.2.1.tbz"
-  checksum: [
-    "sha256=35546c68b1929a8e6d27a3b39ecd17b38303a0d47e65eb9d1480c2061ea84335"
-    "sha512=82670cc77bf3e869ee26e5fbe5a5affa45a22bc8b6c4bd7e85473912780e0111baca59b34a2c14feae3543ce6e239d7fddaeab24b686a65bfe642cdb91d27ebf"
-  ]
-}
diff --git a/packages/upstream/bisect_ppx.2.6.0/opam b/packages/upstream/bisect_ppx.2.8.1/opam
similarity index 86%
rename from packages/upstream/bisect_ppx.2.6.0/opam
rename to packages/upstream/bisect_ppx.2.8.1/opam
index c6d2ec94e..b238a5704 100644
--- a/packages/upstream/bisect_ppx.2.6.0/opam
+++ b/packages/upstream/bisect_ppx.2.8.1/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "bisect_ppx"
-version: "2.6.0"
+version: "2.8.1"
 synopsis: "Code coverage for OCaml"
 description: """\
 Bisect_ppx helps you test thoroughly. It is a small preprocessor
@@ -27,8 +27,8 @@ depends: [
   "base-unix"
   "cmdliner" {>= "1.0.0"}
   "dune" {>= "2.7.0"}
-  "ocaml" {>= "4.02.0"}
-  "ppxlib" {>= "0.21.0"}
+  "ocaml" {>= "4.03.0"}
+  "ppxlib" {>= "0.21.0" & < "0.26.0"}
   "ocamlformat" {with-test & = "0.16.0"}
 ]
 build: [
@@ -37,6 +37,6 @@ build: [
 ]
 dev-repo: "git+https://github.com/aantron/bisect_ppx.git"
 url {
-  src: "https://github.com/aantron/bisect_ppx/archive/2.6.0.tar.gz"
-  checksum: "md5=1e87162003525cd853631dae5b4aea66"
+  src: "https://github.com/aantron/bisect_ppx/archive/2.8.1.tar.gz"
+  checksum: "md5=e8831e6e99292f221ded6fb02652e2a5"
 }
diff --git a/packages/upstream/bos.0.2.1/opam b/packages/upstream/bos.0.2.1/opam
new file mode 100644
index 000000000..b68ca8c9b
--- /dev/null
+++ b/packages/upstream/bos.0.2.1/opam
@@ -0,0 +1,53 @@
+opam-version: "2.0"
+name: "bos"
+version: "0.2.1"
+synopsis: "Basic OS interaction for OCaml"
+description: """\
+Bos provides support for basic and robust interaction with the
+operating system in OCaml. It has functions to access the process
+environment, parse command line arguments, interact with the file
+system and run command line programs.
+
+Bos works equally well on POSIX and Windows operating systems.
+
+Bos depends on [Rresult][rresult], [Astring][astring], [Fmt][fmt],
+[Fpath][fpath] and [Logs][logs] and the OCaml Unix library. It is
+distributed under the ISC license.
+
+[rresult]: http://erratique.ch/software/rresult
+[astring]: http://erratique.ch/software/astring
+[fmt]: http://erratique.ch/software/fmt
+[fpath]: http://erratique.ch/software/fpath
+[logs]: http://erratique.ch/software/logs
+
+Home page: http://erratique.ch/software/bos  
+Contact: Daniel Bünzli `<daniel.buenzl i@erratique.ch>`"""
+maintainer: "Daniel Bünzli <daniel.buenzl i@erratique.ch>"
+authors: "The bos programmers"
+license: "ISC"
+tags: [
+  "os" "system" "cli" "command" "file" "path" "log" "unix" "org:erratique"
+]
+homepage: "https://erratique.ch/software/bos"
+doc: "https://erratique.ch/software/bos/doc"
+bug-reports: "https://github.com/dbuenzli/bos/issues"
+depends: [
+  "ocaml" {>= "4.08.0"}
+  "ocamlfind" {build}
+  "ocamlbuild" {build}
+  "topkg" {build & >= "1.0.3"}
+  "base-unix"
+  "rresult" {>= "0.7.0"}
+  "astring"
+  "fpath" {>= "0.7.3"}
+  "fmt" {>= "0.8.10"}
+  "logs"
+  "mtime" {with-test}
+]
+build: ["ocaml" "pkg/pkg.ml" "build" "--dev-pkg" "%{dev}%"]
+dev-repo: "git+https://erratique.ch/repos/bos.git"
+url {
+  src: "https://erratique.ch/software/bos/releases/bos-0.2.1.tbz"
+  checksum:
+    "sha512=8daeb8a4c2dd1f2460f6274ada19f4f1b6ebe875ff83a938c93418ce0e6bdb74b8afc5c9a7d410c1c9df2dad030e4fa276b6ed2da580639484e8b5bc92610b1d"
+}
diff --git a/packages/upstream/ca-certs.0.2.2/opam b/packages/upstream/ca-certs.0.2.2/opam
new file mode 100644
index 000000000..661eb631a
--- /dev/null
+++ b/packages/upstream/ca-certs.0.2.2/opam
@@ -0,0 +1,57 @@
+opam-version: "2.0"
+name: "ca-certs"
+version: "0.2.2"
+synopsis: "Detect root CA certificates from the operating system"
+description: """\
+TLS requires a set of root anchors (Certificate Authorities) to
+authenticate servers. This library exposes this list so that it can be
+registered with ocaml-tls."""
+maintainer: "Etienne Millon <me@emillon.org>"
+authors:
+  "Etienne Millon <me@emillon.org>, Hannes Mehnert <hannes@mehnert.org>"
+license: "ISC"
+tags: "org:mirage"
+homepage: "https://github.com/mirage/ca-certs"
+doc: "https://mirage.github.io/ca-certs/doc"
+bug-reports: "https://github.com/mirage/ca-certs/issues"
+depends: [
+  "dune" {>= "2.0"}
+  "astring"
+  "bos"
+  "fpath"
+  "ptime"
+  "logs"
+  "mirage-crypto"
+  "x509" {>= "0.13.0"}
+  "ocaml" {>= "4.08.0"}
+  "alcotest" {with-test}
+  "fmt" {with-test & >= "0.8.7"}
+]
+conflicts: [
+  "result" {< "1.5"}
+]
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test & os != "macos"}
+    "@doc" {with-doc}
+  ]
+]
+depexts: ["ca_root_nss"] {os = "freebsd"}
+dev-repo: "git+https://github.com/mirage/ca-certs.git"
+url {
+  src:
+    "https://github.com/mirage/ca-certs/releases/download/v0.2.2/ca-certs-v0.2.2.tbz"
+  checksum: [
+    "sha256=4f1e77cc125e99987738387ff22cda8710e826f5ef3452f2000f0b30cd668652"
+    "sha512=70e564a5bb69a66018ff3387bf7b4b6af2ec1507d9f2f140f2aa8519e405920ec1469e56d1fa2aa8b452d05531a35f22df2c1ac08071f9a322525e95de8e3e1f"
+  ]
+}
+x-commit-hash: "20c2d4ed91bc7cd76a1bc289ad8dcc5a80006cc6"
diff --git a/packages/upstream/camlp-streams.5.0.1/opam b/packages/upstream/camlp-streams.5.0.1/opam
new file mode 100644
index 000000000..9ff255927
--- /dev/null
+++ b/packages/upstream/camlp-streams.5.0.1/opam
@@ -0,0 +1,59 @@
+opam-version: "2.0"
+name: "camlp-streams"
+version: "5.0.1"
+synopsis: "The Stream and Genlex libraries for use with Camlp4 and Camlp5"
+description: """\
+This package provides two library modules:
+- Stream: imperative streams, with in-place update and memoization
+  of the latest element produced.
+- Genlex: a small parameterized lexical analyzer producing streams
+  of tokens from streams of characters.
+
+The two modules are designed for use with Camlp4 and Camlp5:
+- The stream patterns and stream expressions of Camlp4/Camlp5 consume
+  and produce data of type 'a Stream.t.
+- The Genlex tokenizer can be used as a simple lexical analyzer for
+  Camlp4/Camlp5-generated parsers.
+
+The Stream module can also be used by hand-written recursive-descent
+parsers, but is not very convenient for this purpose.
+
+The Stream and Genlex modules have been part of the OCaml standard library
+for a long time, and have been distributed as part of the core OCaml system.
+They will be removed from the OCaml standard library at some future point,
+but will be maintained and distributed separately in this camlpstreams package."""
+maintainer: [
+  "Florian Angeletti <florian.angeletti@inria.fr>"
+  "Xavier Leroy <xavier.leroy@college-de-france.fr>"
+]
+authors: ["Daniel de Rauglaudre" "Xavier Leroy"]
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
+homepage: "https://github.com/ocaml/camlp-streams"
+bug-reports: "https://github.com/ocaml/camlp-streams/issues"
+depends: [
+  "dune" {>= "2.7"}
+  "ocaml" {>= "4.02.3"}
+  "odoc" {with-doc}
+]
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+]
+dev-repo: "git+https://github.com/ocaml/camlp-streams.git"
+url {
+  src: "https://github.com/ocaml/camlp-streams/archive/v5.0.1.tar.gz"
+  checksum: [
+    "md5=afc874b25f7a1f13e8f5cfc1182b51a7"
+    "sha512=2efa8dd4a636217c8d49bac1e4e7e5558fc2f45cfea66514140a59fd99dd08d61fb9f1e17804997ff648b71b13820a5d4a1eb70fed9d848aa2abd6e41f853c86"
+  ]
+}
diff --git a/packages/upstream/cohttp-async.2.5.4/opam b/packages/upstream/cohttp-async.5.0.0/opam
similarity index 71%
rename from packages/upstream/cohttp-async.2.5.4/opam
rename to packages/upstream/cohttp-async.5.0.0/opam
index ce2b5fa28..cf08901e4 100644
--- a/packages/upstream/cohttp-async.2.5.4/opam
+++ b/packages/upstream/cohttp-async.5.0.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "cohttp-async"
-version: "2.5.4"
+version: "5.0.0"
 synopsis: "CoHTTP implementation for the Async concurrency library"
 description: """\
 An implementation of an HTTP client and server using the Async
@@ -24,25 +24,29 @@ 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.04.1"}
-  "dune" {>= "1.1.0"}
+  "ocaml" {>= "4.08"}
+  "dune" {>= "2.0"}
   "async_kernel" {>= "v0.14.0"}
   "async_unix" {>= "v0.14.0"}
   "async" {>= "v0.14.0"}
   "base" {>= "v0.11.0"}
   "core" {with-test}
+  "core_unix" {>= "v0.14.0"}
   "cohttp" {= version}
   "conduit-async" {>= "1.2.0"}
   "magic-mime"
+  "mirage-crypto" {with-test}
   "logs"
   "fmt" {>= "0.8.2"}
   "sexplib0"
-  "stdlib-shims"
   "ppx_sexp_conv" {>= "v0.13.0"}
   "ounit" {with-test}
+  "async" {with-test & < "v0.15"}
   "uri" {>= "2.0.0"}
   "uri-sexp"
+  "ipaddr"
 ]
+available: arch != "s390x"
 build: [
   ["dune" "subst"] {dev}
   ["dune" "build" "-p" name "-j" jobs]
@@ -51,10 +55,10 @@ build: [
 dev-repo: "git+https://github.com/mirage/ocaml-cohttp.git"
 url {
   src:
-    "https://github.com/mirage/ocaml-cohttp/releases/download/v2.5.4/cohttp-v2.5.4.tbz"
+    "https://github.com/mirage/ocaml-cohttp/releases/download/v5.0.0/cohttp-5.0.0.tbz"
   checksum: [
-    "sha256=ea845f44e774ed7040304f184946a8329e39e2397a875a6ed1f19738ebd504e0"
-    "sha512=c5223f7675491919e556a3b0b3304dab31a3c800705ff981315dd0e6428ff722f7ede709ac155ab6ca10196591065359fb1da3d68a0e3c3aac73598f70202029"
+    "sha256=fd6ff4b86c818355d61b3a08628596dbf517d6a7da6e8edec481bb0653ca5a05"
+    "sha512=f0bfd715806965af5488010cc9388d05406b67ece0b2cb8f7803553b17a5264d03094e59127a62d37c0d6c0e74d4717e643737c43d9bcfb10b112a73d5f49c4d"
   ]
 }
-x-commit-hash: "c087cea1f43a867c0d9790e9cc803b5c3ce74c64"
+x-commit-hash: "5f9c0ae88a69e4280810fe73344367e90954dea5"
diff --git a/packages/upstream/cohttp-lwt-unix.2.5.4/opam b/packages/upstream/cohttp-lwt-unix.5.0.0/opam
similarity index 71%
rename from packages/upstream/cohttp-lwt-unix.2.5.4/opam
rename to packages/upstream/cohttp-lwt-unix.5.0.0/opam
index 39a944de6..f146a262c 100644
--- a/packages/upstream/cohttp-lwt-unix.2.5.4/opam
+++ b/packages/upstream/cohttp-lwt-unix.5.0.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "cohttp-lwt-unix"
-version: "2.5.4"
+version: "5.0.0"
 synopsis: "CoHTTP implementation for Unix and Windows using Lwt"
 description: """\
 An implementation of an HTTP client and server using the Lwt
@@ -27,14 +27,16 @@ 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.04.1"}
-  "dune" {>= "1.1.0"}
-  "conduit-lwt-unix" {>= "1.0.3" & < "5.0.0"}
+  "ocaml" {>= "4.08"}
+  "dune" {>= "2.0"}
+  "conduit-lwt" {>= "5.0.0"}
+  "conduit-lwt-unix" {>= "5.0.0"}
   "cmdliner"
   "magic-mime"
   "logs"
   "fmt" {>= "0.8.2"}
   "cohttp-lwt" {= version}
+  "ppx_sexp_conv" {>= "v0.13.0"}
   "lwt" {>= "3.0.0"}
   "base-unix"
   "ounit" {with-test}
@@ -47,10 +49,10 @@ build: [
 dev-repo: "git+https://github.com/mirage/ocaml-cohttp.git"
 url {
   src:
-    "https://github.com/mirage/ocaml-cohttp/releases/download/v2.5.4/cohttp-v2.5.4.tbz"
+    "https://github.com/mirage/ocaml-cohttp/releases/download/v5.0.0/cohttp-5.0.0.tbz"
   checksum: [
-    "sha256=ea845f44e774ed7040304f184946a8329e39e2397a875a6ed1f19738ebd504e0"
-    "sha512=c5223f7675491919e556a3b0b3304dab31a3c800705ff981315dd0e6428ff722f7ede709ac155ab6ca10196591065359fb1da3d68a0e3c3aac73598f70202029"
+    "sha256=fd6ff4b86c818355d61b3a08628596dbf517d6a7da6e8edec481bb0653ca5a05"
+    "sha512=f0bfd715806965af5488010cc9388d05406b67ece0b2cb8f7803553b17a5264d03094e59127a62d37c0d6c0e74d4717e643737c43d9bcfb10b112a73d5f49c4d"
   ]
 }
-x-commit-hash: "c087cea1f43a867c0d9790e9cc803b5c3ce74c64"
+x-commit-hash: "5f9c0ae88a69e4280810fe73344367e90954dea5"
diff --git a/packages/upstream/cohttp-lwt.2.5.4/opam b/packages/upstream/cohttp-lwt.5.0.0/opam
similarity index 74%
rename from packages/upstream/cohttp-lwt.2.5.4/opam
rename to packages/upstream/cohttp-lwt.5.0.0/opam
index 324af46cc..75e6b5f94 100644
--- a/packages/upstream/cohttp-lwt.2.5.4/opam
+++ b/packages/upstream/cohttp-lwt.5.0.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "cohttp-lwt"
-version: "2.5.4"
+version: "5.0.0"
 synopsis: "CoHTTP implementation using the Lwt concurrency library"
 description: """\
 This is a portable implementation of HTTP that uses the Lwt
@@ -27,13 +27,14 @@ 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.04.1"}
-  "dune" {>= "1.1.0"}
+  "ocaml" {>= "4.08"}
+  "dune" {>= "2.0"}
   "cohttp" {= version}
   "lwt" {>= "2.5.0"}
   "sexplib0"
   "ppx_sexp_conv" {>= "v0.13.0"}
   "logs"
+  "uri" {>= "2.0.0"}
 ]
 build: [
   ["dune" "subst"] {dev}
@@ -43,10 +44,10 @@ build: [
 dev-repo: "git+https://github.com/mirage/ocaml-cohttp.git"
 url {
   src:
-    "https://github.com/mirage/ocaml-cohttp/releases/download/v2.5.4/cohttp-v2.5.4.tbz"
+    "https://github.com/mirage/ocaml-cohttp/releases/download/v5.0.0/cohttp-5.0.0.tbz"
   checksum: [
-    "sha256=ea845f44e774ed7040304f184946a8329e39e2397a875a6ed1f19738ebd504e0"
-    "sha512=c5223f7675491919e556a3b0b3304dab31a3c800705ff981315dd0e6428ff722f7ede709ac155ab6ca10196591065359fb1da3d68a0e3c3aac73598f70202029"
+    "sha256=fd6ff4b86c818355d61b3a08628596dbf517d6a7da6e8edec481bb0653ca5a05"
+    "sha512=f0bfd715806965af5488010cc9388d05406b67ece0b2cb8f7803553b17a5264d03094e59127a62d37c0d6c0e74d4717e643737c43d9bcfb10b112a73d5f49c4d"
   ]
 }
-x-commit-hash: "c087cea1f43a867c0d9790e9cc803b5c3ce74c64"
+x-commit-hash: "5f9c0ae88a69e4280810fe73344367e90954dea5"
diff --git a/packages/upstream/cohttp.2.5.4/opam b/packages/upstream/cohttp.5.0.0/opam
similarity index 76%
rename from packages/upstream/cohttp.2.5.4/opam
rename to packages/upstream/cohttp.5.0.0/opam
index a32cf3003..dca446ac3 100644
--- a/packages/upstream/cohttp.2.5.4/opam
+++ b/packages/upstream/cohttp.5.0.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "cohttp"
-version: "2.5.4"
+version: "5.0.0"
 synopsis: "An OCaml library for HTTP clients and servers"
 description: """\
 Cohttp is an OCaml library for creating HTTP daemons. It has a portable
@@ -34,21 +34,19 @@ 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.04.1"}
-  "dune" {>= "1.1.0"}
+  "ocaml" {>= "4.08"}
+  "dune" {>= "2.0"}
   "re" {>= "1.9.0"}
   "uri" {>= "2.0.0"}
   "uri-sexp"
-  "fieldslib"
   "sexplib0"
-  "ppx_fields_conv" {>= "v0.9.0"}
   "ppx_sexp_conv" {>= "v0.13.0"}
   "stringext"
   "base64" {>= "3.1.0"}
-  "stdlib-shims"
   "fmt" {with-test}
   "jsonm" {build}
   "alcotest" {with-test}
+  "crowbar" {with-test & >= "0.2"}
 ]
 build: [
   ["dune" "subst"] {dev}
@@ -58,10 +56,10 @@ build: [
 dev-repo: "git+https://github.com/mirage/ocaml-cohttp.git"
 url {
   src:
-    "https://github.com/mirage/ocaml-cohttp/releases/download/v2.5.4/cohttp-v2.5.4.tbz"
+    "https://github.com/mirage/ocaml-cohttp/releases/download/v5.0.0/cohttp-5.0.0.tbz"
   checksum: [
-    "sha256=ea845f44e774ed7040304f184946a8329e39e2397a875a6ed1f19738ebd504e0"
-    "sha512=c5223f7675491919e556a3b0b3304dab31a3c800705ff981315dd0e6428ff722f7ede709ac155ab6ca10196591065359fb1da3d68a0e3c3aac73598f70202029"
+    "sha256=fd6ff4b86c818355d61b3a08628596dbf517d6a7da6e8edec481bb0653ca5a05"
+    "sha512=f0bfd715806965af5488010cc9388d05406b67ece0b2cb8f7803553b17a5264d03094e59127a62d37c0d6c0e74d4717e643737c43d9bcfb10b112a73d5f49c4d"
   ]
 }
-x-commit-hash: "c087cea1f43a867c0d9790e9cc803b5c3ce74c64"
+x-commit-hash: "5f9c0ae88a69e4280810fe73344367e90954dea5"
diff --git a/packages/upstream/conduit-async.2.2.2-1/files/0001-backport-Add-openssl_overrides-to-conduit-context.patch b/packages/upstream/conduit-async.2.2.2-1/files/0001-backport-Add-openssl_overrides-to-conduit-context.patch
deleted file mode 100644
index e04eb38f8..000000000
--- a/packages/upstream/conduit-async.2.2.2-1/files/0001-backport-Add-openssl_overrides-to-conduit-context.patch
+++ /dev/null
@@ -1,202 +0,0 @@
-From 3e42fef361a8be61528e3e2bc6da076193691afb Mon Sep 17 00:00:00 2001
-Message-Id: <3e42fef361a8be61528e3e2bc6da076193691afb.1642785804.git.edvin.torok@citrix.com>
-From: Ben Anson <ben.anson@citrix.com>
-Date: Mon, 26 Apr 2021 15:13:41 +0100
-Subject: [PATCH] Add openssl_overrides to conduit context
-
-This patch really belongs in cohttp, but I don't think conduit
-exposes all the right machinery.
-
-This patch allows openssl cohttp-lwt-unix users to:
-(a) connect to a particular hostname/IP, but specify something else to
-    verify against
-(b) have direct control over the lifetime of their client's ssl context
-
-I believe you should be able to achieve (a) using the following
-resolver (but it results in 'not supported' errors):
-
-```
-let resolver =
-  let table = Hashtbl.create 16 in
-  let cn = "expected-cn" in
-  let Ok ip = Ipaddr.of_string cn in
-  Hashtbl.add table cn (`TLS (cn, `TCP (ip, port)));
-  Resolver_lwt_unix.static table
-```
-
-It's not possible to achieve (b) right now (at least in v2).
-
-(b) is useful if your trusted bundle changes (calling
-`load_verify_locations` with the same SSL context does not work as
-one might expect). The alternative is to restart your application.
-
-Intended usage with cohttp:
-
-```
-let ctx : Ssl.context = ... in
-let openssl_overrides =
-  let open Conduit_lwt_unix_ssl.Overrides in
-  {
-    client =
-      Some Client.{ ctx = Some ctx; hostname = Some cn };
-  }
-in
-let* (ctx : Conduit_lwt_unix.ctx) = Conduit_lwt_unix.init ~openssl_overrides () in
-let ctx : Cohttp_lwt_unix.Client.ctx = Cohttp_lwt_unix.Client.custom_ctx ~ctx () in
-let* _resp, resp_body = Client.call ~ctx `POST ~body uri in
-...
-```
----
- lwt-unix/conduit_lwt_unix.ml            | 20 +++++++++++++++-----
- lwt-unix/conduit_lwt_unix.mli           |  1 +
- lwt-unix/conduit_lwt_unix_ssl_dummy.ml  |  8 ++++++++
- lwt-unix/conduit_lwt_unix_ssl_dummy.mli |  8 ++++++++
- lwt-unix/conduit_lwt_unix_ssl_real.ml   |  8 ++++++++
- lwt-unix/conduit_lwt_unix_ssl_real.mli  |  8 ++++++++
- 6 files changed, 48 insertions(+), 5 deletions(-)
-
-diff --git a/lwt-unix/conduit_lwt_unix.ml b/lwt-unix/conduit_lwt_unix.ml
-index 8dade88..9c51564 100644
---- a/lwt-unix/conduit_lwt_unix.ml
-+++ b/lwt-unix/conduit_lwt_unix.ml
-@@ -110,6 +110,7 @@ type tls_server_key = tls_own_key [@@deriving sexp]
- type ctx = {
-   src: Unix.sockaddr option;
-   tls_own_key: tls_own_key;
-+  openssl_overrides : Conduit_lwt_unix_ssl.Overrides.t option;
- }
- 
- let string_of_unix_sockaddr sa =
-@@ -155,19 +156,19 @@ let flow_of_fd fd sa =
-   | Unix.ADDR_INET (ip,port) -> TCP { fd; ip=Ipaddr_unix.of_inet_addr ip; port }
- 
- let default_ctx =
--  { src=None; tls_own_key=`None }
-+  { src=None; tls_own_key=`None; openssl_overrides=None; }
- 
--let init ?src ?(tls_own_key=`None) ?(tls_server_key=`None) () =
-+let init ?src ?(tls_own_key=`None) ?(tls_server_key=`None) ?openssl_overrides () =
-   let tls_own_key =
-     match tls_own_key with `None -> tls_server_key | _ -> tls_own_key in
-   match src with
-   | None ->
--    Lwt.return { src=None; tls_own_key }
-+    Lwt.return { src=None; tls_own_key; openssl_overrides; }
-   | Some host ->
-     let open Unix in
-     Lwt_unix.getaddrinfo host "0" [AI_PASSIVE; AI_SOCKTYPE SOCK_STREAM]
-     >>= function
--    | {ai_addr;_}::_ -> Lwt.return { src=Some ai_addr; tls_own_key }
-+    | {ai_addr;_}::_ -> Lwt.return { src=Some ai_addr; tls_own_key; openssl_overrides; }
-     | [] -> Lwt.fail_with "Invalid conduit source address specified"
- 
- module Sockaddr_io = struct
-@@ -270,7 +271,16 @@ let connect_with_openssl ~ctx (`Hostname hostname, `IP ip, `Port port) =
-         in
-         Some ctx_ssl
-   in
--  Conduit_lwt_unix_ssl.Client.connect ?ctx:ctx_ssl ?src:ctx.src ~hostname sa
-+  let hostname, ctx_ssl =
-+    match ctx.openssl_overrides with
-+    | None | Some { client = None } -> (Some hostname, ctx_ssl)
-+    | Some { client = Some overrides } ->
-+        let ctx_ssl =
-+          match overrides.ctx with Some x -> Some x | None -> ctx_ssl
-+        in
-+        (overrides.hostname, ctx_ssl)
-+  in
-+  Conduit_lwt_unix_ssl.Client.connect ?ctx:ctx_ssl ?src:ctx.src ?hostname sa
-   >>= fun (fd, ic, oc) ->
-   let flow = TCP {fd;ip;port} in
-   Lwt.return (flow, ic, oc)
-diff --git a/lwt-unix/conduit_lwt_unix.mli b/lwt-unix/conduit_lwt_unix.mli
-index e5db5d0..37ad751 100644
---- a/lwt-unix/conduit_lwt_unix.mli
-+++ b/lwt-unix/conduit_lwt_unix.mli
-@@ -166,6 +166,7 @@ val init :
-   ?src:string ->
-   ?tls_own_key:tls_own_key ->
-   ?tls_server_key:tls_own_key (* Deprecated, use tls_own_key. *) ->
-+  ?openssl_overrides:Conduit_lwt_unix_ssl.Overrides.t ->
-   unit -> ctx io
- 
- (** [connect ~ctx client] establishes an outgoing connection
-diff --git a/lwt-unix/conduit_lwt_unix_ssl_dummy.ml b/lwt-unix/conduit_lwt_unix_ssl_dummy.ml
-index b11f8d2..6e7d57d 100644
---- a/lwt-unix/conduit_lwt_unix_ssl_dummy.ml
-+++ b/lwt-unix/conduit_lwt_unix_ssl_dummy.ml
-@@ -15,6 +15,14 @@
-  *
-  *)
- 
-+module Overrides = struct
-+  module Client = struct
-+    type t = { ctx : [ `Ssl_not_available ] option ; hostname : string option }
-+  end
-+
-+  type t = { client : Client.t option }
-+end
-+
- module Client = struct
-   let default_ctx = `Ssl_not_available
- 
-diff --git a/lwt-unix/conduit_lwt_unix_ssl_dummy.mli b/lwt-unix/conduit_lwt_unix_ssl_dummy.mli
-index 24b73b0..cf25544 100644
---- a/lwt-unix/conduit_lwt_unix_ssl_dummy.mli
-+++ b/lwt-unix/conduit_lwt_unix_ssl_dummy.mli
-@@ -17,6 +17,14 @@
- 
- (** TLS/SSL connections via {{:http://www.openssl.org}OpenSSL} C bindings *)
- 
-+module Overrides : sig
-+  module Client : sig
-+    type t = { ctx : [ `Ssl_not_available ] option ; hostname : string option }
-+  end
-+
-+  type t = { client : Client.t option }
-+end
-+
- module Client : sig
-   val default_ctx : [`Ssl_not_available]
- 
-diff --git a/lwt-unix/conduit_lwt_unix_ssl_real.ml b/lwt-unix/conduit_lwt_unix_ssl_real.ml
-index 9aca9bb..330bd03 100644
---- a/lwt-unix/conduit_lwt_unix_ssl_real.ml
-+++ b/lwt-unix/conduit_lwt_unix_ssl_real.ml
-@@ -27,6 +27,14 @@ let chans_of_fd sock =
-   let ic = Lwt_io.make ~mode:Lwt_io.input ~close (Lwt_ssl.read_bytes sock) in
-   ((Lwt_ssl.get_fd sock), ic, oc)
- 
-+module Overrides = struct
-+  module Client = struct
-+    type t = { ctx : Ssl.context option; hostname : string option }
-+  end
-+
-+  type t = { client : Client.t option }
-+end
-+
- module Client = struct
-   let create_ctx ?certfile ?keyfile ?password () =
-     let ctx = Ssl.create_context Ssl.SSLv23 Ssl.Client_context in
-diff --git a/lwt-unix/conduit_lwt_unix_ssl_real.mli b/lwt-unix/conduit_lwt_unix_ssl_real.mli
-index 018bc65..64356ea 100644
---- a/lwt-unix/conduit_lwt_unix_ssl_real.mli
-+++ b/lwt-unix/conduit_lwt_unix_ssl_real.mli
-@@ -17,6 +17,14 @@
- 
- (** TLS/SSL connections via {{:http://www.openssl.org}OpenSSL} C bindings *)
- 
-+module Overrides : sig
-+  module Client : sig
-+    type t = { ctx : Ssl.context option; hostname : string option }
-+  end
-+
-+  type t = { client : Client.t option }
-+end
-+
- module Client : sig
-   val default_ctx : Ssl.context
- 
--- 
-2.25.1
-
diff --git a/packages/upstream/conduit-async.2.2.2-1/opam b/packages/upstream/conduit-async.6.1.0/opam
similarity index 55%
rename from packages/upstream/conduit-async.2.2.2-1/opam
rename to packages/upstream/conduit-async.6.1.0/opam
index e5e6b0d57..10490c3dc 100644
--- a/packages/upstream/conduit-async.2.2.2-1/opam
+++ b/packages/upstream/conduit-async.6.1.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "conduit-async"
-version: "2.2.2-1"
+version: "6.1.0"
 synopsis: "A network connection establishment library for Async"
 maintainer: "anil@recoil.org"
 authors: [
@@ -11,34 +11,33 @@ tags: "org:mirage"
 homepage: "https://github.com/mirage/ocaml-conduit"
 bug-reports: "https://github.com/mirage/ocaml-conduit/issues"
 depends: [
-  "ocaml" {>= "4.03.0"}
-  "dune"
-  "core"
-  "ppx_sexp_conv" {>= "v0.9.0"}
+  "ocaml" {>= "4.08.0"}
+  "dune" {>= "2.0"}
+  "core" {>= "v0.15.0"}
+  "uri" {>= "4.0.0"}
+  "ppx_here" {>= "v0.9.0"}
+  "ppx_sexp_conv" {>= "v0.13.0"}
   "sexplib"
   "conduit" {= version}
-  "async" {>= "v0.10.0"}
+  "async" {>= "v0.15.0"}
   "ipaddr" {>= "3.0.0"}
+  "ipaddr-sexp" {>= "4.0.0"}
 ]
 depopts: ["async_ssl"]
 conflicts: [
   "async_ssl" {< "v0.9.0"}
 ]
 build: [
-  ["dune" "subst"] {pinned}
+  ["dune" "subst"] {dev}
   ["dune" "build" "-p" name "-j" jobs]
 ]
-patches: "0001-backport-Add-openssl_overrides-to-conduit-context.patch"
 dev-repo: "git+https://github.com/mirage/ocaml-conduit.git"
-extra-files: [
-  "0001-backport-Add-openssl_overrides-to-conduit-context.patch"
-  "md5=c131b837c73db9cd31687fbbdf7e027f"
-]
 url {
   src:
-    "https://github.com/mirage/ocaml-conduit/releases/download/v2.2.2/conduit-v2.2.2.tbz"
+    "https://github.com/mirage/ocaml-conduit/releases/download/v6.1.0/conduit-6.1.0.tbz"
   checksum: [
-    "sha256=a57cc1843aa7eaaa183a5d08d98a13e78c848b37aabb7b55ee88257c051f68fd"
-    "sha512=c2ca50cdae36f6b9cef4053844a4b719e4e065997a2dc6e1858f8c0bc3ce03d5728d10308368f1968154d217dfc84038cd1de007b1168e7adf476dc57af3f513"
+    "sha256=a2e29088630bbef92c1a902192a09548ab4a6b3f75a7eee6722426eca1efc05f"
+    "sha512=308041a9cccf5b01827365ae9e75915bf33c812658ff1a802b275827f4c9af98dd991df9106a5b8d70374cc0d41398621bbafd8de829acfef4cb86e6b9523712"
   ]
 }
+x-commit-hash: "dc7af98ec25c71dd7e4ea78223e330b2596ec3f1"
diff --git a/packages/upstream/conduit-lwt-unix.2.2.2-1/files/0001-backport-Add-openssl_overrides-to-conduit-context.patch b/packages/upstream/conduit-lwt-unix.2.2.2-1/files/0001-backport-Add-openssl_overrides-to-conduit-context.patch
deleted file mode 100644
index e04eb38f8..000000000
--- a/packages/upstream/conduit-lwt-unix.2.2.2-1/files/0001-backport-Add-openssl_overrides-to-conduit-context.patch
+++ /dev/null
@@ -1,202 +0,0 @@
-From 3e42fef361a8be61528e3e2bc6da076193691afb Mon Sep 17 00:00:00 2001
-Message-Id: <3e42fef361a8be61528e3e2bc6da076193691afb.1642785804.git.edvin.torok@citrix.com>
-From: Ben Anson <ben.anson@citrix.com>
-Date: Mon, 26 Apr 2021 15:13:41 +0100
-Subject: [PATCH] Add openssl_overrides to conduit context
-
-This patch really belongs in cohttp, but I don't think conduit
-exposes all the right machinery.
-
-This patch allows openssl cohttp-lwt-unix users to:
-(a) connect to a particular hostname/IP, but specify something else to
-    verify against
-(b) have direct control over the lifetime of their client's ssl context
-
-I believe you should be able to achieve (a) using the following
-resolver (but it results in 'not supported' errors):
-
-```
-let resolver =
-  let table = Hashtbl.create 16 in
-  let cn = "expected-cn" in
-  let Ok ip = Ipaddr.of_string cn in
-  Hashtbl.add table cn (`TLS (cn, `TCP (ip, port)));
-  Resolver_lwt_unix.static table
-```
-
-It's not possible to achieve (b) right now (at least in v2).
-
-(b) is useful if your trusted bundle changes (calling
-`load_verify_locations` with the same SSL context does not work as
-one might expect). The alternative is to restart your application.
-
-Intended usage with cohttp:
-
-```
-let ctx : Ssl.context = ... in
-let openssl_overrides =
-  let open Conduit_lwt_unix_ssl.Overrides in
-  {
-    client =
-      Some Client.{ ctx = Some ctx; hostname = Some cn };
-  }
-in
-let* (ctx : Conduit_lwt_unix.ctx) = Conduit_lwt_unix.init ~openssl_overrides () in
-let ctx : Cohttp_lwt_unix.Client.ctx = Cohttp_lwt_unix.Client.custom_ctx ~ctx () in
-let* _resp, resp_body = Client.call ~ctx `POST ~body uri in
-...
-```
----
- lwt-unix/conduit_lwt_unix.ml            | 20 +++++++++++++++-----
- lwt-unix/conduit_lwt_unix.mli           |  1 +
- lwt-unix/conduit_lwt_unix_ssl_dummy.ml  |  8 ++++++++
- lwt-unix/conduit_lwt_unix_ssl_dummy.mli |  8 ++++++++
- lwt-unix/conduit_lwt_unix_ssl_real.ml   |  8 ++++++++
- lwt-unix/conduit_lwt_unix_ssl_real.mli  |  8 ++++++++
- 6 files changed, 48 insertions(+), 5 deletions(-)
-
-diff --git a/lwt-unix/conduit_lwt_unix.ml b/lwt-unix/conduit_lwt_unix.ml
-index 8dade88..9c51564 100644
---- a/lwt-unix/conduit_lwt_unix.ml
-+++ b/lwt-unix/conduit_lwt_unix.ml
-@@ -110,6 +110,7 @@ type tls_server_key = tls_own_key [@@deriving sexp]
- type ctx = {
-   src: Unix.sockaddr option;
-   tls_own_key: tls_own_key;
-+  openssl_overrides : Conduit_lwt_unix_ssl.Overrides.t option;
- }
- 
- let string_of_unix_sockaddr sa =
-@@ -155,19 +156,19 @@ let flow_of_fd fd sa =
-   | Unix.ADDR_INET (ip,port) -> TCP { fd; ip=Ipaddr_unix.of_inet_addr ip; port }
- 
- let default_ctx =
--  { src=None; tls_own_key=`None }
-+  { src=None; tls_own_key=`None; openssl_overrides=None; }
- 
--let init ?src ?(tls_own_key=`None) ?(tls_server_key=`None) () =
-+let init ?src ?(tls_own_key=`None) ?(tls_server_key=`None) ?openssl_overrides () =
-   let tls_own_key =
-     match tls_own_key with `None -> tls_server_key | _ -> tls_own_key in
-   match src with
-   | None ->
--    Lwt.return { src=None; tls_own_key }
-+    Lwt.return { src=None; tls_own_key; openssl_overrides; }
-   | Some host ->
-     let open Unix in
-     Lwt_unix.getaddrinfo host "0" [AI_PASSIVE; AI_SOCKTYPE SOCK_STREAM]
-     >>= function
--    | {ai_addr;_}::_ -> Lwt.return { src=Some ai_addr; tls_own_key }
-+    | {ai_addr;_}::_ -> Lwt.return { src=Some ai_addr; tls_own_key; openssl_overrides; }
-     | [] -> Lwt.fail_with "Invalid conduit source address specified"
- 
- module Sockaddr_io = struct
-@@ -270,7 +271,16 @@ let connect_with_openssl ~ctx (`Hostname hostname, `IP ip, `Port port) =
-         in
-         Some ctx_ssl
-   in
--  Conduit_lwt_unix_ssl.Client.connect ?ctx:ctx_ssl ?src:ctx.src ~hostname sa
-+  let hostname, ctx_ssl =
-+    match ctx.openssl_overrides with
-+    | None | Some { client = None } -> (Some hostname, ctx_ssl)
-+    | Some { client = Some overrides } ->
-+        let ctx_ssl =
-+          match overrides.ctx with Some x -> Some x | None -> ctx_ssl
-+        in
-+        (overrides.hostname, ctx_ssl)
-+  in
-+  Conduit_lwt_unix_ssl.Client.connect ?ctx:ctx_ssl ?src:ctx.src ?hostname sa
-   >>= fun (fd, ic, oc) ->
-   let flow = TCP {fd;ip;port} in
-   Lwt.return (flow, ic, oc)
-diff --git a/lwt-unix/conduit_lwt_unix.mli b/lwt-unix/conduit_lwt_unix.mli
-index e5db5d0..37ad751 100644
---- a/lwt-unix/conduit_lwt_unix.mli
-+++ b/lwt-unix/conduit_lwt_unix.mli
-@@ -166,6 +166,7 @@ val init :
-   ?src:string ->
-   ?tls_own_key:tls_own_key ->
-   ?tls_server_key:tls_own_key (* Deprecated, use tls_own_key. *) ->
-+  ?openssl_overrides:Conduit_lwt_unix_ssl.Overrides.t ->
-   unit -> ctx io
- 
- (** [connect ~ctx client] establishes an outgoing connection
-diff --git a/lwt-unix/conduit_lwt_unix_ssl_dummy.ml b/lwt-unix/conduit_lwt_unix_ssl_dummy.ml
-index b11f8d2..6e7d57d 100644
---- a/lwt-unix/conduit_lwt_unix_ssl_dummy.ml
-+++ b/lwt-unix/conduit_lwt_unix_ssl_dummy.ml
-@@ -15,6 +15,14 @@
-  *
-  *)
- 
-+module Overrides = struct
-+  module Client = struct
-+    type t = { ctx : [ `Ssl_not_available ] option ; hostname : string option }
-+  end
-+
-+  type t = { client : Client.t option }
-+end
-+
- module Client = struct
-   let default_ctx = `Ssl_not_available
- 
-diff --git a/lwt-unix/conduit_lwt_unix_ssl_dummy.mli b/lwt-unix/conduit_lwt_unix_ssl_dummy.mli
-index 24b73b0..cf25544 100644
---- a/lwt-unix/conduit_lwt_unix_ssl_dummy.mli
-+++ b/lwt-unix/conduit_lwt_unix_ssl_dummy.mli
-@@ -17,6 +17,14 @@
- 
- (** TLS/SSL connections via {{:http://www.openssl.org}OpenSSL} C bindings *)
- 
-+module Overrides : sig
-+  module Client : sig
-+    type t = { ctx : [ `Ssl_not_available ] option ; hostname : string option }
-+  end
-+
-+  type t = { client : Client.t option }
-+end
-+
- module Client : sig
-   val default_ctx : [`Ssl_not_available]
- 
-diff --git a/lwt-unix/conduit_lwt_unix_ssl_real.ml b/lwt-unix/conduit_lwt_unix_ssl_real.ml
-index 9aca9bb..330bd03 100644
---- a/lwt-unix/conduit_lwt_unix_ssl_real.ml
-+++ b/lwt-unix/conduit_lwt_unix_ssl_real.ml
-@@ -27,6 +27,14 @@ let chans_of_fd sock =
-   let ic = Lwt_io.make ~mode:Lwt_io.input ~close (Lwt_ssl.read_bytes sock) in
-   ((Lwt_ssl.get_fd sock), ic, oc)
- 
-+module Overrides = struct
-+  module Client = struct
-+    type t = { ctx : Ssl.context option; hostname : string option }
-+  end
-+
-+  type t = { client : Client.t option }
-+end
-+
- module Client = struct
-   let create_ctx ?certfile ?keyfile ?password () =
-     let ctx = Ssl.create_context Ssl.SSLv23 Ssl.Client_context in
-diff --git a/lwt-unix/conduit_lwt_unix_ssl_real.mli b/lwt-unix/conduit_lwt_unix_ssl_real.mli
-index 018bc65..64356ea 100644
---- a/lwt-unix/conduit_lwt_unix_ssl_real.mli
-+++ b/lwt-unix/conduit_lwt_unix_ssl_real.mli
-@@ -17,6 +17,14 @@
- 
- (** TLS/SSL connections via {{:http://www.openssl.org}OpenSSL} C bindings *)
- 
-+module Overrides : sig
-+  module Client : sig
-+    type t = { ctx : Ssl.context option; hostname : string option }
-+  end
-+
-+  type t = { client : Client.t option }
-+end
-+
- module Client : sig
-   val default_ctx : Ssl.context
- 
--- 
-2.25.1
-
diff --git a/packages/upstream/conduit-lwt-unix.2.2.2-1/opam b/packages/upstream/conduit-lwt-unix.6.1.0/opam
similarity index 54%
rename from packages/upstream/conduit-lwt-unix.2.2.2-1/opam
rename to packages/upstream/conduit-lwt-unix.6.1.0/opam
index 2043f8d1d..4a452591e 100644
--- a/packages/upstream/conduit-lwt-unix.2.2.2-1/opam
+++ b/packages/upstream/conduit-lwt-unix.6.1.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "conduit-lwt-unix"
-version: "2.2.2-1"
+version: "6.1.0"
 synopsis: "A network connection establishment library for Lwt_unix"
 maintainer: "anil@recoil.org"
 authors: [
@@ -11,36 +11,37 @@ tags: "org:mirage"
 homepage: "https://github.com/mirage/ocaml-conduit"
 bug-reports: "https://github.com/mirage/ocaml-conduit/issues"
 depends: [
-  "ocaml" {>= "4.07.0"}
-  "dune"
+  "ocaml" {>= "4.08.0"}
+  "dune" {>= "2.0"}
   "base-unix"
-  "ppx_sexp_conv" {>= "v0.12.0"}
-  "conduit-lwt" {>= "2.1.0" & < "2.3.0"}
+  "logs"
+  "ppx_sexp_conv" {>= "v0.13.0"}
+  "conduit-lwt" {= version}
   "lwt" {>= "3.0.0"}
   "uri" {>= "1.9.4"}
   "ipaddr" {>= "4.0.0"}
   "ipaddr-sexp"
+  "ca-certs"
+  "lwt_log" {with-test}
+  "ssl" {with-test}
+  "lwt_ssl" {with-test}
 ]
 depopts: ["tls" "lwt_ssl" "launchd"]
 conflicts: [
-  "tls" {< "0.12.2"}
-  "ssl" {< "0.5.9"}
+  "tls" {< "0.14.0"}
+  "ssl" {< "0.5.12"}
 ]
 build: [
-  ["dune" "subst"] {pinned}
+  ["dune" "subst"] {dev}
   ["dune" "build" "-p" name "-j" jobs]
 ]
-patches: "0001-backport-Add-openssl_overrides-to-conduit-context.patch"
 dev-repo: "git+https://github.com/mirage/ocaml-conduit.git"
-extra-files: [
-  "0001-backport-Add-openssl_overrides-to-conduit-context.patch"
-  "md5=c131b837c73db9cd31687fbbdf7e027f"
-]
 url {
   src:
-    "https://github.com/mirage/ocaml-conduit/releases/download/v2.2.2/conduit-v2.2.2.tbz"
+    "https://github.com/mirage/ocaml-conduit/releases/download/v6.1.0/conduit-6.1.0.tbz"
   checksum: [
-    "sha256=a57cc1843aa7eaaa183a5d08d98a13e78c848b37aabb7b55ee88257c051f68fd"
-    "sha512=c2ca50cdae36f6b9cef4053844a4b719e4e065997a2dc6e1858f8c0bc3ce03d5728d10308368f1968154d217dfc84038cd1de007b1168e7adf476dc57af3f513"
+    "sha256=a2e29088630bbef92c1a902192a09548ab4a6b3f75a7eee6722426eca1efc05f"
+    "sha512=308041a9cccf5b01827365ae9e75915bf33c812658ff1a802b275827f4c9af98dd991df9106a5b8d70374cc0d41398621bbafd8de829acfef4cb86e6b9523712"
   ]
 }
+x-commit-hash: "dc7af98ec25c71dd7e4ea78223e330b2596ec3f1"
diff --git a/packages/upstream/conduit-lwt.2.2.2-1/files/0001-backport-Add-openssl_overrides-to-conduit-context.patch b/packages/upstream/conduit-lwt.2.2.2-1/files/0001-backport-Add-openssl_overrides-to-conduit-context.patch
deleted file mode 100644
index e04eb38f8..000000000
--- a/packages/upstream/conduit-lwt.2.2.2-1/files/0001-backport-Add-openssl_overrides-to-conduit-context.patch
+++ /dev/null
@@ -1,202 +0,0 @@
-From 3e42fef361a8be61528e3e2bc6da076193691afb Mon Sep 17 00:00:00 2001
-Message-Id: <3e42fef361a8be61528e3e2bc6da076193691afb.1642785804.git.edvin.torok@citrix.com>
-From: Ben Anson <ben.anson@citrix.com>
-Date: Mon, 26 Apr 2021 15:13:41 +0100
-Subject: [PATCH] Add openssl_overrides to conduit context
-
-This patch really belongs in cohttp, but I don't think conduit
-exposes all the right machinery.
-
-This patch allows openssl cohttp-lwt-unix users to:
-(a) connect to a particular hostname/IP, but specify something else to
-    verify against
-(b) have direct control over the lifetime of their client's ssl context
-
-I believe you should be able to achieve (a) using the following
-resolver (but it results in 'not supported' errors):
-
-```
-let resolver =
-  let table = Hashtbl.create 16 in
-  let cn = "expected-cn" in
-  let Ok ip = Ipaddr.of_string cn in
-  Hashtbl.add table cn (`TLS (cn, `TCP (ip, port)));
-  Resolver_lwt_unix.static table
-```
-
-It's not possible to achieve (b) right now (at least in v2).
-
-(b) is useful if your trusted bundle changes (calling
-`load_verify_locations` with the same SSL context does not work as
-one might expect). The alternative is to restart your application.
-
-Intended usage with cohttp:
-
-```
-let ctx : Ssl.context = ... in
-let openssl_overrides =
-  let open Conduit_lwt_unix_ssl.Overrides in
-  {
-    client =
-      Some Client.{ ctx = Some ctx; hostname = Some cn };
-  }
-in
-let* (ctx : Conduit_lwt_unix.ctx) = Conduit_lwt_unix.init ~openssl_overrides () in
-let ctx : Cohttp_lwt_unix.Client.ctx = Cohttp_lwt_unix.Client.custom_ctx ~ctx () in
-let* _resp, resp_body = Client.call ~ctx `POST ~body uri in
-...
-```
----
- lwt-unix/conduit_lwt_unix.ml            | 20 +++++++++++++++-----
- lwt-unix/conduit_lwt_unix.mli           |  1 +
- lwt-unix/conduit_lwt_unix_ssl_dummy.ml  |  8 ++++++++
- lwt-unix/conduit_lwt_unix_ssl_dummy.mli |  8 ++++++++
- lwt-unix/conduit_lwt_unix_ssl_real.ml   |  8 ++++++++
- lwt-unix/conduit_lwt_unix_ssl_real.mli  |  8 ++++++++
- 6 files changed, 48 insertions(+), 5 deletions(-)
-
-diff --git a/lwt-unix/conduit_lwt_unix.ml b/lwt-unix/conduit_lwt_unix.ml
-index 8dade88..9c51564 100644
---- a/lwt-unix/conduit_lwt_unix.ml
-+++ b/lwt-unix/conduit_lwt_unix.ml
-@@ -110,6 +110,7 @@ type tls_server_key = tls_own_key [@@deriving sexp]
- type ctx = {
-   src: Unix.sockaddr option;
-   tls_own_key: tls_own_key;
-+  openssl_overrides : Conduit_lwt_unix_ssl.Overrides.t option;
- }
- 
- let string_of_unix_sockaddr sa =
-@@ -155,19 +156,19 @@ let flow_of_fd fd sa =
-   | Unix.ADDR_INET (ip,port) -> TCP { fd; ip=Ipaddr_unix.of_inet_addr ip; port }
- 
- let default_ctx =
--  { src=None; tls_own_key=`None }
-+  { src=None; tls_own_key=`None; openssl_overrides=None; }
- 
--let init ?src ?(tls_own_key=`None) ?(tls_server_key=`None) () =
-+let init ?src ?(tls_own_key=`None) ?(tls_server_key=`None) ?openssl_overrides () =
-   let tls_own_key =
-     match tls_own_key with `None -> tls_server_key | _ -> tls_own_key in
-   match src with
-   | None ->
--    Lwt.return { src=None; tls_own_key }
-+    Lwt.return { src=None; tls_own_key; openssl_overrides; }
-   | Some host ->
-     let open Unix in
-     Lwt_unix.getaddrinfo host "0" [AI_PASSIVE; AI_SOCKTYPE SOCK_STREAM]
-     >>= function
--    | {ai_addr;_}::_ -> Lwt.return { src=Some ai_addr; tls_own_key }
-+    | {ai_addr;_}::_ -> Lwt.return { src=Some ai_addr; tls_own_key; openssl_overrides; }
-     | [] -> Lwt.fail_with "Invalid conduit source address specified"
- 
- module Sockaddr_io = struct
-@@ -270,7 +271,16 @@ let connect_with_openssl ~ctx (`Hostname hostname, `IP ip, `Port port) =
-         in
-         Some ctx_ssl
-   in
--  Conduit_lwt_unix_ssl.Client.connect ?ctx:ctx_ssl ?src:ctx.src ~hostname sa
-+  let hostname, ctx_ssl =
-+    match ctx.openssl_overrides with
-+    | None | Some { client = None } -> (Some hostname, ctx_ssl)
-+    | Some { client = Some overrides } ->
-+        let ctx_ssl =
-+          match overrides.ctx with Some x -> Some x | None -> ctx_ssl
-+        in
-+        (overrides.hostname, ctx_ssl)
-+  in
-+  Conduit_lwt_unix_ssl.Client.connect ?ctx:ctx_ssl ?src:ctx.src ?hostname sa
-   >>= fun (fd, ic, oc) ->
-   let flow = TCP {fd;ip;port} in
-   Lwt.return (flow, ic, oc)
-diff --git a/lwt-unix/conduit_lwt_unix.mli b/lwt-unix/conduit_lwt_unix.mli
-index e5db5d0..37ad751 100644
---- a/lwt-unix/conduit_lwt_unix.mli
-+++ b/lwt-unix/conduit_lwt_unix.mli
-@@ -166,6 +166,7 @@ val init :
-   ?src:string ->
-   ?tls_own_key:tls_own_key ->
-   ?tls_server_key:tls_own_key (* Deprecated, use tls_own_key. *) ->
-+  ?openssl_overrides:Conduit_lwt_unix_ssl.Overrides.t ->
-   unit -> ctx io
- 
- (** [connect ~ctx client] establishes an outgoing connection
-diff --git a/lwt-unix/conduit_lwt_unix_ssl_dummy.ml b/lwt-unix/conduit_lwt_unix_ssl_dummy.ml
-index b11f8d2..6e7d57d 100644
---- a/lwt-unix/conduit_lwt_unix_ssl_dummy.ml
-+++ b/lwt-unix/conduit_lwt_unix_ssl_dummy.ml
-@@ -15,6 +15,14 @@
-  *
-  *)
- 
-+module Overrides = struct
-+  module Client = struct
-+    type t = { ctx : [ `Ssl_not_available ] option ; hostname : string option }
-+  end
-+
-+  type t = { client : Client.t option }
-+end
-+
- module Client = struct
-   let default_ctx = `Ssl_not_available
- 
-diff --git a/lwt-unix/conduit_lwt_unix_ssl_dummy.mli b/lwt-unix/conduit_lwt_unix_ssl_dummy.mli
-index 24b73b0..cf25544 100644
---- a/lwt-unix/conduit_lwt_unix_ssl_dummy.mli
-+++ b/lwt-unix/conduit_lwt_unix_ssl_dummy.mli
-@@ -17,6 +17,14 @@
- 
- (** TLS/SSL connections via {{:http://www.openssl.org}OpenSSL} C bindings *)
- 
-+module Overrides : sig
-+  module Client : sig
-+    type t = { ctx : [ `Ssl_not_available ] option ; hostname : string option }
-+  end
-+
-+  type t = { client : Client.t option }
-+end
-+
- module Client : sig
-   val default_ctx : [`Ssl_not_available]
- 
-diff --git a/lwt-unix/conduit_lwt_unix_ssl_real.ml b/lwt-unix/conduit_lwt_unix_ssl_real.ml
-index 9aca9bb..330bd03 100644
---- a/lwt-unix/conduit_lwt_unix_ssl_real.ml
-+++ b/lwt-unix/conduit_lwt_unix_ssl_real.ml
-@@ -27,6 +27,14 @@ let chans_of_fd sock =
-   let ic = Lwt_io.make ~mode:Lwt_io.input ~close (Lwt_ssl.read_bytes sock) in
-   ((Lwt_ssl.get_fd sock), ic, oc)
- 
-+module Overrides = struct
-+  module Client = struct
-+    type t = { ctx : Ssl.context option; hostname : string option }
-+  end
-+
-+  type t = { client : Client.t option }
-+end
-+
- module Client = struct
-   let create_ctx ?certfile ?keyfile ?password () =
-     let ctx = Ssl.create_context Ssl.SSLv23 Ssl.Client_context in
-diff --git a/lwt-unix/conduit_lwt_unix_ssl_real.mli b/lwt-unix/conduit_lwt_unix_ssl_real.mli
-index 018bc65..64356ea 100644
---- a/lwt-unix/conduit_lwt_unix_ssl_real.mli
-+++ b/lwt-unix/conduit_lwt_unix_ssl_real.mli
-@@ -17,6 +17,14 @@
- 
- (** TLS/SSL connections via {{:http://www.openssl.org}OpenSSL} C bindings *)
- 
-+module Overrides : sig
-+  module Client : sig
-+    type t = { ctx : Ssl.context option; hostname : string option }
-+  end
-+
-+  type t = { client : Client.t option }
-+end
-+
- module Client : sig
-   val default_ctx : Ssl.context
- 
--- 
-2.25.1
-
diff --git a/packages/upstream/conduit-lwt.2.2.2-1/opam b/packages/upstream/conduit-lwt.6.1.0/opam
similarity index 54%
rename from packages/upstream/conduit-lwt.2.2.2-1/opam
rename to packages/upstream/conduit-lwt.6.1.0/opam
index 92381b5fa..21e5e5ab7 100644
--- a/packages/upstream/conduit-lwt.2.2.2-1/opam
+++ b/packages/upstream/conduit-lwt.6.1.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "conduit-lwt"
-version: "2.2.2-1"
+version: "6.1.0"
 synopsis: "A portable network connection establishment library using Lwt"
 maintainer: "anil@recoil.org"
 authors: [
@@ -11,29 +11,25 @@ tags: "org:mirage"
 homepage: "https://github.com/mirage/ocaml-conduit"
 bug-reports: "https://github.com/mirage/ocaml-conduit/issues"
 depends: [
-  "ocaml" {>= "4.03.0"}
-  "dune"
+  "ocaml" {>= "4.08.0"}
+  "dune" {>= "2.0"}
   "base-unix"
-  "ppx_sexp_conv" {>= "v0.12.0"}
+  "ppx_sexp_conv" {>= "v0.13.0"}
   "sexplib"
   "conduit" {= version}
   "lwt" {>= "3.0.0"}
 ]
 build: [
-  ["dune" "subst"] {pinned}
+  ["dune" "subst"] {dev}
   ["dune" "build" "-p" name "-j" jobs]
 ]
-patches: "0001-backport-Add-openssl_overrides-to-conduit-context.patch"
 dev-repo: "git+https://github.com/mirage/ocaml-conduit.git"
-extra-files: [
-  "0001-backport-Add-openssl_overrides-to-conduit-context.patch"
-  "md5=c131b837c73db9cd31687fbbdf7e027f"
-]
 url {
   src:
-    "https://github.com/mirage/ocaml-conduit/releases/download/v2.2.2/conduit-v2.2.2.tbz"
+    "https://github.com/mirage/ocaml-conduit/releases/download/v6.1.0/conduit-6.1.0.tbz"
   checksum: [
-    "sha256=a57cc1843aa7eaaa183a5d08d98a13e78c848b37aabb7b55ee88257c051f68fd"
-    "sha512=c2ca50cdae36f6b9cef4053844a4b719e4e065997a2dc6e1858f8c0bc3ce03d5728d10308368f1968154d217dfc84038cd1de007b1168e7adf476dc57af3f513"
+    "sha256=a2e29088630bbef92c1a902192a09548ab4a6b3f75a7eee6722426eca1efc05f"
+    "sha512=308041a9cccf5b01827365ae9e75915bf33c812658ff1a802b275827f4c9af98dd991df9106a5b8d70374cc0d41398621bbafd8de829acfef4cb86e6b9523712"
   ]
 }
+x-commit-hash: "dc7af98ec25c71dd7e4ea78223e330b2596ec3f1"
diff --git a/packages/upstream/conduit.2.2.2-1/files/0001-backport-Add-openssl_overrides-to-conduit-context.patch b/packages/upstream/conduit.2.2.2-1/files/0001-backport-Add-openssl_overrides-to-conduit-context.patch
deleted file mode 100644
index e04eb38f8..000000000
--- a/packages/upstream/conduit.2.2.2-1/files/0001-backport-Add-openssl_overrides-to-conduit-context.patch
+++ /dev/null
@@ -1,202 +0,0 @@
-From 3e42fef361a8be61528e3e2bc6da076193691afb Mon Sep 17 00:00:00 2001
-Message-Id: <3e42fef361a8be61528e3e2bc6da076193691afb.1642785804.git.edvin.torok@citrix.com>
-From: Ben Anson <ben.anson@citrix.com>
-Date: Mon, 26 Apr 2021 15:13:41 +0100
-Subject: [PATCH] Add openssl_overrides to conduit context
-
-This patch really belongs in cohttp, but I don't think conduit
-exposes all the right machinery.
-
-This patch allows openssl cohttp-lwt-unix users to:
-(a) connect to a particular hostname/IP, but specify something else to
-    verify against
-(b) have direct control over the lifetime of their client's ssl context
-
-I believe you should be able to achieve (a) using the following
-resolver (but it results in 'not supported' errors):
-
-```
-let resolver =
-  let table = Hashtbl.create 16 in
-  let cn = "expected-cn" in
-  let Ok ip = Ipaddr.of_string cn in
-  Hashtbl.add table cn (`TLS (cn, `TCP (ip, port)));
-  Resolver_lwt_unix.static table
-```
-
-It's not possible to achieve (b) right now (at least in v2).
-
-(b) is useful if your trusted bundle changes (calling
-`load_verify_locations` with the same SSL context does not work as
-one might expect). The alternative is to restart your application.
-
-Intended usage with cohttp:
-
-```
-let ctx : Ssl.context = ... in
-let openssl_overrides =
-  let open Conduit_lwt_unix_ssl.Overrides in
-  {
-    client =
-      Some Client.{ ctx = Some ctx; hostname = Some cn };
-  }
-in
-let* (ctx : Conduit_lwt_unix.ctx) = Conduit_lwt_unix.init ~openssl_overrides () in
-let ctx : Cohttp_lwt_unix.Client.ctx = Cohttp_lwt_unix.Client.custom_ctx ~ctx () in
-let* _resp, resp_body = Client.call ~ctx `POST ~body uri in
-...
-```
----
- lwt-unix/conduit_lwt_unix.ml            | 20 +++++++++++++++-----
- lwt-unix/conduit_lwt_unix.mli           |  1 +
- lwt-unix/conduit_lwt_unix_ssl_dummy.ml  |  8 ++++++++
- lwt-unix/conduit_lwt_unix_ssl_dummy.mli |  8 ++++++++
- lwt-unix/conduit_lwt_unix_ssl_real.ml   |  8 ++++++++
- lwt-unix/conduit_lwt_unix_ssl_real.mli  |  8 ++++++++
- 6 files changed, 48 insertions(+), 5 deletions(-)
-
-diff --git a/lwt-unix/conduit_lwt_unix.ml b/lwt-unix/conduit_lwt_unix.ml
-index 8dade88..9c51564 100644
---- a/lwt-unix/conduit_lwt_unix.ml
-+++ b/lwt-unix/conduit_lwt_unix.ml
-@@ -110,6 +110,7 @@ type tls_server_key = tls_own_key [@@deriving sexp]
- type ctx = {
-   src: Unix.sockaddr option;
-   tls_own_key: tls_own_key;
-+  openssl_overrides : Conduit_lwt_unix_ssl.Overrides.t option;
- }
- 
- let string_of_unix_sockaddr sa =
-@@ -155,19 +156,19 @@ let flow_of_fd fd sa =
-   | Unix.ADDR_INET (ip,port) -> TCP { fd; ip=Ipaddr_unix.of_inet_addr ip; port }
- 
- let default_ctx =
--  { src=None; tls_own_key=`None }
-+  { src=None; tls_own_key=`None; openssl_overrides=None; }
- 
--let init ?src ?(tls_own_key=`None) ?(tls_server_key=`None) () =
-+let init ?src ?(tls_own_key=`None) ?(tls_server_key=`None) ?openssl_overrides () =
-   let tls_own_key =
-     match tls_own_key with `None -> tls_server_key | _ -> tls_own_key in
-   match src with
-   | None ->
--    Lwt.return { src=None; tls_own_key }
-+    Lwt.return { src=None; tls_own_key; openssl_overrides; }
-   | Some host ->
-     let open Unix in
-     Lwt_unix.getaddrinfo host "0" [AI_PASSIVE; AI_SOCKTYPE SOCK_STREAM]
-     >>= function
--    | {ai_addr;_}::_ -> Lwt.return { src=Some ai_addr; tls_own_key }
-+    | {ai_addr;_}::_ -> Lwt.return { src=Some ai_addr; tls_own_key; openssl_overrides; }
-     | [] -> Lwt.fail_with "Invalid conduit source address specified"
- 
- module Sockaddr_io = struct
-@@ -270,7 +271,16 @@ let connect_with_openssl ~ctx (`Hostname hostname, `IP ip, `Port port) =
-         in
-         Some ctx_ssl
-   in
--  Conduit_lwt_unix_ssl.Client.connect ?ctx:ctx_ssl ?src:ctx.src ~hostname sa
-+  let hostname, ctx_ssl =
-+    match ctx.openssl_overrides with
-+    | None | Some { client = None } -> (Some hostname, ctx_ssl)
-+    | Some { client = Some overrides } ->
-+        let ctx_ssl =
-+          match overrides.ctx with Some x -> Some x | None -> ctx_ssl
-+        in
-+        (overrides.hostname, ctx_ssl)
-+  in
-+  Conduit_lwt_unix_ssl.Client.connect ?ctx:ctx_ssl ?src:ctx.src ?hostname sa
-   >>= fun (fd, ic, oc) ->
-   let flow = TCP {fd;ip;port} in
-   Lwt.return (flow, ic, oc)
-diff --git a/lwt-unix/conduit_lwt_unix.mli b/lwt-unix/conduit_lwt_unix.mli
-index e5db5d0..37ad751 100644
---- a/lwt-unix/conduit_lwt_unix.mli
-+++ b/lwt-unix/conduit_lwt_unix.mli
-@@ -166,6 +166,7 @@ val init :
-   ?src:string ->
-   ?tls_own_key:tls_own_key ->
-   ?tls_server_key:tls_own_key (* Deprecated, use tls_own_key. *) ->
-+  ?openssl_overrides:Conduit_lwt_unix_ssl.Overrides.t ->
-   unit -> ctx io
- 
- (** [connect ~ctx client] establishes an outgoing connection
-diff --git a/lwt-unix/conduit_lwt_unix_ssl_dummy.ml b/lwt-unix/conduit_lwt_unix_ssl_dummy.ml
-index b11f8d2..6e7d57d 100644
---- a/lwt-unix/conduit_lwt_unix_ssl_dummy.ml
-+++ b/lwt-unix/conduit_lwt_unix_ssl_dummy.ml
-@@ -15,6 +15,14 @@
-  *
-  *)
- 
-+module Overrides = struct
-+  module Client = struct
-+    type t = { ctx : [ `Ssl_not_available ] option ; hostname : string option }
-+  end
-+
-+  type t = { client : Client.t option }
-+end
-+
- module Client = struct
-   let default_ctx = `Ssl_not_available
- 
-diff --git a/lwt-unix/conduit_lwt_unix_ssl_dummy.mli b/lwt-unix/conduit_lwt_unix_ssl_dummy.mli
-index 24b73b0..cf25544 100644
---- a/lwt-unix/conduit_lwt_unix_ssl_dummy.mli
-+++ b/lwt-unix/conduit_lwt_unix_ssl_dummy.mli
-@@ -17,6 +17,14 @@
- 
- (** TLS/SSL connections via {{:http://www.openssl.org}OpenSSL} C bindings *)
- 
-+module Overrides : sig
-+  module Client : sig
-+    type t = { ctx : [ `Ssl_not_available ] option ; hostname : string option }
-+  end
-+
-+  type t = { client : Client.t option }
-+end
-+
- module Client : sig
-   val default_ctx : [`Ssl_not_available]
- 
-diff --git a/lwt-unix/conduit_lwt_unix_ssl_real.ml b/lwt-unix/conduit_lwt_unix_ssl_real.ml
-index 9aca9bb..330bd03 100644
---- a/lwt-unix/conduit_lwt_unix_ssl_real.ml
-+++ b/lwt-unix/conduit_lwt_unix_ssl_real.ml
-@@ -27,6 +27,14 @@ let chans_of_fd sock =
-   let ic = Lwt_io.make ~mode:Lwt_io.input ~close (Lwt_ssl.read_bytes sock) in
-   ((Lwt_ssl.get_fd sock), ic, oc)
- 
-+module Overrides = struct
-+  module Client = struct
-+    type t = { ctx : Ssl.context option; hostname : string option }
-+  end
-+
-+  type t = { client : Client.t option }
-+end
-+
- module Client = struct
-   let create_ctx ?certfile ?keyfile ?password () =
-     let ctx = Ssl.create_context Ssl.SSLv23 Ssl.Client_context in
-diff --git a/lwt-unix/conduit_lwt_unix_ssl_real.mli b/lwt-unix/conduit_lwt_unix_ssl_real.mli
-index 018bc65..64356ea 100644
---- a/lwt-unix/conduit_lwt_unix_ssl_real.mli
-+++ b/lwt-unix/conduit_lwt_unix_ssl_real.mli
-@@ -17,6 +17,14 @@
- 
- (** TLS/SSL connections via {{:http://www.openssl.org}OpenSSL} C bindings *)
- 
-+module Overrides : sig
-+  module Client : sig
-+    type t = { ctx : Ssl.context option; hostname : string option }
-+  end
-+
-+  type t = { client : Client.t option }
-+end
-+
- module Client : sig
-   val default_ctx : Ssl.context
- 
--- 
-2.25.1
-
diff --git a/packages/upstream/conduit.2.2.2-1/opam b/packages/upstream/conduit.6.1.0/opam
similarity index 74%
rename from packages/upstream/conduit.2.2.2-1/opam
rename to packages/upstream/conduit.6.1.0/opam
index 69fc003e5..f130c23f3 100644
--- a/packages/upstream/conduit.2.2.2-1/opam
+++ b/packages/upstream/conduit.6.1.0/opam
@@ -1,9 +1,9 @@
 opam-version: "2.0"
 name: "conduit"
-version: "2.2.2-1"
+version: "6.1.0"
 synopsis: "A network connection establishment library"
 description: """\
-The `conduit` library takes care of establishing and listening for 
+The `conduit` library takes care of establishing and listening for
 TCP and SSL/TLS connections for the Lwt and Async libraries.
 
 The reason this library exists is to provide a degree of abstraction
@@ -32,9 +32,9 @@ homepage: "https://github.com/mirage/ocaml-conduit"
 doc: "https://mirage.github.io/ocaml-conduit/"
 bug-reports: "https://github.com/mirage/ocaml-conduit/issues"
 depends: [
-  "ocaml" {>= "4.03.0"}
-  "dune"
-  "ppx_sexp_conv" {>= "v0.12.0"}
+  "ocaml" {>= "4.08.0"}
+  "dune" {>= "2.0"}
+  "ppx_sexp_conv" {>= "v0.13.0"}
   "sexplib"
   "astring"
   "uri"
@@ -43,20 +43,16 @@ depends: [
   "ipaddr-sexp"
 ]
 build: [
-  ["dune" "subst"] {pinned}
+  ["dune" "subst"] {dev}
   ["dune" "build" "-p" name "-j" jobs]
 ]
-patches: "0001-backport-Add-openssl_overrides-to-conduit-context.patch"
 dev-repo: "git+https://github.com/mirage/ocaml-conduit.git"
-extra-files: [
-  "0001-backport-Add-openssl_overrides-to-conduit-context.patch"
-  "md5=c131b837c73db9cd31687fbbdf7e027f"
-]
 url {
   src:
-    "https://github.com/mirage/ocaml-conduit/releases/download/v2.2.2/conduit-v2.2.2.tbz"
+    "https://github.com/mirage/ocaml-conduit/releases/download/v6.1.0/conduit-6.1.0.tbz"
   checksum: [
-    "sha256=a57cc1843aa7eaaa183a5d08d98a13e78c848b37aabb7b55ee88257c051f68fd"
-    "sha512=c2ca50cdae36f6b9cef4053844a4b719e4e065997a2dc6e1858f8c0bc3ce03d5728d10308368f1968154d217dfc84038cd1de007b1168e7adf476dc57af3f513"
+    "sha256=a2e29088630bbef92c1a902192a09548ab4a6b3f75a7eee6722426eca1efc05f"
+    "sha512=308041a9cccf5b01827365ae9e75915bf33c812658ff1a802b275827f4c9af98dd991df9106a5b8d70374cc0d41398621bbafd8de829acfef4cb86e6b9523712"
   ]
 }
+x-commit-hash: "dc7af98ec25c71dd7e4ea78223e330b2596ec3f1"
diff --git a/packages/upstream/conf-gmp.3/files/test.c b/packages/upstream/conf-gmp.4/files/test.c
similarity index 100%
rename from packages/upstream/conf-gmp.3/files/test.c
rename to packages/upstream/conf-gmp.4/files/test.c
diff --git a/packages/upstream/conf-gmp.3/opam b/packages/upstream/conf-gmp.4/opam
similarity index 74%
rename from packages/upstream/conf-gmp.3/opam
rename to packages/upstream/conf-gmp.4/opam
index f0d9e5041..926239627 100644
--- a/packages/upstream/conf-gmp.3/opam
+++ b/packages/upstream/conf-gmp.4/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "conf-gmp"
-version: "3"
+version: "4"
 synopsis: "Virtual package relying on a GMP lib system installation"
 description:
   "This package can only install if the GMP lib is installed on the system."
@@ -11,7 +11,13 @@ homepage: "http://gmplib.org/"
 bug-reports: "https://github.com/ocaml/opam-repository/issues"
 flags: conf
 build: [
-  ["sh" "-exc" "cc -c $CFLAGS -I/usr/local/include test.c"] {os != "macos"}
+  ["sh" "-exc" "cc -c $CFLAGS -I/usr/local/include test.c"]
+    {os != "macos" & os != "win32"}
+  [
+    "sh"
+    "-exc"
+    "$(ocamlc -config-var c_compiler) -c $CFLAGS -I/usr/local/include test.c"
+  ] {os = "win32" & os-distribution = "cygwinports"}
   [
     "sh"
     "-exc"
@@ -30,5 +36,7 @@ depexts: [
   ["gmp"] {os = "freebsd"}
   ["gmp-dev"] {os-distribution = "alpine"}
   ["gmp-devel"] {os-family = "suse"}
+  ["gmp"] {os = "win32" & os-distribution = "cygwinports"}
+  ["gmp"] {os-distribution = "nixos"}
 ]
 extra-files: ["test.c" "md5=2fd2970c293c36222a6d299ec155823f"]
diff --git a/packages/upstream/conf-libev.4-12/opam b/packages/upstream/conf-libev.4-12/opam
index f0cfd026b..2f1b19989 100644
--- a/packages/upstream/conf-libev.4-12/opam
+++ b/packages/upstream/conf-libev.4-12/opam
@@ -18,9 +18,10 @@ flags: conf
 build: ["sh" "./build.sh"]
 depexts: [
   ["libev-dev"] {os-family = "debian"}
+  ["libev-dev"] {os-family = "ubuntu"}
   ["libev"] {os = "macos" & os-distribution = "homebrew"}
-  ["libev-dev"] {os-distribution = "alpine"}
-  ["libev"] {os-distribution = "arch"}
+  ["libev-dev"] {os-family = "alpine"}
+  ["libev"] {os-family = "arch"}
   ["libev-devel"] {os-distribution = "fedora"}
   ["libev-devel"] {os-distribution = "rhel"}
   ["libev-devel"] {os-distribution = "centos"}
@@ -28,7 +29,7 @@ depexts: [
   ["libev-devel"] {os-family = "suse"}
   ["libev"] {os = "freebsd"}
   ["libev"] {os = "openbsd"}
-  ["libev"] {os-distribution = "arch"}
+  ["libev"] {os-distribution = "nixos"}
 ]
 extra-files: [
   ["discover.ml" "md5=a734be402679b0ccf7c8aa60fc18bf9a"]
diff --git a/packages/upstream/conf-libffi.2.0.0/opam b/packages/upstream/conf-libffi.2.0.0/opam
index 95bfa552b..edbb9f275 100644
--- a/packages/upstream/conf-libffi.2.0.0/opam
+++ b/packages/upstream/conf-libffi.2.0.0/opam
@@ -26,4 +26,5 @@ depexts: [
   ["libffi-devel"] {os-family = "suse"}
   ["libffi"] {os = "freebsd"}
   ["libffi"] {os = "win32" & os-distribution = "cygwinports"}
+  ["libffi"] {os-distribution = "nixos"}
 ]
diff --git a/packages/upstream/conf-libssl.3/files/homebrew.sh b/packages/upstream/conf-libssl.3/files/homebrew.sh
deleted file mode 100644
index 7352f4494..000000000
--- a/packages/upstream/conf-libssl.3/files/homebrew.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh -ex
-
-# check the openssl installation
-# and symlink the homebrew pkg-config files for openssl to the opam local pkgconfig directory
-
-brew_pkg_config=$(brew --prefix openssl)/lib/pkgconfig
-
-case "$1" in
-check)
-  if test "$#" != 1; then
-    echo "Usage: $0 check"
-    exit 1
-  fi
-  export PKG_CONFIG_PATH=$brew_pkg_config:$PKG_CONFIG_PATH
-  pkg-config --print-errors --exists openssl;;
-install)
-  if test "$#" != 2; then
-    echo "Usage: $0 install <libdir>"
-    exit 1
-  fi
-  cd "$brew_pkg_config"
-  for file in $(ls *.pc); do
-    if test -f "$file"; then
-      ln -s "$brew_pkg_config/$file" "$2/pkgconfig/$file"
-    fi
-  done;;
-*)
-  echo "Usage: $0 <check|install>"
-  exit 1;;
-esac
diff --git a/packages/upstream/conf-libssl.4/files/homebrew.sh b/packages/upstream/conf-libssl.4/files/homebrew.sh
new file mode 100644
index 000000000..9b46ab5ff
--- /dev/null
+++ b/packages/upstream/conf-libssl.4/files/homebrew.sh
@@ -0,0 +1,34 @@
+#!/bin/sh -ex
+
+# check the openssl installation
+# and symlink the homebrew pkg-config files for openssl to the opam local pkgconfig directory
+
+brew_pkg_config=$(brew --prefix openssl)/lib/pkgconfig
+
+case "$1" in
+  check)
+    if test "$#" != 1; then
+      echo "Usage: $0 check"
+      exit 1
+    fi
+    export PKG_CONFIG_PATH="$brew_pkg_config:$PKG_CONFIG_PATH"
+    pkg-config --print-errors --exists openssl
+    ;;
+  install)
+    if test "$#" != 2; then
+      echo "Usage: $0 install <libdir>"
+      exit 1
+    fi
+    for fpath in "$brew_pkg_config"/*.pc; do
+      test -e "$fpath" || break
+      fname=$(basename "$fpath")
+      tdir="$2/pkgconfig"
+      mkdir -p "$tdir"
+      ln -s "$fpath" "$tdir/$fname"
+    done
+    ;;
+  *)
+    echo "Usage: $0 <check|install>"
+    exit 1
+    ;;
+esac
diff --git a/packages/upstream/conf-libssl.3/opam b/packages/upstream/conf-libssl.4/opam
similarity index 94%
rename from packages/upstream/conf-libssl.3/opam
rename to packages/upstream/conf-libssl.4/opam
index 4493fa1a9..c2df45bb7 100644
--- a/packages/upstream/conf-libssl.3/opam
+++ b/packages/upstream/conf-libssl.4/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "conf-libssl"
-version: "3"
+version: "4"
 synopsis: "Virtual package relying on an OpenSSL library system installation"
 description:
   "This package can only install if the OpenSSL library is installed on the system."
@@ -35,4 +35,4 @@ depexts: [
   ["openssl"] {os-distribution = "nixos"}
   ["openssl"] {os = "win32" & os-distribution = "cygwinports"}
 ]
-extra-files: ["homebrew.sh" "md5=a524c7b9cb12a5be63c7d5933ccd1c43"]
+extra-files: ["homebrew.sh" "md5=f5db8e7d51e159bc85f0d44cc13f9dbd"]
diff --git a/packages/upstream/conf-python-2-7.1.2/opam b/packages/upstream/conf-python-2-7.1.2/opam
index 23cffbac2..63127d5e6 100644
--- a/packages/upstream/conf-python-2-7.1.2/opam
+++ b/packages/upstream/conf-python-2-7.1.2/opam
@@ -14,12 +14,13 @@ flags: conf
 build: ["python2.7" "test.py"]
 depexts: [
   ["python2.7"] {os-family = "debian"}
+  ["python2.7"] {os-family = "ubuntu"}
   ["python27"] {os-distribution = "nixos"}
   ["python2"] {os-distribution = "alpine"}
   ["python2"] {os-distribution = "centos"}
   ["python2"] {os-distribution = "ol"}
   ["python2.7"] {os-distribution = "fedora"}
-  ["python2"] {os-distribution = "arch"}
+  ["python2"] {os-family = "arch"}
   ["python"] {os-family = "suse"}
   ["dev-lang/python:2.7"] {os-distribution = "gentoo"}
   ["python/2.7"] {os = "openbsd"}
diff --git a/packages/upstream/core.v0.14.1/opam b/packages/upstream/core.v0.14.1/opam
deleted file mode 100644
index 01c3f55b1..000000000
--- a/packages/upstream/core.v0.14.1/opam
+++ /dev/null
@@ -1,32 +0,0 @@
-opam-version: "2.0"
-name: "core"
-version: "v0.14.1"
-synopsis: "Industrial strength alternative to OCaml's standard library"
-description: """\
-The Core suite of libraries is an industrial strength alternative to
-OCaml's standard library that was developed by Jane Street, the
-largest industrial user of OCaml."""
-maintainer: "Jane Street developers"
-authors: "Jane Street Group, LLC"
-license: "MIT"
-homepage: "https://github.com/janestreet/core"
-doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/core/index.html"
-bug-reports: "https://github.com/janestreet/core/issues"
-depends: [
-  "ocaml" {>= "4.08.0"}
-  "core_kernel" {>= "v0.14" & < "v0.15"}
-  "jst-config" {>= "v0.14" & < "v0.15"}
-  "ppx_jane" {>= "v0.14" & < "v0.15"}
-  "sexplib" {>= "v0.14" & < "v0.15"}
-  "timezone" {>= "v0.14" & < "v0.15"}
-  "base-threads"
-  "dune" {>= "2.0.0"}
-  "spawn" {>= "v0.12"}
-]
-build: ["dune" "build" "-p" name "-j" jobs]
-depexts: ["linux-headers"] {os-distribution = "alpine"}
-dev-repo: "git+https://github.com/janestreet/core.git"
-url {
-  src: "https://github.com/janestreet/core/archive/v0.14.1.tar.gz"
-  checksum: "md5=b11f58205953d84cedb0003efcdab231"
-}
diff --git a/packages/upstream/core.v0.15.1/opam b/packages/upstream/core.v0.15.1/opam
new file mode 100644
index 000000000..d97371fa0
--- /dev/null
+++ b/packages/upstream/core.v0.15.1/opam
@@ -0,0 +1,47 @@
+opam-version: "2.0"
+name: "core"
+version: "v0.15.1"
+synopsis: "Industrial strength alternative to OCaml's standard library"
+description: """\
+The Core suite of libraries is an industrial strength alternative to
+OCaml's standard library that was developed by Jane Street, the
+largest industrial user of OCaml.
+
+This is the system-independent part of Core. Unix-specific parts were moved to [core-unix]."""
+maintainer: "Jane Street developers"
+authors: "Jane Street Group, LLC"
+license: "MIT"
+homepage: "https://github.com/janestreet/core"
+doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/core/index.html"
+bug-reports: "https://github.com/janestreet/core/issues"
+depends: [
+  "ocaml" {>= "4.11.0"}
+  "base" {>= "v0.15.1" & < "v0.16"}
+  "base_bigstring" {>= "v0.15" & < "v0.16"}
+  "base_quickcheck" {>= "v0.15" & < "v0.16"}
+  "bin_prot" {>= "v0.15" & < "v0.16"}
+  "fieldslib" {>= "v0.15" & < "v0.16"}
+  "jane-street-headers" {>= "v0.15" & < "v0.16"}
+  "jst-config" {>= "v0.15" & < "v0.16"}
+  "ppx_assert" {>= "v0.15" & < "v0.16"}
+  "ppx_base" {>= "v0.15" & < "v0.16"}
+  "ppx_hash" {>= "v0.15" & < "v0.16"}
+  "ppx_inline_test" {>= "v0.15" & < "v0.16"}
+  "ppx_jane" {>= "v0.15" & < "v0.16"}
+  "ppx_sexp_conv" {>= "v0.15" & < "v0.16"}
+  "ppx_sexp_message" {>= "v0.15" & < "v0.16"}
+  "sexplib" {>= "v0.15" & < "v0.16"}
+  "splittable_random" {>= "v0.15" & < "v0.16"}
+  "stdio" {>= "v0.15" & < "v0.16"}
+  "time_now" {>= "v0.15" & < "v0.16"}
+  "typerep" {>= "v0.15" & < "v0.16"}
+  "variantslib" {>= "v0.15" & < "v0.16"}
+  "dune" {>= "2.0.0"}
+]
+build: ["dune" "build" "-p" name "-j" jobs]
+dev-repo: "git+https://github.com/janestreet/core.git"
+url {
+  src: "https://github.com/janestreet/core/archive/refs/tags/v0.15.1.tar.gz"
+  checksum:
+    "sha256=6f7bbdda1d97f2f542a45331f062127dd5264d6ed73ece7b2c6b330785dfc991"
+}
diff --git a/packages/upstream/core_kernel.v0.14.2/opam b/packages/upstream/core_kernel.v0.14.2/opam
deleted file mode 100644
index 04a591e02..000000000
--- a/packages/upstream/core_kernel.v0.14.2/opam
+++ /dev/null
@@ -1,48 +0,0 @@
-opam-version: "2.0"
-name: "core_kernel"
-version: "v0.14.2"
-synopsis: "Industrial strength alternative to OCaml's standard library"
-description: """\
-The Core suite of libraries is an industrial strength alternative to
-OCaml's standard library that was developed by Jane Street, the
-largest industrial user of OCaml.
-
-Core_kernel is the system-independent part of Core."""
-maintainer: "Jane Street developers"
-authors: "Jane Street Group, LLC"
-license: "MIT"
-homepage: "https://github.com/janestreet/core_kernel"
-doc:
-  "https://ocaml.janestreet.com/ocaml-core/latest/doc/core_kernel/index.html"
-bug-reports: "https://github.com/janestreet/core_kernel/issues"
-depends: [
-  "ocaml" {>= "4.08"}
-  "base" {>= "v0.14" & < "v0.15"}
-  "base_bigstring" {>= "v0.14" & < "v0.15"}
-  "base_quickcheck" {>= "v0.14" & < "v0.15"}
-  "bin_prot" {>= "v0.14" & < "v0.15"}
-  "fieldslib" {>= "v0.14" & < "v0.15"}
-  "jane-street-headers" {>= "v0.14" & < "v0.15"}
-  "jst-config" {>= "v0.14" & < "v0.15"}
-  "ppx_assert" {>= "v0.14" & < "v0.15"}
-  "ppx_base" {>= "v0.14" & < "v0.15"}
-  "ppx_hash" {>= "v0.14" & < "v0.15"}
-  "ppx_inline_test" {>= "v0.14" & < "v0.15"}
-  "ppx_jane" {>= "v0.14" & < "v0.15"}
-  "ppx_sexp_conv" {>= "v0.14" & < "v0.15"}
-  "ppx_sexp_message" {>= "v0.14" & < "v0.15"}
-  "sexplib" {>= "v0.14" & < "v0.15"}
-  "splittable_random" {>= "v0.14" & < "v0.15"}
-  "stdio" {>= "v0.14" & < "v0.15"}
-  "time_now" {>= "v0.14" & < "v0.15"}
-  "typerep" {>= "v0.14" & < "v0.15"}
-  "variantslib" {>= "v0.14" & < "v0.15"}
-  "ppx_optcomp" {>= "v0.14.3" & < "v0.15"}
-  "dune" {>= "2.0.0"}
-]
-build: ["dune" "build" "-p" name "-j" jobs]
-dev-repo: "git+https://github.com/janestreet/core_kernel.git"
-url {
-  src: "https://github.com/janestreet/core_kernel/archive/v0.14.2.tar.gz"
-  checksum: "md5=ede2f6d22eaa8320f88bac67d41b5cff"
-}
diff --git a/packages/upstream/core_kernel.v0.15.0/opam b/packages/upstream/core_kernel.v0.15.0/opam
new file mode 100644
index 000000000..889935ddc
--- /dev/null
+++ b/packages/upstream/core_kernel.v0.15.0/opam
@@ -0,0 +1,34 @@
+opam-version: "2.0"
+name: "core_kernel"
+version: "v0.15.0"
+synopsis: "Industrial strength alternative to OCaml's standard library"
+description: """\
+The Core suite of libraries is an industrial strength alternative to
+OCaml's standard library that was developed by Jane Street, the
+largest industrial user of OCaml.
+
+Core_kernel is the system-independent part of Core."""
+maintainer: "Jane Street developers"
+authors: "Jane Street Group, LLC"
+license: "MIT"
+homepage: "https://github.com/janestreet/core_kernel"
+doc:
+  "https://ocaml.janestreet.com/ocaml-core/latest/doc/core_kernel/index.html"
+bug-reports: "https://github.com/janestreet/core_kernel/issues"
+depends: [
+  "ocaml" {>= "4.11.0"}
+  "base" {>= "v0.15" & < "v0.16"}
+  "core" {>= "v0.15" & < "v0.16"}
+  "int_repr" {>= "v0.15" & < "v0.16"}
+  "ppx_jane" {>= "v0.15" & < "v0.16"}
+  "base-threads"
+  "dune" {>= "2.0.0"}
+]
+build: ["dune" "build" "-p" name "-j" jobs]
+dev-repo: "git+https://github.com/janestreet/core_kernel.git"
+url {
+  src:
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/core_kernel-v0.15.0.tar.gz"
+  checksum:
+    "sha256=34a0288f16027c6b90e4ad16cb5cc677d7063d310faf918748ce70f1745116c0"
+}
diff --git a/packages/upstream/core_unix.v0.15.2/opam b/packages/upstream/core_unix.v0.15.2/opam
new file mode 100644
index 000000000..143b4d09e
--- /dev/null
+++ b/packages/upstream/core_unix.v0.15.2/opam
@@ -0,0 +1,37 @@
+opam-version: "2.0"
+name: "core_unix"
+version: "v0.15.2"
+synopsis: "Unix-specific portions of Core"
+description:
+  "Unix-specific extensions to some of the modules defined in [core] and [core_kernel]."
+maintainer: "Jane Street developers"
+authors: "Jane Street Group, LLC"
+license: "MIT"
+homepage: "https://github.com/janestreet/core_unix"
+doc:
+  "https://ocaml.janestreet.com/ocaml-core/latest/doc/core_unix/index.html"
+bug-reports: "https://github.com/janestreet/core_unix/issues"
+depends: [
+  "ocaml" {>= "4.08.0"}
+  "core" {>= "v0.15" & < "v0.16"}
+  "core_kernel" {>= "v0.15" & < "v0.16"}
+  "expect_test_helpers_core" {>= "v0.15" & < "v0.16"}
+  "jane-street-headers" {>= "v0.15" & < "v0.16"}
+  "jst-config" {>= "v0.15" & < "v0.16"}
+  "ocaml_intrinsics" {>= "v0.15" & < "v0.16"}
+  "ppx_jane" {>= "v0.15" & < "v0.16"}
+  "sexplib" {>= "v0.15" & < "v0.16"}
+  "timezone" {>= "v0.15" & < "v0.16"}
+  "base-threads"
+  "dune" {>= "2.0.0"}
+  "spawn" {>= "v0.15"}
+]
+build: ["dune" "build" "-p" name "-j" jobs]
+depexts: ["linux-headers"] {os-family = "alpine"}
+dev-repo: "git+https://github.com/janestreet/core_unix.git"
+url {
+  src:
+    "https://github.com/janestreet/core_unix/archive/refs/tags/v0.15.2.tar.gz"
+  checksum:
+    "sha256=486d0e954603960fa081b3fd23e3cc3e50ac0892544acd35f9c2919c4bf5f67b"
+}
diff --git a/packages/upstream/cppo.1.6.8/opam b/packages/upstream/cppo.1.6.9/opam
similarity index 63%
rename from packages/upstream/cppo.1.6.8/opam
rename to packages/upstream/cppo.1.6.9/opam
index b3f9edd14..82daa09bc 100644
--- a/packages/upstream/cppo.1.6.8/opam
+++ b/packages/upstream/cppo.1.6.9/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "cppo"
-version: "1.6.8"
+version: "1.6.9"
 synopsis: "Code preprocessor like cpp for OCaml"
 description: """\
 Cppo is an equivalent of the C preprocessor for OCaml programs.
@@ -12,27 +12,30 @@ Cppo is:
 * easy to learn without consulting a manual
 * reasonably fast
 * simple to install and to maintain"""
-maintainer: "martin@mjambon.com"
+maintainer: [
+  "Martin Jambon <martin@mjambon.com>" "Yishuai Li <yishuai@upenn.edu>"
+]
 authors: "Martin Jambon"
 license: "BSD-3-Clause"
 homepage: "https://github.com/ocaml-community/cppo"
-doc: "https://ocaml-community.github.io/cppo/"
+doc: "https://ocaml-community.github.io/cppo"
 bug-reports: "https://github.com/ocaml-community/cppo/issues"
 depends: [
   "ocaml" {>= "4.02.3"}
-  "dune" {>= "1.0"}
+  "dune" {>= "1.10"}
   "base-unix"
 ]
 build: [
   ["dune" "subst"] {dev}
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+  ["dune" "build" "-p" name "@doc"] {with-doc}
 ]
 dev-repo: "git+https://github.com/ocaml-community/cppo.git"
 url {
-  src: "https://github.com/ocaml-community/cppo/archive/v1.6.8.tar.gz"
+  src: "https://github.com/ocaml-community/cppo/archive/v1.6.9.tar.gz"
   checksum: [
-    "md5=fed401197d86f9089e89f6cbdf1d660d"
-    "sha512=069bbe0ef09c03b0dc4b5795f909c3ef872fe99c6f1e6704a0fa97594b1570b3579226ec67fe11d696ccc349a4585055bbaf07c65eff423aa45af28abf38c858"
+    "md5=d23ffe85ac7dc8f0afd1ddf622770d09"
+    "sha512=26ff5a7b7f38c460661974b23ca190f0feae3a99f1974e0fd12ccf08745bd7d91b7bc168c70a5385b837bfff9530e0e4e41cf269f23dd8cf16ca658008244b44"
   ]
 }
diff --git a/packages/upstream/ctypes.0.19.1/opam b/packages/upstream/ctypes.0.20.1/opam
similarity index 91%
rename from packages/upstream/ctypes.0.19.1/opam
rename to packages/upstream/ctypes.0.20.1/opam
index 354b72678..05071b1fd 100644
--- a/packages/upstream/ctypes.0.19.1/opam
+++ b/packages/upstream/ctypes.0.20.1/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ctypes"
-version: "0.19.1"
+version: "0.20.1"
 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
@@ -39,8 +39,6 @@ depends: [
 depopts: ["ctypes-foreign" "mirage-xen"]
 conflicts: [
   "mirage-xen" {>= "6.0.0"}
-  "base-nnp"
-  "ocaml-option-nnpchecker"
 ]
 build: [
   [make "XEN=%{mirage-xen:enable}%" "libffi.config"]
@@ -54,6 +52,6 @@ build: [
 install: [make "install" "XEN=%{mirage-xen:enable}%"]
 dev-repo: "git+http://github.com/ocamllabs/ocaml-ctypes.git"
 url {
-  src: "https://github.com/ocamllabs/ocaml-ctypes/archive/0.19.1.tar.gz"
-  checksum: "md5=ceb891ec568fd7da76c31af270a2afe2"
+  src: "https://github.com/ocamllabs/ocaml-ctypes/archive/0.20.1.tar.gz"
+  checksum: "md5=91211baac16cb43134b1d6009b1edf92"
 }
diff --git a/packages/upstream/domain-name.0.3.1/opam b/packages/upstream/domain-name.0.4.0/opam
similarity index 77%
rename from packages/upstream/domain-name.0.3.1/opam
rename to packages/upstream/domain-name.0.4.0/opam
index dba75e283..c829e4eb6 100644
--- a/packages/upstream/domain-name.0.3.1/opam
+++ b/packages/upstream/domain-name.0.4.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "domain-name"
-version: "0.3.1"
+version: "0.4.0"
 synopsis: "RFC 1035 Internet domain names"
 description: """\
 A domain name is a sequence of labels separated by dots, such as `foo.example`.
@@ -28,10 +28,10 @@ build: [
 dev-repo: "git+https://github.com/hannesm/domain-name.git"
 url {
   src:
-    "https://github.com/hannesm/domain-name/releases/download/v0.3.1/domain-name-v0.3.1.tbz"
+    "https://github.com/hannesm/domain-name/releases/download/v0.4.0/domain-name-0.4.0.tbz"
   checksum: [
-    "sha256=73d5d4b64fd7b5350d7d886edc81452b571361ee1997a86cfc0c90a0c0e8f64a"
-    "sha512=e4be7c094c3d58cbf4bc627596a7eacbe715cb68d5920f8662661b0c76a3c4d563f2b478a49e98c932f7313ed3efe6a432513580a372f14bca2cfd5f8a76f61d"
+    "sha256=a5c06e22845895201973e812fe3019274d1db81c0a7873da6c8007c4ad2108c5"
+    "sha512=f25aedb1ddf6ab8c49b1545cf88f4990114a9e7954d91cabf260e6ce470abd42dd135e8a55084262a77d4c9ee4bff6dc00c71307b23a48d82d50593b910ee173"
   ]
 }
-x-commit-hash: "4d50b4ee43a8611bade7331a2417605a313d6499"
+x-commit-hash: "e9833486ee40ef2c49c43dd72976022a627b4a34"
diff --git a/packages/upstream/dune-build-info.2.9.1/opam b/packages/upstream/dune-build-info.3.4.1/opam
similarity index 67%
rename from packages/upstream/dune-build-info.2.9.1/opam
rename to packages/upstream/dune-build-info.3.4.1/opam
index 294f719ee..89f5f1ba8 100644
--- a/packages/upstream/dune-build-info.2.9.1/opam
+++ b/packages/upstream/dune-build-info.3.4.1/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "dune-build-info"
-version: "2.9.1"
+version: "3.4.1"
 synopsis: "Embed build informations inside executable"
 description: """\
 The build-info library allows to access information about how the
@@ -16,19 +16,22 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "2.9"}
+  "dune" {>= "3.3"}
+  "ocaml" {>= "4.08"}
   "odoc" {with-doc}
 ]
 build: [
   ["dune" "subst"] {dev}
+  ["rm" "-rf" "vendor/csexp"]
+  ["rm" "-rf" "vendor/pp"]
   ["dune" "build" "-p" name "-j" jobs "@install" "@doc" {with-doc}]
 ]
 dev-repo: "git+https://github.com/ocaml/dune.git"
 url {
-  src: "https://github.com/ocaml/dune/releases/download/2.9.1/dune-2.9.1.tbz"
+  src: "https://github.com/ocaml/dune/releases/download/3.4.1/dune-3.4.1.tbz"
   checksum: [
-    "sha256=b374feb22b34099ccc6dd32128e18d088ff9a81837952b29f05110b308c09f26"
-    "sha512=fce1aa520db785c25ded75a959e9dafeb7887d4f5deeb14b044cd5b9e2d235dca24589d794d2f01513765bc4764cf72f8659bd15f3a4fc06efa61363dc5d709b"
+    "sha256=299fa33cffc108cc26ff59d5fc9d09f6cb0ab3ac280bf23a0114cfdc0b40c6c5"
+    "sha512=cb425d08c989fd27e1a87a6c72f37494866b508b0fe4ec05070adad995a99710b223a9047b6649776f63943dafb61903eefe4d5efde4c439103a89e2d6ff5337"
   ]
 }
-x-commit-hash: "e41c66259135d6d1d72b031be6684bf8826a2586"
+x-commit-hash: "ac188544b55357c1fff277f54d1481d28a634e19"
diff --git a/packages/upstream/dune-configurator.2.9.1/opam b/packages/upstream/dune-configurator.3.4.1/opam
similarity index 64%
rename from packages/upstream/dune-configurator.2.9.1/opam
rename to packages/upstream/dune-configurator.3.4.1/opam
index 87dbb7658..18dfe6bee 100644
--- a/packages/upstream/dune-configurator.2.9.1/opam
+++ b/packages/upstream/dune-configurator.3.4.1/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "dune-configurator"
-version: "2.9.1"
+version: "3.4.1"
 synopsis: "Helper library for gathering system configuration"
 description: """\
 dune-configurator is a small library that helps writing OCaml scripts that
@@ -18,22 +18,24 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "2.9"}
-  "ocaml" {>= "4.03.0"}
-  "result"
-  "csexp" {>= "1.3.0"}
+  "dune" {>= "3.3"}
+  "ocaml" {>= "4.04.0"}
+  "base-unix"
+  "csexp" {>= "1.5.0"}
   "odoc" {with-doc}
 ]
 build: [
   ["dune" "subst"] {dev}
+  ["rm" "-rf" "vendor/csexp"]
+  ["rm" "-rf" "vendor/pp"]
   ["dune" "build" "-p" name "-j" jobs "@install" "@doc" {with-doc}]
 ]
 dev-repo: "git+https://github.com/ocaml/dune.git"
 url {
-  src: "https://github.com/ocaml/dune/releases/download/2.9.1/dune-2.9.1.tbz"
+  src: "https://github.com/ocaml/dune/releases/download/3.4.1/dune-3.4.1.tbz"
   checksum: [
-    "sha256=b374feb22b34099ccc6dd32128e18d088ff9a81837952b29f05110b308c09f26"
-    "sha512=fce1aa520db785c25ded75a959e9dafeb7887d4f5deeb14b044cd5b9e2d235dca24589d794d2f01513765bc4764cf72f8659bd15f3a4fc06efa61363dc5d709b"
+    "sha256=299fa33cffc108cc26ff59d5fc9d09f6cb0ab3ac280bf23a0114cfdc0b40c6c5"
+    "sha512=cb425d08c989fd27e1a87a6c72f37494866b508b0fe4ec05070adad995a99710b223a9047b6649776f63943dafb61903eefe4d5efde4c439103a89e2d6ff5337"
   ]
 }
-x-commit-hash: "e41c66259135d6d1d72b031be6684bf8826a2586"
+x-commit-hash: "ac188544b55357c1fff277f54d1481d28a634e19"
diff --git a/packages/upstream/dune.2.9.1/opam b/packages/upstream/dune.3.4.1/opam
similarity index 68%
rename from packages/upstream/dune.2.9.1/opam
rename to packages/upstream/dune.3.4.1/opam
index a5d225e29..f4413d8be 100644
--- a/packages/upstream/dune.2.9.1/opam
+++ b/packages/upstream/dune.3.4.1/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "dune"
-version: "2.9.1"
+version: "3.4.1"
 synopsis: "Fast, portable, and opinionated build system"
 description: """\
 dune is a build system that was designed to simplify the release of
@@ -26,8 +26,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  ("ocaml" {>= "4.08" & < "5.00"} |
-   ("ocaml" {< "4.08~~"} & "ocamlfind-secondary"))
+  ("ocaml" {>= "4.08"} | ("ocaml" {< "4.08~~"} & "ocamlfind-secondary"))
   "base-unix"
   "base-threads"
 ]
@@ -35,22 +34,32 @@ conflicts: [
   "merlin" {< "3.4.0"}
   "ocaml-lsp-server" {< "1.3.0"}
   "dune-configurator" {< "2.3.0"}
-  "odoc" {< "1.3.0"}
+  "odoc" {< "2.0.1"}
   "dune-release" {< "1.3.0"}
   "js_of_ocaml-compiler" {< "3.6.0"}
   "jbuilder" {= "transition"}
+  "ocaml-base-compiler" {= "5.0.0~alpha0"}
+  "ocaml-variants" {= "5.0.0~alpha0+options"}
 ]
 build: [
-  ["ocaml" "configure.ml" "--libdir" lib] {opam-version < "2"}
   ["ocaml" "bootstrap.ml" "-j" jobs]
-  ["./dune.exe" "build" "-p" name "--profile" "dune-bootstrap" "-j" jobs]
+  [
+    "./dune.exe"
+    "build"
+    "dune.install"
+    "--release"
+    "--profile"
+    "dune-bootstrap"
+    "-j"
+    jobs
+  ]
 ]
 dev-repo: "git+https://github.com/ocaml/dune.git"
 url {
-  src: "https://github.com/ocaml/dune/releases/download/2.9.1/dune-2.9.1.tbz"
+  src: "https://github.com/ocaml/dune/releases/download/3.4.1/dune-3.4.1.tbz"
   checksum: [
-    "sha256=b374feb22b34099ccc6dd32128e18d088ff9a81837952b29f05110b308c09f26"
-    "sha512=fce1aa520db785c25ded75a959e9dafeb7887d4f5deeb14b044cd5b9e2d235dca24589d794d2f01513765bc4764cf72f8659bd15f3a4fc06efa61363dc5d709b"
+    "sha256=299fa33cffc108cc26ff59d5fc9d09f6cb0ab3ac280bf23a0114cfdc0b40c6c5"
+    "sha512=cb425d08c989fd27e1a87a6c72f37494866b508b0fe4ec05070adad995a99710b223a9047b6649776f63943dafb61903eefe4d5efde4c439103a89e2d6ff5337"
   ]
 }
-x-commit-hash: "e41c66259135d6d1d72b031be6684bf8826a2586"
+x-commit-hash: "ac188544b55357c1fff277f54d1481d28a634e19"
diff --git a/packages/upstream/easy-format.1.3.2/opam b/packages/upstream/easy-format.1.3.2/opam
deleted file mode 100644
index a7e3f0ca2..000000000
--- a/packages/upstream/easy-format.1.3.2/opam
+++ /dev/null
@@ -1,47 +0,0 @@
-opam-version: "2.0"
-name: "easy-format"
-version: "1.3.2"
-synopsis:
-  "High-level and functional interface to the Format module of the OCaml standard library"
-description: """\
-This module offers a high-level and functional interface to the Format module of
-the OCaml standard library. It is a pretty-printing facility, i.e. it takes as
-input some code represented as a tree and formats this code into the most
-visually satisfying result, breaking and indenting lines of code where
-appropriate.
-
-Input data must be first modelled and converted into a tree using 3 kinds of
-nodes:
-
-* atoms
-* lists
-* labelled nodes
-
-Atoms represent any text that is guaranteed to be printed as-is. Lists can model
-any sequence of items such as arrays of data or lists of definitions that are
-labelled with something like "int main", "let x =" or "x:"."""
-maintainer: ["martin@mjambon.com" "rudi.grinberg@gmail.com"]
-authors: "Martin Jambon"
-license: "BSD-3-Clause"
-homepage: "https://github.com/mjambon/easy-format"
-doc: "https://mjambon.github.io/easy-format/"
-bug-reports: "https://github.com/mjambon/easy-format/issues"
-depends: [
-  "dune" {>= "1.10"}
-  "ocaml" {>= "4.02.3"}
-]
-build: [
-  ["dune" "subst"] {dev}
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-  ["dune" "build" "-p" name "@doc"] {with-doc}
-]
-dev-repo: "git+https://github.com/mjambon/easy-format.git"
-url {
-  src:
-    "https://github.com/mjambon/easy-format/releases/download/1.3.2/easy-format-1.3.2.tbz"
-  checksum: [
-    "sha256=3440c2b882d537ae5e9011eb06abb53f5667e651ea4bb3b460ea8230fa8c1926"
-    "sha512=e39377a2ff020ceb9ac29e8515a89d9bdbc91dfcfa871c4e3baafa56753fac2896768e5d9822a050dc1e2ade43c8967afb69391a386c0a8ecd4e1f774e236135"
-  ]
-}
diff --git a/packages/upstream/eqaf.0.8/opam b/packages/upstream/eqaf.0.9/opam
similarity index 67%
rename from packages/upstream/eqaf.0.8/opam
rename to packages/upstream/eqaf.0.9/opam
index 7e1bd3817..fdc26b5eb 100644
--- a/packages/upstream/eqaf.0.8/opam
+++ b/packages/upstream/eqaf.0.9/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "eqaf"
-version: "0.8"
+version: "0.9"
 synopsis: "Constant-time equal function on string"
 description:
   "This package provides an equal function on string in constant-time to avoid timing-attack with crypto stuff."
@@ -17,6 +17,8 @@ depends: [
   "base64" {with-test}
   "alcotest" {with-test}
   "crowbar" {with-test}
+  "fmt" {with-test & >= "0.8.7"}
+  "bechamel" {with-test}
 ]
 build: [
   ["dune" "subst"] {dev}
@@ -25,10 +27,10 @@ build: [
 ]
 dev-repo: "git+https://github.com/mirage/eqaf.git"
 url {
-  src: "https://github.com/mirage/eqaf/releases/download/v0.8/eqaf-v0.8.tbz"
+  src: "https://github.com/mirage/eqaf/releases/download/v0.9/eqaf-0.9.tbz"
   checksum: [
-    "sha256=1145a160107437d7943e02e486df6bd233d3937ec1a597d7fa39edb9471cf875"
-    "sha512=303749bdbaae8fc27f57ebaa5cf9b16ed5b8cbaee35f0a35d69f91a437b1a3411a613d145d3aff7ff74a587509d877cc0a569fdae4d00cec65bf50d705361e25"
+    "sha256=ec0e28a946ac6817f95d5854f05a9961ae3a8408bb610e79cfad01b9b255dfe0"
+    "sha512=4df7fd3ea35156953a172c1a021aab05b8b122ee8d3cfdb34f96edb1b5133d1fe2721b90cb64287841d770b16c2ffe70559c66e90f8d61a92b73857da22548c4"
   ]
 }
-x-commit-hash: "b17b607195fac4043e6c64c9ffb67df3d373fc86"
+x-commit-hash: "e878ed56e40ca05c851a0e3297ab00ab76b10e0e"
diff --git a/packages/upstream/expect_test_helpers_core.v0.15.0/opam b/packages/upstream/expect_test_helpers_core.v0.15.0/opam
new file mode 100644
index 000000000..a37038c46
--- /dev/null
+++ b/packages/upstream/expect_test_helpers_core.v0.15.0/opam
@@ -0,0 +1,35 @@
+opam-version: "2.0"
+name: "expect_test_helpers_core"
+version: "v0.15.0"
+synopsis: "Helpers for writing expectation tests"
+description: """\
+This library provides helper functions for writing expect tests.
+
+If you want helpers for writing expect tests using the Async library,
+look at expect_test_helpers_async."""
+maintainer: "Jane Street developers"
+authors: "Jane Street Group, LLC"
+license: "MIT"
+homepage: "https://github.com/janestreet/expect_test_helpers_core"
+doc:
+  "https://ocaml.janestreet.com/ocaml-core/latest/doc/expect_test_helpers_core/index.html"
+bug-reports: "https://github.com/janestreet/expect_test_helpers_core/issues"
+depends: [
+  "ocaml" {>= "4.08.0"}
+  "base" {>= "v0.15" & < "v0.16"}
+  "base_quickcheck" {>= "v0.15" & < "v0.16"}
+  "core" {>= "v0.15" & < "v0.16"}
+  "ppx_jane" {>= "v0.15" & < "v0.16"}
+  "sexp_pretty" {>= "v0.15" & < "v0.16"}
+  "stdio" {>= "v0.15" & < "v0.16"}
+  "dune" {>= "2.0.0"}
+  "re" {>= "1.8.0"}
+]
+build: ["dune" "build" "-p" name "-j" jobs]
+dev-repo: "git+https://github.com/janestreet/expect_test_helpers_core.git"
+url {
+  src:
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/expect_test_helpers_core-v0.15.0.tar.gz"
+  checksum:
+    "sha256=7f2a738564253e32c8bd816f9da548d1619e447b6ebc4c7af33e5c0c52ff9652"
+}
diff --git a/packages/upstream/ezjsonm.1.2.0/opam b/packages/upstream/ezjsonm.1.3.0/opam
similarity index 65%
rename from packages/upstream/ezjsonm.1.2.0/opam
rename to packages/upstream/ezjsonm.1.3.0/opam
index c36bb2838..29f54069a 100644
--- a/packages/upstream/ezjsonm.1.2.0/opam
+++ b/packages/upstream/ezjsonm.1.3.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ezjsonm"
-version: "1.2.0"
+version: "1.3.0"
 synopsis: "Simple interface on top of the Jsonm JSON library"
 description: """\
 Ezjsonm provides more convenient (but far less flexible)
@@ -18,10 +18,13 @@ homepage: "https://github.com/mirage/ezjsonm"
 doc: "https://mirage.github.io/ezjsonm/"
 bug-reports: "https://github.com/mirage/ezjsonm/issues"
 depends: [
-  "ocaml" {>= "4.04.0"}
+  "ocaml" {>= "4.08.0"}
   "dune" {>= "2.0"}
-  "alcotest" {with-test & >= "0.4.0"}
+  "alcotest" {with-test & >= "1.5.0"}
   "jsonm" {>= "1.0.0"}
+  "uutf"
+  "js_of_ocaml-compiler" {with-test}
+  "conf-npm" {with-test}
   "sexplib0"
   "hex"
 ]
@@ -32,10 +35,10 @@ build: [
 dev-repo: "git+https://github.com/mirage/ezjsonm.git"
 url {
   src:
-    "https://github.com/mirage/ezjsonm/releases/download/v1.2.0/ezjsonm-v1.2.0.tbz"
+    "https://github.com/mirage/ezjsonm/releases/download/v1.3.0/ezjsonm-1.3.0.tbz"
   checksum: [
-    "sha256=870bbe1c24484bb7e1acce44859dd521c24cb8a8f0e74042a62418c68671cce0"
-    "sha512=f603642ecdd01696017d0a8fef0ae8867777fbced53ad670afa3da8f12e2c101a5c6cd201b7917685323bc9033793dd406c6d333ed4a24d2d4d4d6c88527693b"
+    "sha256=08633e0f0e767a8ae81935ca7e74f1693b85a79c4502d568eedff5170f0cd77b"
+    "sha512=b731036384115603af9187464695418d27b7cf6f763c8dbc0812db62a7657cac1b6019d3b205b1c95ae81b7dab0bd4037390d977ee8c122bef29a9ddef771e18"
   ]
 }
-x-commit-hash: "5986fd927c7a804b09867f43ca82a75407dcdadb"
+x-commit-hash: "a2b724b3bb084ce5045aca6f3431bf1abb096b6f"
diff --git a/packages/upstream/fieldslib.v0.14.0/opam b/packages/upstream/fieldslib.v0.15.0/opam
similarity index 78%
rename from packages/upstream/fieldslib.v0.14.0/opam
rename to packages/upstream/fieldslib.v0.15.0/opam
index 842fc8942..3d60bcd55 100644
--- a/packages/upstream/fieldslib.v0.14.0/opam
+++ b/packages/upstream/fieldslib.v0.15.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "fieldslib"
-version: "v0.14.0"
+version: "v0.15.0"
 synopsis:
   "Syntax extension to define first class values representing record fields, to get and set record fields, iterate and fold over all fields of a record and create new record values"
 description: """\
@@ -16,14 +16,15 @@ doc:
   "https://ocaml.janestreet.com/ocaml-core/latest/doc/fieldslib/index.html"
 bug-reports: "https://github.com/janestreet/fieldslib/issues"
 depends: [
-  "ocaml" {>= "4.04.2"}
-  "base" {>= "v0.14" & < "v0.15"}
+  "ocaml" {>= "4.08.0"}
+  "base" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/fieldslib.git"
 url {
   src:
-    "https://ocaml.janestreet.com/ocaml-core/v0.14/files/fieldslib-v0.14.0.tar.gz"
-  checksum: "md5=4fbf05d88be119e883abecba8c33cb85"
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/fieldslib-v0.15.0.tar.gz"
+  checksum:
+    "sha256=050afd7327840c63483616f9781c6ec127e0e48d270f237f89f56f5290fb7120"
 }
diff --git a/packages/upstream/fix.20201120/opam b/packages/upstream/fix.20220121/opam
similarity index 55%
rename from packages/upstream/fix.20201120/opam
rename to packages/upstream/fix.20220121/opam
index b729001da..caf4fcae6 100644
--- a/packages/upstream/fix.20201120/opam
+++ b/packages/upstream/fix.20220121/opam
@@ -1,23 +1,23 @@
 opam-version: "2.0"
 name: "fix"
-version: "20201120"
-synopsis: "Facilities for memoization and fixed points"
+version: "20220121"
+synopsis: "Algorithmic building blocks for memoization, recursion, and more"
 maintainer: "francois.pottier@inria.fr"
 authors: "François Pottier <francois.pottier@inria.fr>"
+license: "LGPL-2.0-only WITH OCaml-LGPL-linking-exception"
 homepage: "https://gitlab.inria.fr/fpottier/fix"
 bug-reports: "francois.pottier@inria.fr"
-license: "LGPL-2.0-only WITH OCaml-LGPL-linking-exception"
 depends: [
-  "ocaml" {>= "4.03" & < "5.00"}
+  "ocaml" {>= "4.03"}
   "dune" {>= "1.3"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://gitlab.inria.fr/fpottier/fix.git"
 url {
   src:
-    "https://gitlab.inria.fr/fpottier/fix/-/archive/20201120/archive.tar.gz"
+    "https://gitlab.inria.fr/fpottier/fix/-/archive/20220121/archive.tar.gz"
   checksum: [
-    "md5=7eb570b759635fe66f3556d2b1cc88e3"
-    "sha512=344dcc619f9e8b8a6c998775b6d2dab2ea5253e6a67abe4797f76dc5dd30bc776568abce1e90477422e9db447821579889737e3531c42139708f813e983ea5d4"
+    "md5=48d8a5bdff23cf7fbf9288877df2b6aa"
+    "sha512=a851d8783c0c519c6e55359a5c471af433058872409c29a1a7bdfd0076813341ad2c0ebd1ce9e28bff4d4c729dfbc808c41c084fe12a42b45a2b5e391e77ccd2"
   ]
 }
diff --git a/packages/upstream/hex.1.4.0/opam b/packages/upstream/hex.1.5.0/opam
similarity index 66%
rename from packages/upstream/hex.1.4.0/opam
rename to packages/upstream/hex.1.5.0/opam
index 623101e4e..a1f12e04e 100644
--- a/packages/upstream/hex.1.4.0/opam
+++ b/packages/upstream/hex.1.5.0/opam
@@ -1,10 +1,10 @@
 opam-version: "2.0"
 name: "hex"
-version: "1.4.0"
+version: "1.5.0"
 synopsis: "Library providing hexadecimal converters"
 description: """\
 ```ocaml
-#require "hex";;
+# #require "hex";;
 # Hex.of_string "Hello world!";;
 - : Hex.t = "48656c6c6f20776f726c6421"
 # Hex.to_string "dead-beef";;
@@ -21,10 +21,9 @@ homepage: "https://github.com/mirage/ocaml-hex"
 doc: "https://mirage.github.io/ocaml-hex/"
 bug-reports: "https://github.com/mirage/ocaml-hex/issues"
 depends: [
-  "ocaml" {>= "4.03.0"}
+  "ocaml" {>= "4.08.0"}
   "dune" {>= "1.0"}
   "cstruct" {>= "1.7.0"}
-  "bigarray-compat" {>= "1.0.0"}
 ]
 build: [
   ["dune" "subst"] {dev}
@@ -34,6 +33,10 @@ build: [
 dev-repo: "git+https://github.com/mirage/ocaml-hex.git"
 url {
   src:
-    "https://github.com/mirage/ocaml-hex/releases/download/v1.4.0/hex-v1.4.0.tbz"
-  checksum: "md5=57103ff33e70f14171c46d88f5452d11"
+    "https://github.com/mirage/ocaml-hex/releases/download/v1.5.0/hex-1.5.0.tbz"
+  checksum: [
+    "sha256=2e67eeca1b03049307a30831b5cd694bcb2d3e7f2a6b4fb597fbdb647351b4dc"
+    "sha512=baa09b47a90f0a54ad2becfb272f0674219e4fc0c03559deff26aaf13ccd59258b31bf98e56c44a5a8fa03437e3eba2bf5f0cd76e52d184d26cfb1170c490462"
+  ]
 }
+x-commit-hash: "036cdf98cd20109f3f1408b816e59b21e9da294b"
diff --git a/packages/upstream/inotify.2.3/opam b/packages/upstream/inotify.2.3/opam
deleted file mode 100644
index f83db4ef9..000000000
--- a/packages/upstream/inotify.2.3/opam
+++ /dev/null
@@ -1,32 +0,0 @@
-opam-version: "2.0"
-name: "inotify"
-version: "2.3"
-synopsis: "Inotify bindings for ocaml."
-maintainer: "whitequark <whitequark@whitequark.org>"
-authors: "whitequark <whitequark@whitequark.org>"
-license: "LGPL-2.1-only"
-homepage: "https://github.com/whitequark/ocaml-inotify"
-doc: "http://whitequark.github.io/ocaml-inotify"
-bug-reports: "https://github.com/whitequark/ocaml-inotify/issues"
-depends: [
-  "ocaml"
-  "base-unix"
-  "base-bytes"
-  "ocamlfind" {build}
-  "fileutils" {with-test}
-  "ocamlbuild" {build}
-]
-depopts: ["lwt"]
-available: os = "linux"
-flags: light-uninstall
-build: [
-  ["ocaml" "setup.ml" "-configure" "--%{lwt:enable}%-lwt" "--prefix" prefix]
-  ["ocaml" "setup.ml" "-build"]
-]
-install: ["ocaml" "setup.ml" "-install"]
-remove: ["ocamlfind" "remove" "inotify"]
-dev-repo: "git+https://github.com/whitequark/ocaml-inotify.git"
-url {
-  src: "https://github.com/whitequark/ocaml-inotify/archive/v2.3.tar.gz"
-  checksum: "md5=6a87be14f62e4417562a401bb448ed7b"
-}
diff --git a/packages/upstream/inotify.2.4/opam b/packages/upstream/inotify.2.4/opam
new file mode 100644
index 000000000..b778ccd63
--- /dev/null
+++ b/packages/upstream/inotify.2.4/opam
@@ -0,0 +1,46 @@
+opam-version: "2.0"
+name: "inotify"
+version: "2.4"
+synopsis: "Inotify bindings for OCaml"
+description: "Inotify bindings for OCaml"
+maintainer: "whitequark <whitequark@whitequark.org>"
+authors: "whitequark <whitequark@whitequark.org>"
+license: "LGPL-2.1-only"
+homepage: "https://github.com/whitequark/ocaml-inotify"
+doc: "https://whitequark.github.io/ocaml-inotify"
+bug-reports: "https://github.com/whitequark/ocaml-inotify/issues"
+depends: [
+  "dune" {>= "2.9"}
+  "base-unix"
+  "base-bytes"
+  "fileutils" {with-test & >= "0.4.4"}
+  "ounit2" {with-test & >= "2.0"}
+  "lwt" {with-test}
+  "ocaml" {>= "4.03"}
+  "odoc" {with-doc}
+]
+depopts: ["lwt"]
+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/whitequark/ocaml-inotify.git"
+url {
+  src: "https://github.com/whitequark/ocaml-inotify/archive/v2.4.tar.gz"
+  checksum: [
+    "md5=6f8c4363528ab10b31f66d18ce095ac1"
+    "sha512=d164ab997517008671fdd60ab219cf1539f75928334838f416e31799a2c5198a97eb9d795225c3bb40cc41ac8431022c26b7c8b78ad2d45673158a5e2e554997"
+  ]
+}
diff --git a/packages/upstream/int_repr.v0.15.0/opam b/packages/upstream/int_repr.v0.15.0/opam
new file mode 100644
index 000000000..b19a0014c
--- /dev/null
+++ b/packages/upstream/int_repr.v0.15.0/opam
@@ -0,0 +1,25 @@
+opam-version: "2.0"
+name: "int_repr"
+version: "v0.15.0"
+synopsis: "Integers of various widths"
+description: "Integers of various widths."
+maintainer: "Jane Street developers"
+authors: "Jane Street Group, LLC"
+license: "MIT"
+homepage: "https://github.com/janestreet/int_repr"
+doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/int_repr/index.html"
+bug-reports: "https://github.com/janestreet/int_repr/issues"
+depends: [
+  "ocaml" {>= "4.10.0"}
+  "base" {>= "v0.15" & < "v0.16"}
+  "ppx_jane" {>= "v0.15" & < "v0.16"}
+  "dune" {>= "2.0.0"}
+]
+build: ["dune" "build" "-p" name "-j" jobs]
+dev-repo: "git+https://github.com/janestreet/int_repr.git"
+url {
+  src:
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/int_repr-v0.15.0.tar.gz"
+  checksum:
+    "sha256=5d357b58914bcaa183432f2cfafc726ecccaa36f42cab982ab32e8b1c1ed6719"
+}
diff --git a/packages/upstream/integers.0.5.1/opam b/packages/upstream/integers.0.7.0/opam
similarity index 78%
rename from packages/upstream/integers.0.5.1/opam
rename to packages/upstream/integers.0.7.0/opam
index e27620c10..ff6ef6bdd 100644
--- a/packages/upstream/integers.0.5.1/opam
+++ b/packages/upstream/integers.0.7.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "integers"
-version: "0.5.1"
+version: "0.7.0"
 synopsis: "Various signed and unsigned integer types for OCaml"
 maintainer: "yallop@gmail.com"
 authors: [
@@ -12,7 +12,8 @@ doc: "http://ocamllabs.github.io/ocaml-integers/api.docdir/"
 bug-reports: "https://github.com/ocamllabs/ocaml-integers/issues"
 depends: [
   "ocaml" {>= "4.03"}
-  "dune"
+  "dune" {>= "1.0"}
+  "stdlib-shims"
 ]
 build: [
   ["dune" "subst"] {dev}
@@ -21,6 +22,6 @@ build: [
 ]
 dev-repo: "git+https://github.com/ocamllabs/ocaml-integers.git"
 url {
-  src: "https://github.com/ocamllabs/ocaml-integers/archive/0.5.1.tar.gz"
-  checksum: "md5=24d629966763b4956edfb7e64d6c5427"
+  src: "https://github.com/ocamllabs/ocaml-integers/archive/0.7.0.tar.gz"
+  checksum: "md5=201cf24143d7cb9a3921d572b6e6c42c"
 }
diff --git a/packages/upstream/io-page-unix.2.3.0/opam b/packages/upstream/io-page-unix.2.3.0/opam
deleted file mode 100644
index 6f0a5e43b..000000000
--- a/packages/upstream/io-page-unix.2.3.0/opam
+++ /dev/null
@@ -1,34 +0,0 @@
-opam-version: "2.0"
-name: "io-page-unix"
-version: "2.3.0"
-synopsis: "Support for efficient handling of I/O memory pages on Unix"
-description: """\
-IO pages are page-aligned, and wrapped in the `Cstruct` library to avoid
-copying the data contained within the page."""
-maintainer: "anil@recoil.org"
-authors: ["Anil Madhavapeddy" "Dave Scott" "Thomas Gazagnaire"]
-license: "ISC"
-tags: "org:mirage"
-homepage: "https://github.com/mirage/io-page"
-bug-reports: "https://github.com/mirage/io-page/issues"
-depends: [
-  "ocaml" {>= "4.02.3"}
-  "dune"
-  "io-page" {= version}
-  "cstruct" {>= "2.0.0"}
-  "ounit" {with-test}
-]
-build: [
-  ["dune" "subst"] {dev}
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-dev-repo: "git+https://github.com/mirage/io-page.git"
-url {
-  src:
-    "https://github.com/mirage/io-page/releases/download/v2.3.0/io-page-v2.3.0.tbz"
-  checksum: [
-    "sha256=9605a8a03e53bc12682212c371bc477f2a44ed829725ae38cc3005e2f83da2c3"
-    "sha512=ce1775bff151d62bb85405a13fe75f912c11b09cbc0a6dd81dd27b3f4c767f0b9c4d3e7383d494eb5c130311482ea69877c45b71b91153177562ffc47de4da2f"
-  ]
-}
diff --git a/packages/upstream/io-page.2.3.0/opam b/packages/upstream/io-page.3.0.0/opam
similarity index 52%
rename from packages/upstream/io-page.2.3.0/opam
rename to packages/upstream/io-page.3.0.0/opam
index 4581977b1..73308fdc1 100644
--- a/packages/upstream/io-page.2.3.0/opam
+++ b/packages/upstream/io-page.3.0.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "io-page"
-version: "2.3.0"
+version: "3.0.0"
 synopsis: "Support for efficient handling of I/O memory pages"
 description: """\
 IO pages are page-aligned, and wrapped in the `Cstruct` library to avoid
@@ -13,22 +13,29 @@ homepage: "https://github.com/mirage/io-page"
 doc: "https://mirage.github.io/io-page/"
 bug-reports: "https://github.com/mirage/io-page/issues"
 depends: [
-  "ocaml" {>= "4.02.3"}
-  "dune"
-  "dune-configurator"
+  "conf-pkg-config" {build}
+  "ocaml" {>= "4.08.0"}
+  "dune" {>= "2.6"}
   "cstruct" {>= "2.0.0"}
-  "bigarray-compat"
+  "ounit" {with-test}
+]
+depopts: ["ocaml-freestanding"]
+conflicts: [
+  "mirage-xen" {< "6.0.0"}
+  "ocaml-freestanding" {< "0.4.1"}
 ]
 build: [
   ["dune" "subst"] {dev}
   ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
 dev-repo: "git+https://github.com/mirage/io-page.git"
 url {
   src:
-    "https://github.com/mirage/io-page/releases/download/v2.3.0/io-page-v2.3.0.tbz"
+    "https://github.com/mirage/io-page/releases/download/v3.0.0/io-page-3.0.0.tbz"
   checksum: [
-    "sha256=9605a8a03e53bc12682212c371bc477f2a44ed829725ae38cc3005e2f83da2c3"
-    "sha512=ce1775bff151d62bb85405a13fe75f912c11b09cbc0a6dd81dd27b3f4c767f0b9c4d3e7383d494eb5c130311482ea69877c45b71b91153177562ffc47de4da2f"
+    "sha256=0e36ca74d9056ba6108090cb98bb2ebf2af079be3f4cdbea022820723ff786ee"
+    "sha512=777e5cf4cb82bfc21d026ea2a44a2c30f388a2daa570ad30a396d498b7e4845c0b887402fc002560e2bf17dd49ee7c9839675a3c587e6104f395997eef3c9667"
   ]
 }
+x-commit-hash: "cc82c9cbd1e1caf7c40e12891b9e668d94b06b88"
diff --git a/packages/upstream/ipaddr-sexp.5.2.0/opam b/packages/upstream/ipaddr-sexp.5.3.1/opam
similarity index 71%
rename from packages/upstream/ipaddr-sexp.5.2.0/opam
rename to packages/upstream/ipaddr-sexp.5.3.1/opam
index ee9035b47..b14bebd54 100644
--- a/packages/upstream/ipaddr-sexp.5.2.0/opam
+++ b/packages/upstream/ipaddr-sexp.5.3.1/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ipaddr-sexp"
-version: "5.2.0"
+version: "5.3.1"
 synopsis:
   "A library for manipulation of IP address representations using sexp"
 description: "Sexp convertions for ipaddr"
@@ -12,11 +12,11 @@ homepage: "https://github.com/mirage/ocaml-ipaddr"
 doc: "https://mirage.github.io/ocaml-ipaddr/"
 bug-reports: "https://github.com/mirage/ocaml-ipaddr/issues"
 depends: [
-  "ocaml" {>= "4.04.0"}
+  "ocaml" {>= "4.08.0"}
   "dune" {>= "1.9.0"}
   "ipaddr" {= version}
   "ipaddr-cstruct" {with-test & = version}
-  "ounit" {with-test}
+  "ounit2" {with-test}
   "ppx_sexp_conv" {>= "v0.9.0"}
   "sexplib0"
 ]
@@ -28,10 +28,10 @@ build: [
 dev-repo: "git+https://github.com/mirage/ocaml-ipaddr.git"
 url {
   src:
-    "https://github.com/mirage/ocaml-ipaddr/releases/download/v5.2.0/ipaddr-v5.2.0.tbz"
+    "https://github.com/mirage/ocaml-ipaddr/releases/download/v5.3.1/ipaddr-5.3.1.tbz"
   checksum: [
-    "sha256=f98d237cc1f783a0ba7dff0c6c69b5f519fec056950e3e3e7c15e5511ee5b7ec"
-    "sha512=28c8c4d525c2ab13e8561de5dfdb8922227ce652cd3c02e78c60daf2ba6844960864027c803f11fc3d1991a18ef864d8a0b95cd99e5f5d8452d3f66541367bd2"
+    "sha256=9820bcbccadb6e6d9e22fe26b2f9a044897c8f47c29d157f464b41a2f191e7d4"
+    "sha512=1d400f8344d1a8c2ac1c55e4a7167484034094e2227ce7c8f2f45843b0875a83030851400ceb96b5cdb756fa8798d83c77d839705fcb9e3f2bd5e46d337d63d0"
   ]
 }
-x-commit-hash: "7745ea4be2c1c5a7ab95908b26a6ed81a0947ab5"
+x-commit-hash: "4fe91c7a7774d829a65e711be5d7df1501bc2e75"
diff --git a/packages/upstream/ipaddr.5.2.0/opam b/packages/upstream/ipaddr.5.3.1/opam
similarity index 81%
rename from packages/upstream/ipaddr.5.2.0/opam
rename to packages/upstream/ipaddr.5.3.1/opam
index d157620b9..b5a512cbe 100644
--- a/packages/upstream/ipaddr.5.2.0/opam
+++ b/packages/upstream/ipaddr.5.3.1/opam
@@ -1,12 +1,12 @@
 opam-version: "2.0"
 name: "ipaddr"
-version: "5.2.0"
+version: "5.3.1"
 synopsis:
   "A library for manipulation of IP (and MAC) address representations"
 description: """\
 Features:
  * Depends only on sexplib (conditionalization under consideration)
- * oUnit-based tests
+ * ounit2-based tests
  * IPv4 and IPv6 support
  * IPv4 and IPv6 CIDR prefix support
  * IPv4 and IPv6 [CIDR-scoped address](http://tools.ietf.org/html/rfc4291#section-2.3) support
@@ -28,12 +28,11 @@ homepage: "https://github.com/mirage/ocaml-ipaddr"
 doc: "https://mirage.github.io/ocaml-ipaddr/"
 bug-reports: "https://github.com/mirage/ocaml-ipaddr/issues"
 depends: [
-  "ocaml" {>= "4.04.0"}
+  "ocaml" {>= "4.08.0"}
   "dune" {>= "1.9.0"}
   "macaddr" {= version}
-  "stdlib-shims"
   "domain-name" {>= "0.3.0"}
-  "ounit" {with-test}
+  "ounit2" {with-test}
   "ppx_sexp_conv" {with-test & >= "v0.9.0"}
 ]
 build: [
@@ -44,10 +43,10 @@ build: [
 dev-repo: "git+https://github.com/mirage/ocaml-ipaddr.git"
 url {
   src:
-    "https://github.com/mirage/ocaml-ipaddr/releases/download/v5.2.0/ipaddr-v5.2.0.tbz"
+    "https://github.com/mirage/ocaml-ipaddr/releases/download/v5.3.1/ipaddr-5.3.1.tbz"
   checksum: [
-    "sha256=f98d237cc1f783a0ba7dff0c6c69b5f519fec056950e3e3e7c15e5511ee5b7ec"
-    "sha512=28c8c4d525c2ab13e8561de5dfdb8922227ce652cd3c02e78c60daf2ba6844960864027c803f11fc3d1991a18ef864d8a0b95cd99e5f5d8452d3f66541367bd2"
+    "sha256=9820bcbccadb6e6d9e22fe26b2f9a044897c8f47c29d157f464b41a2f191e7d4"
+    "sha512=1d400f8344d1a8c2ac1c55e4a7167484034094e2227ce7c8f2f45843b0875a83030851400ceb96b5cdb756fa8798d83c77d839705fcb9e3f2bd5e46d337d63d0"
   ]
 }
-x-commit-hash: "7745ea4be2c1c5a7ab95908b26a6ed81a0947ab5"
+x-commit-hash: "4fe91c7a7774d829a65e711be5d7df1501bc2e75"
diff --git a/packages/upstream/jane-street-headers.v0.14.0/opam b/packages/upstream/jane-street-headers.v0.15.0/opam
similarity index 76%
rename from packages/upstream/jane-street-headers.v0.14.0/opam
rename to packages/upstream/jane-street-headers.v0.15.0/opam
index 2a89e6979..cf896f626 100644
--- a/packages/upstream/jane-street-headers.v0.14.0/opam
+++ b/packages/upstream/jane-street-headers.v0.15.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "jane-street-headers"
-version: "v0.14.0"
+version: "v0.15.0"
 synopsis: "Jane Street C header files"
 description: "C header files shared between the various Jane Street packages"
 maintainer: "Jane Street developers"
@@ -18,6 +18,7 @@ build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/jane-street-headers.git"
 url {
   src:
-    "https://ocaml.janestreet.com/ocaml-core/v0.14/files/jane-street-headers-v0.14.0.tar.gz"
-  checksum: "md5=e8d253ac44d25c8c66367153a0c77495"
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/jane-street-headers-v0.15.0.tar.gz"
+  checksum:
+    "sha256=34e4a37b26e3827da129c0ac7add26e8c09a21a704d55ca05211a8de17c847e4"
 }
diff --git a/packages/upstream/jst-config.v0.14.1/opam b/packages/upstream/jst-config.v0.15.1/opam
similarity index 81%
rename from packages/upstream/jst-config.v0.14.1/opam
rename to packages/upstream/jst-config.v0.15.1/opam
index c476b8f9d..6be3997cd 100644
--- a/packages/upstream/jst-config.v0.14.1/opam
+++ b/packages/upstream/jst-config.v0.15.1/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "jst-config"
-version: "v0.14.1"
+version: "v0.15.1"
 synopsis: "Compile-time configuration for Jane Street libraries"
 description: """\
 Defines compile-time constants used in Jane Street libraries such as Base, Core, and
@@ -17,10 +17,9 @@ doc:
   "https://ocaml.janestreet.com/ocaml-core/latest/doc/jst-config/index.html"
 bug-reports: "https://github.com/janestreet/jst-config/issues"
 depends: [
-  "ocaml" {>= "4.04.2"}
-  "base" {>= "v0.14" & < "v0.15"}
-  "ppx_assert" {>= "v0.14" & < "v0.15"}
-  "stdio" {>= "v0.14" & < "v0.15"}
+  "ocaml" {>= "4.08.0"}
+  "base" {>= "v0.15" & < "v0.16"}
+  "ppx_assert" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
   "dune-configurator"
 ]
@@ -28,6 +27,7 @@ build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/jst-config.git"
 url {
   src:
-    "https://github.com/janestreet/jst-config/archive/refs/tags/v0.14.1.tar.gz"
-  checksum: "md5=ca0d970356cc99b0a5660058a93ff589"
+    "https://github.com/janestreet/jst-config/archive/refs/tags/v0.15.1.tar.gz"
+  checksum:
+    "sha256=7053e5bbb3016b760c1e8f419814ad059625105db25dafa020676fcfc0f3b41b"
 }
diff --git a/packages/upstream/lwt.5.5.0/opam b/packages/upstream/lwt.5.6.1/opam
similarity index 71%
rename from packages/upstream/lwt.5.5.0/opam
rename to packages/upstream/lwt.5.6.1/opam
index 4c7d6a780..8b0f22ec5 100644
--- a/packages/upstream/lwt.5.5.0/opam
+++ b/packages/upstream/lwt.5.6.1/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "lwt"
-version: "5.5.0"
+version: "5.6.1"
 synopsis: "Promises and event-driven I/O"
 description: """\
 A promise is a value that may become determined in the future.
@@ -23,18 +23,11 @@ depends: [
   "cppo" {build & >= "1.1.0"}
   "dune" {>= "1.8.0"}
   "dune-configurator"
-  "mmap" {>= "1.1.0" & "os" != "win32"}
-  "ocaml" {>= "4.02.0" & "os" != "win32 " | >= "4.06.0"}
-  ("ocaml" {>= "4.08.0"} | "ocaml-syntax-shims")
+  "ocaml" {>= "4.08"}
   "ocplib-endian"
-  "result" {os != "win32"}
-  "seq"
   "ocamlfind" {dev & >= "1.7.3-1"}
 ]
 depopts: ["base-threads" "base-unix" "conf-libev"]
-conflicts: [
-  "ocaml-variants" {= "4.02.1+BER"}
-]
 build: [
   [
     "dune"
@@ -51,9 +44,9 @@ build: [
 ]
 dev-repo: "git+https://github.com/ocsigen/lwt.git"
 url {
-  src: "https://github.com/ocsigen/lwt/archive/refs/tags/5.5.0.tar.gz"
+  src: "https://github.com/ocsigen/lwt/archive/5.6.1.tar.gz"
   checksum: [
-    "md5=94272fac89c5bf21a89c102b8a8f35a5"
-    "sha512=8951b94555e930634375816d71815b9d85daad6ffb7dab24864661504d11be26575ab0b237196c54693efa372a9b69cdc1d5068a20a250dc0bbb4a3c03c5fda1"
+    "md5=279024789a0ec84a9d97d98bad847f97"
+    "sha512=698875bd3bfcd5baa47eb48e412f442d289f9972421321541860ebe110b9af1949c3fbc253768495726ec547fe4ba25483cd97ff39bc668496fba95b2ed9edd8"
   ]
 }
diff --git a/packages/upstream/lwt_log.1.1.1/opam b/packages/upstream/lwt_log.1.1.1/opam
index 72ade0617..59559281a 100644
--- a/packages/upstream/lwt_log.1.1.1/opam
+++ b/packages/upstream/lwt_log.1.1.1/opam
@@ -10,6 +10,7 @@ doc:
   "https://github.com/ocsigen/lwt_log/blob/master/src/core/lwt_log_core.mli"
 bug-reports: "https://github.com/ocsigen/lwt_log/issues"
 depends: [
+  "ocaml" {< "5.0"}
   "dune" {>= "1.0"}
   "lwt" {>= "4.0.0"}
 ]
diff --git a/packages/upstream/macaddr.5.2.0/opam b/packages/upstream/macaddr.5.3.1/opam
similarity index 73%
rename from packages/upstream/macaddr.5.2.0/opam
rename to packages/upstream/macaddr.5.3.1/opam
index bc677fe1d..d6de99ec7 100644
--- a/packages/upstream/macaddr.5.2.0/opam
+++ b/packages/upstream/macaddr.5.3.1/opam
@@ -1,13 +1,13 @@
 opam-version: "2.0"
 name: "macaddr"
-version: "5.2.0"
+version: "5.3.1"
 synopsis: "A library for manipulation of MAC address representations"
 description: """\
 A library for manipulation of MAC address representations.
 
 Features:
 
- * oUnit-based tests
+ * ounit2-based tests
  * MAC-48 (Ethernet) address support
  * `Macaddr` is a `Map.OrderedType`
  * All types have sexplib serializers/deserializers optionally via the `Macaddr_sexp` library."""
@@ -19,9 +19,9 @@ homepage: "https://github.com/mirage/ocaml-ipaddr"
 doc: "https://mirage.github.io/ocaml-ipaddr/"
 bug-reports: "https://github.com/mirage/ocaml-ipaddr/issues"
 depends: [
-  "ocaml" {>= "4.04.0"}
+  "ocaml" {>= "4.08.0"}
   "dune" {>= "1.9.0"}
-  "ounit" {with-test}
+  "ounit2" {with-test}
   "ppx_sexp_conv" {with-test & >= "v0.9.0"}
 ]
 conflicts: [
@@ -35,10 +35,10 @@ build: [
 dev-repo: "git+https://github.com/mirage/ocaml-ipaddr.git"
 url {
   src:
-    "https://github.com/mirage/ocaml-ipaddr/releases/download/v5.2.0/ipaddr-v5.2.0.tbz"
+    "https://github.com/mirage/ocaml-ipaddr/releases/download/v5.3.1/ipaddr-5.3.1.tbz"
   checksum: [
-    "sha256=f98d237cc1f783a0ba7dff0c6c69b5f519fec056950e3e3e7c15e5511ee5b7ec"
-    "sha512=28c8c4d525c2ab13e8561de5dfdb8922227ce652cd3c02e78c60daf2ba6844960864027c803f11fc3d1991a18ef864d8a0b95cd99e5f5d8452d3f66541367bd2"
+    "sha256=9820bcbccadb6e6d9e22fe26b2f9a044897c8f47c29d157f464b41a2f191e7d4"
+    "sha512=1d400f8344d1a8c2ac1c55e4a7167484034094e2227ce7c8f2f45843b0875a83030851400ceb96b5cdb756fa8798d83c77d839705fcb9e3f2bd5e46d337d63d0"
   ]
 }
-x-commit-hash: "7745ea4be2c1c5a7ab95908b26a6ed81a0947ab5"
+x-commit-hash: "4fe91c7a7774d829a65e711be5d7df1501bc2e75"
diff --git a/packages/upstream/memtrace.0.2.1.2/opam b/packages/upstream/memtrace.0.2.1.2/opam
index 7250e51e1..1a70cefa5 100644
--- a/packages/upstream/memtrace.0.2.1.2/opam
+++ b/packages/upstream/memtrace.0.2.1.2/opam
@@ -10,7 +10,7 @@ homepage: "https://github.com/janestreet/memtrace"
 bug-reports: "https://github.com/janestreet/memtrace/issues"
 depends: [
   "dune" {>= "2.3"}
-  "ocaml" {>= "4.11.0"}
+  "ocaml" {>= "4.11.0" & < "5.0"}
 ]
 build: [
   ["dune" "subst"] {dev}
diff --git a/packages/upstream/menhir.20211128/opam b/packages/upstream/menhir.20220210/opam
similarity index 67%
rename from packages/upstream/menhir.20211128/opam
rename to packages/upstream/menhir.20220210/opam
index 1bd891316..b4c75e72c 100644
--- a/packages/upstream/menhir.20211128/opam
+++ b/packages/upstream/menhir.20220210/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "menhir"
-version: "20211128"
+version: "20220210"
 synopsis: "An LR(1) parser generator"
 maintainer: "francois.pottier@inria.fr"
 authors: [
@@ -11,7 +11,7 @@ license: "LGPL-2.0-only with OCaml-LGPL-linking-exception"
 homepage: "http://gitlab.inria.fr/fpottier/menhir"
 bug-reports: "https://gitlab.inria.fr/fpottier/menhir/-/issues"
 depends: [
-  "ocaml" {>= "4.03.0" & < "5.00"}
+  "ocaml" {>= "4.03.0"}
   "dune" {>= "2.8.0"}
   "menhirLib" {= version}
   "menhirSdk" {= version}
@@ -20,9 +20,9 @@ build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://gitlab.inria.fr/fpottier/menhir.git"
 url {
   src:
-    "https://gitlab.inria.fr/fpottier/menhir/-/archive/20211128/archive.tar.gz"
+    "https://gitlab.inria.fr/fpottier/menhir/-/archive/20220210/archive.tar.gz"
   checksum: [
-    "md5=015354590ebce7911b073beae57e7731"
-    "sha512=76f998c114a29b390f05e7b62e396d6957e748be3bb7fe918893ab3471a7a907764de4610e392916553113df0c6b09aa570425dcf86c6a3e9e17b0ae36f3fe2b"
+    "md5=e3cef220f676c4b1c16cbccb174cefe3"
+    "sha512=3063fec1d8b9fe092c8461b0689d426c7fe381a2bf3fd258dc42ceecca1719d32efbb8a18d94ada5555c38175ea352da3adbb239fdbcbcf52c3a5c85a4d9586f"
   ]
 }
diff --git a/packages/upstream/menhirLib.20211128/opam b/packages/upstream/menhirLib.20220210/opam
similarity index 71%
rename from packages/upstream/menhirLib.20211128/opam
rename to packages/upstream/menhirLib.20220210/opam
index 2fda7d0d4..7a7b350e6 100644
--- a/packages/upstream/menhirLib.20211128/opam
+++ b/packages/upstream/menhirLib.20220210/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "menhirLib"
-version: "20211128"
+version: "20220210"
 synopsis: "Runtime support library for parsers generated by Menhir"
 maintainer: "francois.pottier@inria.fr"
 authors: [
@@ -21,9 +21,9 @@ build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://gitlab.inria.fr/fpottier/menhir.git"
 url {
   src:
-    "https://gitlab.inria.fr/fpottier/menhir/-/archive/20211128/archive.tar.gz"
+    "https://gitlab.inria.fr/fpottier/menhir/-/archive/20220210/archive.tar.gz"
   checksum: [
-    "md5=015354590ebce7911b073beae57e7731"
-    "sha512=76f998c114a29b390f05e7b62e396d6957e748be3bb7fe918893ab3471a7a907764de4610e392916553113df0c6b09aa570425dcf86c6a3e9e17b0ae36f3fe2b"
+    "md5=e3cef220f676c4b1c16cbccb174cefe3"
+    "sha512=3063fec1d8b9fe092c8461b0689d426c7fe381a2bf3fd258dc42ceecca1719d32efbb8a18d94ada5555c38175ea352da3adbb239fdbcbcf52c3a5c85a4d9586f"
   ]
 }
diff --git a/packages/upstream/menhirSdk.20211128/opam b/packages/upstream/menhirSdk.20220210/opam
similarity index 72%
rename from packages/upstream/menhirSdk.20211128/opam
rename to packages/upstream/menhirSdk.20220210/opam
index f7f57e315..b49e40dba 100644
--- a/packages/upstream/menhirSdk.20211128/opam
+++ b/packages/upstream/menhirSdk.20220210/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "menhirSdk"
-version: "20211128"
+version: "20220210"
 synopsis: "Compile-time library for auxiliary tools related to Menhir"
 maintainer: "francois.pottier@inria.fr"
 authors: [
@@ -21,9 +21,9 @@ build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://gitlab.inria.fr/fpottier/menhir.git"
 url {
   src:
-    "https://gitlab.inria.fr/fpottier/menhir/-/archive/20211128/archive.tar.gz"
+    "https://gitlab.inria.fr/fpottier/menhir/-/archive/20220210/archive.tar.gz"
   checksum: [
-    "md5=015354590ebce7911b073beae57e7731"
-    "sha512=76f998c114a29b390f05e7b62e396d6957e748be3bb7fe918893ab3471a7a907764de4610e392916553113df0c6b09aa570425dcf86c6a3e9e17b0ae36f3fe2b"
+    "md5=e3cef220f676c4b1c16cbccb174cefe3"
+    "sha512=3063fec1d8b9fe092c8461b0689d426c7fe381a2bf3fd258dc42ceecca1719d32efbb8a18d94ada5555c38175ea352da3adbb239fdbcbcf52c3a5c85a4d9586f"
   ]
 }
diff --git a/packages/upstream/mirage-block-unix.2.12.1/opam b/packages/upstream/mirage-block-unix.2.14.1/opam
similarity index 69%
rename from packages/upstream/mirage-block-unix.2.12.1/opam
rename to packages/upstream/mirage-block-unix.2.14.1/opam
index 28181ca08..b8b5714ef 100644
--- a/packages/upstream/mirage-block-unix.2.12.1/opam
+++ b/packages/upstream/mirage-block-unix.2.14.1/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "mirage-block-unix"
-version: "2.12.1"
+version: "2.14.1"
 synopsis: "MirageOS disk block driver for Unix"
 description: """\
 Unix implementation of the Mirage `BLOCK_DEVICE` interface.
@@ -17,17 +17,17 @@ bug-reports: "https://github.com/mirage/mirage-block-unix/issues"
 depends: [
   "ocaml" {>= "4.06.0"}
   "dune" {>= "1.0"}
-  "cstruct" {>= "3.0.0"}
+  "cstruct" {>= "6.0.0"}
   "cstruct-lwt"
-  "mirage-block" {>= "2.0.0" & < "3.0.0"}
+  "mirage-block" {>= "2.0.0"}
   "rresult"
-  "io-page" {>= "2.0.0"}
   "uri" {>= "1.9.0"}
   "logs"
-  "ounit" {with-test}
+  "lwt" {>= "5.4.2"}
+  "io-page" {>= "2.4.0"}
+  "ounit2" {with-test}
   "diet" {with-test & >= "0.4"}
   "fmt" {with-test}
-  "io-page-unix" {with-test}
   "conf-linux-libc-dev" {os = "linux"}
 ]
 build: [
@@ -38,9 +38,10 @@ build: [
 dev-repo: "git+https://github.com/mirage/mirage-block-unix.git"
 url {
   src:
-    "https://github.com/mirage/mirage-block-unix/releases/download/v2.12.1/mirage-block-unix-v2.12.1.tbz"
+    "https://github.com/mirage/mirage-block-unix/releases/download/v2.14.1/mirage-block-unix-2.14.1.tbz"
   checksum: [
-    "sha256=4fc0ccea3c06c654e149c0f0e1c2a6f19be4e3fe1afd293c6a0dba1b56b3b8c4"
-    "sha512=3a100b5641e5e2261af10e9720ecc32a1849085aaeec43ec5d983efe279c385dc813240272f68c08b51a1a09f041cb9ee2870fb176dc1c0858396bc6582657ad"
+    "sha256=15c5216e31ca4f5d5e3c35da015cd4755fd6387a313285f264a1b98a42a904d5"
+    "sha512=e37330d940b28749d0253ebb844face1a92b76fbbfa10e989aa001151d8749148375ac5c0af5b50e97fe900bcf5c156c704c4aba5167d247e229264bd6e09359"
   ]
 }
+x-commit-hash: "ef4d4496879925f4c2d09ee990cc19be64e1fc20"
diff --git a/packages/upstream/mirage-block.2.0.1/opam b/packages/upstream/mirage-block.3.0.0/opam
similarity index 61%
rename from packages/upstream/mirage-block.2.0.1/opam
rename to packages/upstream/mirage-block.3.0.0/opam
index 9d06c0c6e..0017afd4a 100644
--- a/packages/upstream/mirage-block.2.0.1/opam
+++ b/packages/upstream/mirage-block.3.0.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "mirage-block"
-version: "2.0.1"
+version: "3.0.0"
 synopsis: "Block signatures and implementations for MirageOS"
 description:
   "This repo contains generic operations over Mirage `BLOCK` devices."
@@ -12,10 +12,10 @@ homepage: "https://github.com/mirage/mirage-block"
 doc: "https://mirage.github.io/mirage-block/"
 bug-reports: "https://github.com/mirage/mirage-block/issues"
 depends: [
-  "ocaml" {>= "4.06.0"}
+  "ocaml" {>= "4.08.0"}
   "dune" {>= "1.0"}
-  "mirage-device" {>= "2.0.0"}
   "lwt" {>= "4.0.0"}
+  "fmt" {>= "0.8.7"}
   "cstruct" {>= "4.0.0"}
 ]
 build: [
@@ -25,9 +25,10 @@ build: [
 dev-repo: "git+https://github.com/mirage/mirage-block.git"
 url {
   src:
-    "https://github.com/mirage/mirage-block/releases/download/v2.0.1/mirage-block-v2.0.1.tbz"
+    "https://github.com/mirage/mirage-block/releases/download/v3.0.0/mirage-block-v3.0.0.tbz"
   checksum: [
-    "sha256=8cd1386e7a6ca2c9c3bf04102ed66bd72e3a40ead31abc9716317dd563e5e8f2"
-    "sha512=b894f9d7a2269521ce82e17371abc60fc0de76d7c93477e48c2f95baaa2f3d936eedd8e7aee8473252f77352a3ba0ef430ab0ae806a2d22ff75381349029b4c6"
+    "sha256=341e67269a6932d762d070e329c080a918cee2f21b00c7e73fddf83fe4a7ce65"
+    "sha512=57826493d421926aa54001c309cea8ef33bbd4ea7c05b35c23ee4483c9ea5ed6baf9ef078a9fbdf298c390b5976025e8875b2ed3ac078a4dee5667af39427291"
   ]
 }
+x-commit-hash: "f6c65a9520f7b4cb352ae179f189f78acdde82ae"
diff --git a/packages/upstream/mirage-clock-unix.3.1.0/opam b/packages/upstream/mirage-clock-unix.4.2.0/opam
similarity index 68%
rename from packages/upstream/mirage-clock-unix.3.1.0/opam
rename to packages/upstream/mirage-clock-unix.4.2.0/opam
index 646eff147..300814c77 100644
--- a/packages/upstream/mirage-clock-unix.3.1.0/opam
+++ b/packages/upstream/mirage-clock-unix.4.2.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "mirage-clock-unix"
-version: "3.1.0"
+version: "4.2.0"
 synopsis: "Unix-based implementation for the MirageOS Clock interface"
 description: """\
 The Unix implementation of the MirageOS Clock interface uses
@@ -14,8 +14,8 @@ homepage: "https://github.com/mirage/mirage-clock"
 doc: "https://mirage.github.io/mirage-clock/"
 bug-reports: "https://github.com/mirage/mirage-clock/issues"
 depends: [
-  "ocaml" {>= "4.06.0"}
-  "dune"
+  "ocaml" {>= "4.08.0"}
+  "dune" {>= "2.8"}
   "dune-configurator"
   "mirage-clock" {= version}
 ]
@@ -27,10 +27,10 @@ build: [
 dev-repo: "git+https://github.com/mirage/mirage-clock.git"
 url {
   src:
-    "https://github.com/mirage/mirage-clock/releases/download/v3.1.0/mirage-clock-v3.1.0.tbz"
+    "https://github.com/mirage/mirage-clock/releases/download/v4.2.0/mirage-clock-4.2.0.tbz"
   checksum: [
-    "sha256=b602556cda4f9819cd01c54791d6fe01cd9d9721d4051d7703bcaa89d5010a33"
-    "sha512=a1dbac3ae5671e02d77ebe5b9d8c53d787c0fcce59ec74a5d5ebd5ed28919d838ef6ab1c00ee18e0c261f7bafcb86de34548f1271129838b77654ee1a82ca4ff"
+    "sha256=fa17d15d5be23c79ba741f5f7cb88ed7112de16a4410cea81c71b98086889847"
+    "sha512=05a359dc8400d4ca200ff255dbd030acd33d2c4acb5020838f772c02cdb5f243f3dbafbc43a8cd51e6b5923a140f84c9e7ea25b2c0fa277bb68b996190d36e3b"
   ]
 }
-x-commit-hash: "987d197802f80778b7b3daa642caee0c27a1ce43"
+x-commit-hash: "f457572bfedb9586c8bf9eaa9ece7e53677856e3"
diff --git a/packages/upstream/mirage-clock.3.1.0/opam b/packages/upstream/mirage-clock.4.2.0/opam
similarity index 68%
rename from packages/upstream/mirage-clock.3.1.0/opam
rename to packages/upstream/mirage-clock.4.2.0/opam
index 1d8963fc2..f1682c510 100644
--- a/packages/upstream/mirage-clock.3.1.0/opam
+++ b/packages/upstream/mirage-clock.4.2.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "mirage-clock"
-version: "3.1.0"
+version: "4.2.0"
 synopsis: "Libraries and module types for portable clocks"
 description: """\
 This library implements portable support for an operating system timesource
@@ -18,8 +18,8 @@ homepage: "https://github.com/mirage/mirage-clock"
 doc: "https://mirage.github.io/mirage-clock/"
 bug-reports: "https://github.com/mirage/mirage-clock/issues"
 depends: [
-  "ocaml" {>= "4.06.0"}
-  "dune"
+  "ocaml" {>= "4.08.0"}
+  "dune" {>= "2.8"}
 ]
 build: [
   ["dune" "subst"] {dev}
@@ -28,10 +28,10 @@ build: [
 dev-repo: "git+https://github.com/mirage/mirage-clock.git"
 url {
   src:
-    "https://github.com/mirage/mirage-clock/releases/download/v3.1.0/mirage-clock-v3.1.0.tbz"
+    "https://github.com/mirage/mirage-clock/releases/download/v4.2.0/mirage-clock-4.2.0.tbz"
   checksum: [
-    "sha256=b602556cda4f9819cd01c54791d6fe01cd9d9721d4051d7703bcaa89d5010a33"
-    "sha512=a1dbac3ae5671e02d77ebe5b9d8c53d787c0fcce59ec74a5d5ebd5ed28919d838ef6ab1c00ee18e0c261f7bafcb86de34548f1271129838b77654ee1a82ca4ff"
+    "sha256=fa17d15d5be23c79ba741f5f7cb88ed7112de16a4410cea81c71b98086889847"
+    "sha512=05a359dc8400d4ca200ff255dbd030acd33d2c4acb5020838f772c02cdb5f243f3dbafbc43a8cd51e6b5923a140f84c9e7ea25b2c0fa277bb68b996190d36e3b"
   ]
 }
-x-commit-hash: "987d197802f80778b7b3daa642caee0c27a1ce43"
+x-commit-hash: "f457572bfedb9586c8bf9eaa9ece7e53677856e3"
diff --git a/packages/upstream/mirage-crypto-ec.0.10.7/opam b/packages/upstream/mirage-crypto-ec.0.10.7/opam
new file mode 100644
index 000000000..58e8d94b1
--- /dev/null
+++ b/packages/upstream/mirage-crypto-ec.0.10.7/opam
@@ -0,0 +1,64 @@
+opam-version: "2.0"
+name: "mirage-crypto-ec"
+version: "0.10.7"
+synopsis: "Elliptic Curve Cryptography with primitives taken from Fiat"
+description: """\
+An implementation of key exchange (ECDH) and digital signature (ECDSA/EdDSA)
+algorithms using code from Fiat (<https://github.com/mit-plv/fiat-crypto>).
+
+The curves P224 (SECP224R1), P256 (SECP256R1), P384 (SECP384R1),
+P521 (SECP521R1), and 25519 (X25519, Ed25519) are implemented by this package."""
+maintainer: "Hannes Mehnert <hannes@mehnert.org>"
+authors: [
+  "Hannes Mehnert <hannes@mehnert.org>"
+  "Nathan Rebours <nathan.p.rebours@gmail.com>"
+  "Clément Pascutto <clement@tarides.com>"
+  "Etienne Millon <me@emillon.org>"
+  "Andres Erbsen <andreser@mit.edu>"
+  "Google Inc."
+  "Jade Philipoom <jadep@mit.edu> <jade.philipoom@gmail.com>"
+  "Massachusetts Institute of Technology"
+  "Zoe Paraskevopoulou <zoe.paraskevopoulou@gmail.com>"
+]
+license: "MIT"
+tags: "org:mirage"
+homepage: "https://github.com/mirage/mirage-crypto"
+doc: "https://mirage.github.io/mirage-crypto/doc"
+bug-reports: "https://github.com/mirage/mirage-crypto/issues"
+depends: [
+  "conf-pkg-config" {build}
+  "dune" {>= "2.6"}
+  "ocaml" {>= "4.08.0"}
+  "cstruct" {>= "6.0.0"}
+  "dune-configurator"
+  "eqaf" {>= "0.7"}
+  "mirage-crypto" {= version}
+  "mirage-crypto-rng" {= version}
+  "mirage-crypto-pk" {with-test & = version}
+  "hex" {with-test}
+  "alcotest" {with-test}
+  "asn1-combinators" {with-test & >= "0.2.5"}
+  "ppx_deriving_yojson" {with-test}
+  "ppx_deriving" {with-test}
+  "yojson" {with-test & >= "1.6.0"}
+]
+depopts: ["ocaml-freestanding"]
+conflicts: [
+  "mirage-xen" {< "6.0.0"}
+  "ocaml-freestanding" {< "0.4.1"}
+]
+build: [
+  ["dune" "subst"] {dev}
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+]
+dev-repo: "git+https://github.com/mirage/mirage-crypto.git"
+url {
+  src:
+    "https://github.com/mirage/mirage-crypto/releases/download/v0.10.7/mirage-crypto-0.10.7.tbz"
+  checksum: [
+    "sha256=3e818a760c235c5b684c7b6b43b1cdd2a7dd04e0105b680d524f836eb988a69c"
+    "sha512=e9c3e6ac0fa3dae2dda9e91d5362ad08aaa65241b968a0c12484db4042146d6af7b46910784ce41bdd68783eede93f35a81aa37a2cd125dfc43503c78007b8b9"
+  ]
+}
+x-commit-hash: "d3e519f93d2d9df1fb366aaf96996803518c8597"
diff --git a/packages/upstream/mirage-crypto-pk.0.8.10/opam b/packages/upstream/mirage-crypto-pk.0.10.7/opam
similarity index 71%
rename from packages/upstream/mirage-crypto-pk.0.8.10/opam
rename to packages/upstream/mirage-crypto-pk.0.10.7/opam
index 222f667a2..f9165be10 100644
--- a/packages/upstream/mirage-crypto-pk.0.8.10/opam
+++ b/packages/upstream/mirage-crypto-pk.0.10.7/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "mirage-crypto-pk"
-version: "0.8.10"
+version: "0.10.7"
 synopsis: "Simple public-key cryptography for the modern age"
 description:
   "Mirage-crypto-pk provides public-key cryptography (RSA, DSA, DH)."
@@ -16,17 +16,16 @@ depends: [
   "conf-gmp-powm-sec" {build}
   "ocaml" {>= "4.08.0"}
   "dune" {>= "2.6"}
-  "ounit" {with-test}
+  "ounit2" {with-test}
   "randomconv" {with-test & >= "0.1.3"}
-  "cstruct" {>= "3.2.0"}
+  "cstruct" {>= "6.00"}
   "mirage-crypto" {= version}
   "mirage-crypto-rng" {= version}
-  "sexplib"
-  "ppx_sexp_conv"
+  "sexplib0"
   "zarith" {>= "1.4"}
-  "eqaf" {>= "0.7"}
-  "rresult" {>= "0.6.0"}
-  (("mirage-no-solo5" & "mirage-no-xen") | "zarith-freestanding")
+  "eqaf" {>= "0.8"}
+  (("mirage-no-solo5" & "mirage-no-xen") | "zarith-freestanding" |
+   "mirage-runtime" {>= "4.0"})
 ]
 conflicts: [
   "mirage-xen" {< "6.0.0"}
@@ -39,9 +38,10 @@ build: [
 dev-repo: "git+https://github.com/mirage/mirage-crypto.git"
 url {
   src:
-    "https://github.com/mirage/mirage-crypto/releases/download/v0.8.10/mirage-crypto-v0.8.10.tbz"
+    "https://github.com/mirage/mirage-crypto/releases/download/v0.10.7/mirage-crypto-0.10.7.tbz"
   checksum: [
-    "sha256=8a5976fe7837491d2fbd1917b77524776f70ae590e9f55cf757cc8951b5481fc"
-    "sha512=ea3a1717574d3dcc3e6ea1e930d2c0c0ffe4e69600886bff1bbaef88333f8ec7e603eb0fae4fe8dece7fc6eb5d7c300ff4e7d20ca276a336b78b401a7139ee77"
+    "sha256=3e818a760c235c5b684c7b6b43b1cdd2a7dd04e0105b680d524f836eb988a69c"
+    "sha512=e9c3e6ac0fa3dae2dda9e91d5362ad08aaa65241b968a0c12484db4042146d6af7b46910784ce41bdd68783eede93f35a81aa37a2cd125dfc43503c78007b8b9"
   ]
 }
+x-commit-hash: "d3e519f93d2d9df1fb366aaf96996803518c8597"
diff --git a/packages/upstream/mirage-crypto-rng.0.8.10/opam b/packages/upstream/mirage-crypto-rng.0.10.7/opam
similarity index 75%
rename from packages/upstream/mirage-crypto-rng.0.8.10/opam
rename to packages/upstream/mirage-crypto-rng.0.10.7/opam
index 7c8a2876c..313128181 100644
--- a/packages/upstream/mirage-crypto-rng.0.8.10/opam
+++ b/packages/upstream/mirage-crypto-rng.0.10.7/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "mirage-crypto-rng"
-version: "0.8.10"
+version: "0.10.7"
 synopsis: "A cryptographically secure PRNG"
 description: """\
 Mirage-crypto-rng provides a random number generator interface, and
@@ -19,10 +19,10 @@ depends: [
   "dune" {>= "2.6"}
   "dune-configurator" {>= "2.0.0"}
   "duration"
-  "cstruct" {>= "4.0.0"}
+  "cstruct" {>= "6.0.0"}
   "logs"
   "mirage-crypto" {= version}
-  "ounit" {with-test}
+  "ounit2" {with-test}
   "randomconv" {with-test & >= "0.1.3"}
   "mtime" {>= "1.0.0"}
   "lwt" {>= "4.0.0"}
@@ -38,9 +38,10 @@ build: [
 dev-repo: "git+https://github.com/mirage/mirage-crypto.git"
 url {
   src:
-    "https://github.com/mirage/mirage-crypto/releases/download/v0.8.10/mirage-crypto-v0.8.10.tbz"
+    "https://github.com/mirage/mirage-crypto/releases/download/v0.10.7/mirage-crypto-0.10.7.tbz"
   checksum: [
-    "sha256=8a5976fe7837491d2fbd1917b77524776f70ae590e9f55cf757cc8951b5481fc"
-    "sha512=ea3a1717574d3dcc3e6ea1e930d2c0c0ffe4e69600886bff1bbaef88333f8ec7e603eb0fae4fe8dece7fc6eb5d7c300ff4e7d20ca276a336b78b401a7139ee77"
+    "sha256=3e818a760c235c5b684c7b6b43b1cdd2a7dd04e0105b680d524f836eb988a69c"
+    "sha512=e9c3e6ac0fa3dae2dda9e91d5362ad08aaa65241b968a0c12484db4042146d6af7b46910784ce41bdd68783eede93f35a81aa37a2cd125dfc43503c78007b8b9"
   ]
 }
+x-commit-hash: "d3e519f93d2d9df1fb366aaf96996803518c8597"
diff --git a/packages/upstream/mirage-crypto.0.8.10/opam b/packages/upstream/mirage-crypto.0.10.7/opam
similarity index 70%
rename from packages/upstream/mirage-crypto.0.8.10/opam
rename to packages/upstream/mirage-crypto.0.10.7/opam
index f46f559ee..9de04200a 100644
--- a/packages/upstream/mirage-crypto.0.8.10/opam
+++ b/packages/upstream/mirage-crypto.0.10.7/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "mirage-crypto"
-version: "0.8.10"
+version: "0.10.7"
 synopsis: "Simple symmetric cryptography for the modern age"
 description: """\
 Mirage-crypto provides symmetric ciphers (DES, AES, RC4, ChaCha20/Poly1305), and
@@ -18,17 +18,15 @@ depends: [
   "ocaml" {>= "4.08.0"}
   "dune" {>= "2.6"}
   "dune-configurator" {>= "2.0.0"}
-  "ounit" {with-test}
-  "cstruct" {>= "3.2.0"}
-  "bigarray-compat"
-  "eqaf" {>= "0.7"}
+  "ounit2" {with-test}
+  "cstruct" {>= "6.0.0"}
+  "eqaf" {>= "0.8"}
 ]
 depopts: ["ocaml-freestanding"]
 conflicts: [
   "mirage-xen" {< "6.0.0"}
-  "ocaml-freestanding" {< "0.4.1"}
+  "ocaml-freestanding" {< "0.6.0"}
 ]
-available: arch != "s390x" & arch != "arm32"
 build: [
   ["dune" "subst"] {dev}
   ["dune" "build" "-p" name "-j" jobs]
@@ -37,9 +35,10 @@ build: [
 dev-repo: "git+https://github.com/mirage/mirage-crypto.git"
 url {
   src:
-    "https://github.com/mirage/mirage-crypto/releases/download/v0.8.10/mirage-crypto-v0.8.10.tbz"
+    "https://github.com/mirage/mirage-crypto/releases/download/v0.10.7/mirage-crypto-0.10.7.tbz"
   checksum: [
-    "sha256=8a5976fe7837491d2fbd1917b77524776f70ae590e9f55cf757cc8951b5481fc"
-    "sha512=ea3a1717574d3dcc3e6ea1e930d2c0c0ffe4e69600886bff1bbaef88333f8ec7e603eb0fae4fe8dece7fc6eb5d7c300ff4e7d20ca276a336b78b401a7139ee77"
+    "sha256=3e818a760c235c5b684c7b6b43b1cdd2a7dd04e0105b680d524f836eb988a69c"
+    "sha512=e9c3e6ac0fa3dae2dda9e91d5362ad08aaa65241b968a0c12484db4042146d6af7b46910784ce41bdd68783eede93f35a81aa37a2cd125dfc43503c78007b8b9"
   ]
 }
+x-commit-hash: "d3e519f93d2d9df1fb366aaf96996803518c8597"
diff --git a/packages/upstream/mirage-device.2.0.0/opam b/packages/upstream/mirage-device.2.0.0/opam
deleted file mode 100644
index f6e120be6..000000000
--- a/packages/upstream/mirage-device.2.0.0/opam
+++ /dev/null
@@ -1,47 +0,0 @@
-opam-version: "2.0"
-name: "mirage-device"
-version: "2.0.0"
-synopsis: "Abstract devices for MirageOS"
-description: """\
-mirage-device defines [Mirage_device.S][1], the signature for
-basic abstract devices for MirageOS and a pretty-printing function
-for device errors.
-
-[1]: https://mirage.github.io/mirage-device/Mirage_device.S.html"""
-maintainer: "thomas@gazagnaire.org"
-authors: [
-  "Thomas Gazagnaire"
-  "Anil Madhavapeddy"
-  "Gabriel Radanne"
-  "Mindy Preston"
-  "Thomas Leonard"
-  "Nicolas Ojeda Bar"
-  "Dave Scott"
-  "David Kaloper"
-  "Hannes Mehnert"
-  "Richard Mortier"
-]
-license: "ISC"
-tags: "org:mirage"
-homepage: "https://github.com/mirage/mirage-device"
-doc: "https://mirage.github.io/mirage-device/"
-bug-reports: "https://github.com/mirage/mirage-device/issues"
-depends: [
-  "ocaml" {>= "4.06.0"}
-  "dune" {>= "1.0"}
-  "fmt"
-  "lwt" {>= "4.0.0"}
-]
-build: [
-  ["dune" "subst"] {dev}
-  ["dune" "build" "-p" name "-j" jobs]
-]
-dev-repo: "git+https://github.com/mirage/mirage-device.git"
-url {
-  src:
-    "https://github.com/mirage/mirage-device/releases/download/v2.0.0/mirage-device-v2.0.0.tbz"
-  checksum: [
-    "sha256=04286c6728f280cf6ec53dc54e67d552b1375d5b544a45c9dab8536ea2ef54a1"
-    "sha512=f6718647230930927b8f870ff1dd9d55554473f555641154db83a2123a3bda002431616cf012fcb7a07ab1e5cde622a6b52b0cc804b73a77db55db5e1276c6da"
-  ]
-}
diff --git a/packages/upstream/mirage-time-unix.2.0.1/opam b/packages/upstream/mirage-time-unix.3.0.0/opam
similarity index 68%
rename from packages/upstream/mirage-time-unix.2.0.1/opam
rename to packages/upstream/mirage-time-unix.3.0.0/opam
index 221e5c830..5fa719a6f 100644
--- a/packages/upstream/mirage-time-unix.2.0.1/opam
+++ b/packages/upstream/mirage-time-unix.3.0.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "mirage-time-unix"
-version: "2.0.1"
+version: "3.0.0"
 synopsis: "Time operations for MirageOS on Unix"
 description:
   "mirage-time-unix defines `Time`, an implementation of the `Mirage_time.S` signature for the Unix backend."
@@ -23,7 +23,7 @@ homepage: "https://github.com/mirage/mirage-time"
 doc: "https://mirage.github.io/mirage-time/"
 bug-reports: "https://github.com/mirage/mirage-time/issues"
 depends: [
-  "ocaml" {>= "4.06.0"}
+  "ocaml" {>= "4.08.0"}
   "dune" {>= "1.0"}
   "mirage-time" {= version}
   "lwt" {>= "4.0.0"}
@@ -36,9 +36,10 @@ build: [
 dev-repo: "git+https://github.com/mirage/mirage-time.git"
 url {
   src:
-    "https://github.com/mirage/mirage-time/releases/download/v2.0.1/mirage-time-v2.0.1.tbz"
+    "https://github.com/mirage/mirage-time/releases/download/v3.0.0/mirage-time-v3.0.0.tbz"
   checksum: [
-    "sha256=002e06d2d2cf22bcb15e497f8c09d0618665b54b1a686681662930771ea9d5f0"
-    "sha512=0c195c00f4fd33453a12f3677bdaa89ce7055b39aa067b9ea0b4062aec51cfd8a591f2e9b291ad421e11ca57eebaf9b388d104322b9e1d34def7906a8c1b2963"
+    "sha256=0d40949b58e2c7e8b762ccc8ce066345046233c8c95d0e3d17a242ff289cbd7c"
+    "sha512=066f9271c7871eb754cf9b3f8853f4861ce80d1cc31eb9a2384f3cd62441e15aa7636d19cc3bee6d56219fa5653b9f7da7d9b9d659fd1f7cd17326e7ba1715eb"
   ]
 }
+x-commit-hash: "c68f199b1952f0656526a3212f82afd2a49c1f00"
diff --git a/packages/upstream/mirage-time.2.0.1/opam b/packages/upstream/mirage-time.3.0.0/opam
similarity index 67%
rename from packages/upstream/mirage-time.2.0.1/opam
rename to packages/upstream/mirage-time.3.0.0/opam
index 8f616af83..8eec64771 100644
--- a/packages/upstream/mirage-time.2.0.1/opam
+++ b/packages/upstream/mirage-time.3.0.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "mirage-time"
-version: "2.0.1"
+version: "3.0.0"
 synopsis: "Time operations for MirageOS"
 description:
   "mirage-time defines `Mirage_time.S`, the signature for time-related operations for MirageOS."
@@ -23,7 +23,7 @@ homepage: "https://github.com/mirage/mirage-time"
 doc: "https://mirage.github.io/mirage-time/"
 bug-reports: "https://github.com/mirage/mirage-time/issues"
 depends: [
-  "ocaml" {>= "4.06.0"}
+  "ocaml" {>= "4.08.0"}
   "dune" {>= "1.0"}
   "lwt" {>= "4.0.0"}
 ]
@@ -34,9 +34,10 @@ build: [
 dev-repo: "git+https://github.com/mirage/mirage-time.git"
 url {
   src:
-    "https://github.com/mirage/mirage-time/releases/download/v2.0.1/mirage-time-v2.0.1.tbz"
+    "https://github.com/mirage/mirage-time/releases/download/v3.0.0/mirage-time-v3.0.0.tbz"
   checksum: [
-    "sha256=002e06d2d2cf22bcb15e497f8c09d0618665b54b1a686681662930771ea9d5f0"
-    "sha512=0c195c00f4fd33453a12f3677bdaa89ce7055b39aa067b9ea0b4062aec51cfd8a591f2e9b291ad421e11ca57eebaf9b388d104322b9e1d34def7906a8c1b2963"
+    "sha256=0d40949b58e2c7e8b762ccc8ce066345046233c8c95d0e3d17a242ff289cbd7c"
+    "sha512=066f9271c7871eb754cf9b3f8853f4861ce80d1cc31eb9a2384f3cd62441e15aa7636d19cc3bee6d56219fa5653b9f7da7d9b9d659fd1f7cd17326e7ba1715eb"
   ]
 }
+x-commit-hash: "c68f199b1952f0656526a3212f82afd2a49c1f00"
diff --git a/packages/upstream/mmap.1.1.0/opam b/packages/upstream/mmap.1.1.0/opam
deleted file mode 100644
index 5d4d7b586..000000000
--- a/packages/upstream/mmap.1.1.0/opam
+++ /dev/null
@@ -1,23 +0,0 @@
-opam-version: "2.0"
-name: "mmap"
-version: "1.1.0"
-synopsis: "File mapping functionality"
-description:
-  "This project provides a Mmap.map_file functions for mapping files in memory."
-maintainer: "jeremie@dimino.org"
-authors: ["Jérémie Dimino <jeremie@dimino.org>" "Anton Bachin"]
-license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
-homepage: "https://github.com/mirage/mmap"
-doc: "https://mirage.github.io/mmap/"
-bug-reports: "https://github.com/mirage/mmap/issues"
-depends: [
-  "ocaml"
-  "dune" {>= "1.6"}
-]
-build: ["dune" "build" "-p" name "-j" jobs]
-dev-repo: "git+https://github.com/mirage/mmap.git"
-url {
-  src:
-    "https://github.com/mirage/mmap/releases/download/v1.1.0/mmap-v1.1.0.tbz"
-  checksum: "md5=8c5d5fbc537296dc525867535fb878ba"
-}
diff --git a/packages/upstream/num.1.4/opam b/packages/upstream/num.1.4/opam
index a18eba2ed..0239e3598 100644
--- a/packages/upstream/num.1.4/opam
+++ b/packages/upstream/num.1.4/opam
@@ -15,9 +15,13 @@ depends: [
 conflicts: ["base-num"]
 build: make
 install: [
-  make
-  "install" {!ocaml:preinstalled}
-  "findlib-install" {ocaml:preinstalled}
+  ["ocamlfind" "remove" "num"]
+  ["ocamlfind" "remove" "num-top"]
+  [
+    make
+    "install" {!ocaml:preinstalled}
+    "findlib-install" {ocaml:preinstalled}
+  ]
 ]
 dev-repo: "git+https://github.com/ocaml/num.git"
 url {
diff --git a/packages/upstream/ocaml-migrate-parsetree.2.3.0/opam b/packages/upstream/ocaml-migrate-parsetree.2.4.0/opam
similarity index 75%
rename from packages/upstream/ocaml-migrate-parsetree.2.3.0/opam
rename to packages/upstream/ocaml-migrate-parsetree.2.4.0/opam
index b7c21d531..5111a083f 100644
--- a/packages/upstream/ocaml-migrate-parsetree.2.3.0/opam
+++ b/packages/upstream/ocaml-migrate-parsetree.2.4.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ocaml-migrate-parsetree"
-version: "2.3.0"
+version: "2.4.0"
 synopsis: "Convert OCaml parsetrees between different versions"
 description: """\
 Convert OCaml parsetrees between different versions
@@ -20,7 +20,7 @@ doc: "https://ocaml-ppx.github.io/ocaml-migrate-parsetree/"
 bug-reports: "https://github.com/ocaml-ppx/ocaml-migrate-parsetree/issues"
 depends: [
   "dune" {>= "2.3"}
-  "ocaml" {>= "4.02.3" & < "4.15"}
+  "ocaml" {>= "4.02.3" & < "5.1"}
   "cinaps" {with-test & >= "v0.13.0"}
 ]
 conflicts: ["base-effects"]
@@ -29,10 +29,10 @@ run-test: ["dune" "runtest" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/ocaml-ppx/ocaml-migrate-parsetree.git"
 url {
   src:
-    "https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/v2.3.0/ocaml-migrate-parsetree-2.3.0.tbz"
+    "https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/2.4.0/ocaml-migrate-parsetree-2.4.0.tbz"
   checksum: [
-    "sha256=108126b247f190e04c8afd3d72ced0b63ffdf73c3f801f09be5db0cd7280bf0a"
-    "sha512=cccd766d33e2c70015735e050c2b7cdacf9f046e2874b563ef64b77706f56d004aa9b9df7d5cc201e5f3ba6e3267f95f654e1e3de58891b91f9c28a61988a9ee"
+    "sha256=ec49c452dc337a620556ab682bf0198bf50182550b502d8fb230a591260aa6a4"
+    "sha512=9478b9e5a969040400ee8fd7402bc4034f0f398d84e619254c43d5b7928463242629a2ccea35427f9747fbcedefa7ffc12edd1955ef8de866ba632e77f173219"
   ]
 }
-x-commit-hash: "7ef6ff49bfd7d6d816be61d3acea460af25d7d99"
+x-commit-hash: "4b05692f45f7a8456725ddc4d50b970e271c4278"
diff --git a/packages/upstream/ocaml-version.3.4.0/opam b/packages/upstream/ocaml-version.3.5.0/opam
similarity index 82%
rename from packages/upstream/ocaml-version.3.4.0/opam
rename to packages/upstream/ocaml-version.3.5.0/opam
index f2b30f3cc..136ea158d 100644
--- a/packages/upstream/ocaml-version.3.4.0/opam
+++ b/packages/upstream/ocaml-version.3.5.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ocaml-version"
-version: "3.4.0"
+version: "3.5.0"
 synopsis: "Manipulate, parse and generate OCaml compiler version strings"
 description: """\
 This library provides facilities to parse version numbers of the OCaml
@@ -41,10 +41,10 @@ build: [
 dev-repo: "git+https://github.com/ocurrent/ocaml-version.git"
 url {
   src:
-    "https://github.com/ocurrent/ocaml-version/releases/download/v3.4.0/ocaml-version-v3.4.0.tbz"
+    "https://github.com/ocurrent/ocaml-version/releases/download/v3.5.0/ocaml-version-3.5.0.tbz"
   checksum: [
-    "sha256=d8c1beb5e8d8ebb7710b5f434ce66a3ec8b752b1e4d6ba87c4fe27452bdb8a25"
-    "sha512=215e5b0c4ea5fa5461cdc0fc81fbd84a2a319a246a19504d0a0abc8c891e252a9e41644356150a1dc25d56b3f7e084db7a0b15becab4e1339992e645fc3d8ef1"
+    "sha256=d63ca1c3970d6b14057f7176bfdae623e6c0176287c6a6e8b78cf50e2f7f635b"
+    "sha512=7b5f475897b1c560c81d322ca77b80099025102ec4163b410518e32dce0d6decf7c2ef671f795932bc173741b20bb442e07b182583423d2c990c632c921be5df"
   ]
 }
-x-commit-hash: "c535ad2f463664b31001888fc99495dd01632747"
+x-commit-hash: "ee6c14c52e1995d69a134b23df2c1c721ea7a994"
diff --git a/packages/upstream/ocaml_intrinsics.v0.15.2/opam b/packages/upstream/ocaml_intrinsics.v0.15.2/opam
new file mode 100644
index 000000000..45d6585ba
--- /dev/null
+++ b/packages/upstream/ocaml_intrinsics.v0.15.2/opam
@@ -0,0 +1,29 @@
+opam-version: "2.0"
+name: "ocaml_intrinsics"
+version: "v0.15.2"
+synopsis: "Intrinsics"
+description: """\
+Provides functions to invoke amd64 instructions (such as clz,popcnt,rdtsc,rdpmc)
+     when available, or compatible software implementation on other targets."""
+maintainer: "Jane Street developers"
+authors: "Jane Street Group, LLC"
+license: "MIT"
+homepage: "https://github.com/janestreet/ocaml_intrinsics"
+doc:
+  "https://ocaml.janestreet.com/ocaml-core/latest/doc/ocaml_intrinsics/index.html"
+bug-reports: "https://github.com/janestreet/ocaml_intrinsics/issues"
+depends: [
+  "ocaml" {>= "4.08.0"}
+  "dune" {>= "2.0.0"}
+  "dune-configurator"
+]
+available:
+  (arch = "x86_32" | arch = "x86_64" | arch = "arm64") & os != "win32"
+build: ["dune" "build" "-p" name "-j" jobs]
+dev-repo: "git+https://github.com/janestreet/ocaml_intrinsics.git"
+url {
+  src:
+    "https://github.com/janestreet/ocaml_intrinsics/archive/refs/tags/v0.15.2.tar.gz"
+  checksum:
+    "sha256=92064a7fcebf1654d44f4d29abec0a9650505c3929b6d38fb293c2b69e5ca5ca"
+}
diff --git a/packages/upstream/ocamlbuild.0.14.0/opam b/packages/upstream/ocamlbuild.0.14.1/opam
similarity index 69%
rename from packages/upstream/ocamlbuild.0.14.0/opam
rename to packages/upstream/ocamlbuild.0.14.1/opam
index 5eb74020c..ac2b7d21d 100644
--- a/packages/upstream/ocamlbuild.0.14.0/opam
+++ b/packages/upstream/ocamlbuild.0.14.1/opam
@@ -1,11 +1,11 @@
 opam-version: "2.0"
 name: "ocamlbuild"
-version: "0.14.0"
+version: "0.14.1"
 synopsis:
-  "OCamlbuild is a build system with builtin rules to easily build most OCaml projects."
+  "OCamlbuild is a build system with builtin rules to easily build most OCaml projects"
 maintainer: "Gabriel Scherer <gabriel.scherer@gmail.com>"
 authors: ["Nicolas Pouillard" "Berke Durak"]
-license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
+license: "LGPL-2.0-or-later WITH OCaml-LGPL-linking-exception"
 homepage: "https://github.com/ocaml/ocamlbuild/"
 doc: "https://github.com/ocaml/ocamlbuild/blob/master/manual/manual.adoc"
 bug-reports: "https://github.com/ocaml/ocamlbuild/issues"
@@ -33,7 +33,9 @@ build: [
 ]
 dev-repo: "git+https://github.com/ocaml/ocamlbuild.git"
 url {
-  src: "https://github.com/ocaml/ocamlbuild/archive/0.14.0.tar.gz"
-  checksum:
-    "sha256=87b29ce96958096c0a1a8eeafeb6268077b2d11e1bf2b3de0f5ebc9cf8d42e78"
+  src: "https://github.com/ocaml/ocamlbuild/archive/refs/tags/0.14.1.tar.gz"
+  checksum: [
+    "md5=7027e507ed85f290923ad198f3d2cd1c"
+    "sha512=1f5b43215b1d3dc427b9c64e005add9d423ed4bca9686d52c55912df8955647cb2d7d86622d44b41b14c4f0d657b770c27967c541c868eeb7c78e3bd35b827ad"
+  ]
 }
diff --git a/packages/upstream/ocamlfind.1.9.3/opam b/packages/upstream/ocamlfind.1.9.3/opam
index e56ff1693..defdf772f 100644
--- a/packages/upstream/ocamlfind.1.9.3/opam
+++ b/packages/upstream/ocamlfind.1.9.3/opam
@@ -14,7 +14,7 @@ license: "MIT"
 homepage: "http://projects.camlcity.org/projects/findlib.html"
 bug-reports: "https://github.com/ocaml/ocamlfind/issues"
 depends: [
-  "ocaml" {>= "4.00.0"}
+  "ocaml" {>= "4.00.0" & < "5.0"}
 ]
 depopts: ["graphics"]
 build: [
diff --git a/packages/upstream/ocamlformat.0.19.0/opam b/packages/upstream/ocamlformat.0.19.0/opam
index c9b44f5c4..906f7b0af 100644
--- a/packages/upstream/ocamlformat.0.19.0/opam
+++ b/packages/upstream/ocamlformat.0.19.0/opam
@@ -14,7 +14,7 @@ depends: [
   "dune" {with-test & < "3.0"}
   "ocaml" {>= "4.08" & < "4.14"}
   "alcotest" {with-test}
-  "base" {>= "v0.12.0" & < "v0.15"}
+  "base" {>= "v0.12.0"}
   "base-unix"
   "cmdliner"
   "cmdliner" {with-test & < "1.1.0"}
@@ -28,7 +28,7 @@ depends: [
   "bisect_ppx" {dev & >= "2.5.0"}
   "odoc-parser" {>= "0.9.0" & < "1.0.0"}
   "re" {>= "1.7.2"}
-  "stdio" {< "v0.15"}
+  "stdio"
   "uuseg" {>= "10.0.0"}
   "uutf" {>= "1.0.1"}
   "odoc" {with-doc}
diff --git a/packages/upstream/octavius.1.2.2/opam b/packages/upstream/octavius.1.2.2/opam
deleted file mode 100644
index cef2a9c78..000000000
--- a/packages/upstream/octavius.1.2.2/opam
+++ /dev/null
@@ -1,34 +0,0 @@
-opam-version: "2.0"
-name: "octavius"
-version: "1.2.2"
-synopsis: "Ocamldoc comment syntax parser"
-description: "Octavius is a library to parse the `ocamldoc` comment syntax."
-maintainer: "leo@lpw25.net"
-authors: "Leo White <leo@lpw25.net>"
-license: "ISC"
-homepage: "https://github.com/ocaml-doc/octavius"
-doc: "http://ocaml-doc.github.io/octavius/"
-bug-reports: "https://github.com/ocaml-doc/octavius/issues"
-depends: [
-  "dune" {>= "1.11"}
-  "ocaml" {>= "4.03.0"}
-]
-build: [
-  ["dune" "subst"] {dev}
-  [
-    "dune"
-    "build"
-    "-p"
-    name
-    "-j"
-    jobs
-    "@install"
-    "@runtest" {with-test}
-    "@doc" {with-doc}
-  ]
-]
-dev-repo: "git+https://github.com/ocaml-doc/octavius.git"
-url {
-  src: "https://github.com/ocaml-doc/octavius/archive/v1.2.2.tar.gz"
-  checksum: "md5=72f9e1d996e6c5089fc513cc9218607b"
-}
diff --git a/packages/upstream/odoc-parser.0.9.0/opam b/packages/upstream/odoc-parser.0.9.0/opam
index 728a39007..5e42c35b7 100644
--- a/packages/upstream/odoc-parser.0.9.0/opam
+++ b/packages/upstream/odoc-parser.0.9.0/opam
@@ -14,7 +14,7 @@ doc: "https://ocaml-doc.github.io/odoc-parser/"
 bug-reports: "https://github.com/ocaml-doc/odoc-parser/issues"
 depends: [
   "dune" {>= "2.8"}
-  "ocaml" {>= "4.02.0"}
+  "ocaml" {>= "4.02.0" & < "5.0"}
   "astring"
   "result"
   "ppx_expect" {with-test}
diff --git a/packages/upstream/ounit.2.2.4/opam b/packages/upstream/ounit.2.2.6/opam
similarity index 64%
rename from packages/upstream/ounit.2.2.4/opam
rename to packages/upstream/ounit.2.2.6/opam
index d73f973f6..26e23430b 100644
--- a/packages/upstream/ounit.2.2.4/opam
+++ b/packages/upstream/ounit.2.2.6/opam
@@ -1,16 +1,16 @@
 opam-version: "2.0"
 name: "ounit"
-version: "2.2.4"
+version: "2.2.6"
 synopsis: "This is a transition package, ounit is now ounit2"
 description: """\
 More details for the transition:
 https://github.com/gildor478/ounit#transition-to-ounit2"""
 maintainer: "Sylvain Le Gall <sylvaini+ocaml@le-gall.net>"
 authors: ["Maas-Maarten Zeeman" "Sylvain Le Gall"]
+license: "MIT"
 homepage: "https://github.com/gildor478/ounit"
 doc: "https://gildor478.github.io/ounit/"
 bug-reports: "https://github.com/gildor478/ounit/issues"
-license: "MIT"
 depends: [
   "ocamlfind" {build}
   "ounit2" {= version}
@@ -19,10 +19,10 @@ install: [make "install-ounit" "version=%{version}%"]
 dev-repo: "git+https://github.com/gildor478/ounit.git"
 url {
   src:
-    "https://github.com/gildor478/ounit/releases/download/v2.2.4/ounit-v2.2.4.tbz"
+    "https://github.com/gildor478/ounit/releases/download/v2.2.6/ounit-2.2.6.tbz"
   checksum: [
-    "sha256=b5c069a5d957220ca0669e945f1e81e6b6db9622766d860913e136e1168e3345"
-    "sha512=d69dc501a360c31f7854322b5e2c2abcb1e43890737e1cc00c167ee104d5dee471b6b8d8186f8044b0482c91a8f15210a25d833a1e03ed7baabfba923815962f"
+    "sha256=0690fb1e0e90a18eed5c3566b3cc1825d98b0e8c7d51bb6b846c95c45a615913"
+    "sha512=d7cb36a1fe245d02afab606cd1ee755a178ee4cb18fbbfec1df32baa88fa90ef6c9a50d9fd5bde46c7fd9c481f2debe4bafac75c4e3bdfbdb63fc18b0ccce3cc"
   ]
 }
-x-commit-hash: "faf4936b17507406c7592186dcaa3f25c6fc138a"
+x-commit-hash: "77f01c482bd618eabde7c5065beae2d68db88723"
diff --git a/packages/upstream/ounit2.2.2.4/opam b/packages/upstream/ounit2.2.2.6/opam
similarity index 71%
rename from packages/upstream/ounit2.2.2.4/opam
rename to packages/upstream/ounit2.2.2.6/opam
index 891beb84f..1afbe7fb3 100644
--- a/packages/upstream/ounit2.2.2.4/opam
+++ b/packages/upstream/ounit2.2.2.6/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ounit2"
-version: "2.2.4"
+version: "2.2.6"
 synopsis: "OUnit testing framework"
 description: """\
 OUnit is a unit test framework for OCaml. It allows one to easily create
@@ -9,15 +9,16 @@ framework for Haskell. It is similar to [JUnit], and other XUnit testing
 frameworks."""
 maintainer: "Sylvain Le Gall <sylvaini+ocaml@le-gall.net>"
 authors: ["Maas-Maarten Zeeman" "Sylvain Le Gall"]
+license: "MIT"
 homepage: "https://github.com/gildor478/ounit"
 doc: "https://gildor478.github.io/ounit/"
 bug-reports: "https://github.com/gildor478/ounit/issues"
-license: "MIT"
 depends: [
   "ocaml" {>= "4.04.0"}
   "dune" {>= "1.11.0"}
   "base-bytes"
   "base-unix"
+  "seq"
   "stdlib-shims"
 ]
 build: [
@@ -28,10 +29,10 @@ build: [
 dev-repo: "git+https://github.com/gildor478/ounit.git"
 url {
   src:
-    "https://github.com/gildor478/ounit/releases/download/v2.2.4/ounit-v2.2.4.tbz"
+    "https://github.com/gildor478/ounit/releases/download/v2.2.6/ounit-2.2.6.tbz"
   checksum: [
-    "sha256=b5c069a5d957220ca0669e945f1e81e6b6db9622766d860913e136e1168e3345"
-    "sha512=d69dc501a360c31f7854322b5e2c2abcb1e43890737e1cc00c167ee104d5dee471b6b8d8186f8044b0482c91a8f15210a25d833a1e03ed7baabfba923815962f"
+    "sha256=0690fb1e0e90a18eed5c3566b3cc1825d98b0e8c7d51bb6b846c95c45a615913"
+    "sha512=d7cb36a1fe245d02afab606cd1ee755a178ee4cb18fbbfec1df32baa88fa90ef6c9a50d9fd5bde46c7fd9c481f2debe4bafac75c4e3bdfbdb63fc18b0ccce3cc"
   ]
 }
-x-commit-hash: "faf4936b17507406c7592186dcaa3f25c6fc138a"
+x-commit-hash: "77f01c482bd618eabde7c5065beae2d68db88723"
diff --git a/packages/upstream/parsexp.v0.14.1/opam b/packages/upstream/parsexp.v0.15.0/opam
similarity index 83%
rename from packages/upstream/parsexp.v0.14.1/opam
rename to packages/upstream/parsexp.v0.15.0/opam
index fe904adf8..d2a5a83c4 100644
--- a/packages/upstream/parsexp.v0.14.1/opam
+++ b/packages/upstream/parsexp.v0.15.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "parsexp"
-version: "v0.14.1"
+version: "v0.15.0"
 synopsis: "S-expression parsing library"
 description: """\
 This library provides generic parsers for parsing S-expressions from
@@ -29,15 +29,16 @@ homepage: "https://github.com/janestreet/parsexp"
 doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/parsexp/index.html"
 bug-reports: "https://github.com/janestreet/parsexp/issues"
 depends: [
-  "ocaml" {>= "4.04.2"}
-  "base" {>= "v0.14" & < "v0.15"}
-  "sexplib0" {>= "v0.14" & < "v0.15"}
+  "ocaml" {>= "4.08.0"}
+  "base" {>= "v0.15" & < "v0.16"}
+  "sexplib0" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/parsexp.git"
 url {
   src:
-    "https://github.com/janestreet/parsexp/archive/refs/tags/v0.14.1.tar.gz"
-  checksum: "md5=e6659d53f4d94de8979e05d17222b753"
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/parsexp-v0.15.0.tar.gz"
+  checksum:
+    "sha256=d1ee902b12ac7c0c888863025990d06845530fb75328454814e5ce5b6d43d193"
 }
diff --git a/packages/upstream/pbkdf.1.2.0/opam b/packages/upstream/pbkdf.1.2.0/opam
new file mode 100644
index 000000000..0f2fb2345
--- /dev/null
+++ b/packages/upstream/pbkdf.1.2.0/opam
@@ -0,0 +1,36 @@
+opam-version: "2.0"
+name: "pbkdf"
+version: "1.2.0"
+synopsis: "Password based key derivation functions (PBKDF) from PKCS#5"
+description: """\
+An implementation of PBKDF 1 and 2 as defined by [PKCS#5](https://tools.ietf.org/html/rfc2898) using
+ [mirage-crypto](https://github.com/mirage/mirage-crypto)"""
+maintainer: "Alfredo Beaumont <alfredo.beaumont@gmail.com>"
+authors: [
+  "Alfredo Beaumont <alfredo.beaumont@gmail.com>"
+  "Sonia Meruelo <smeruelo@gmail.com>"
+]
+license: "BSD-2-Clause"
+homepage: "https://github.com/abeaumont/ocaml-pbkdf"
+doc: "https://abeaumont.github.io/ocaml-pbkdf/"
+bug-reports: "https://github.com/abeaumont/ocaml-pbkdf/issues"
+depends: [
+  "ocaml" {>= "4.07.0"}
+  "dune" {>= "1.8.0"}
+  "cstruct" {>= "6.0.0"}
+  "mirage-crypto"
+  "alcotest" {with-test & >= "0.8.1"}
+]
+build: [
+  ["dune" "subst"] {dev}
+  ["dune" "build" "-j" jobs "-p" name "@install"]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+]
+dev-repo: "git+https://github.com/abeaumont/ocaml-pbkdf.git"
+url {
+  src: "https://github.com/abeaumont/ocaml-pbkdf/archive/1.2.0.tar.gz"
+  checksum: [
+    "md5=1e0e69de61b2d9d4f9843572ecc6655c"
+    "sha512=d6f7d5efd761b87dd420ddcf97c2f9d4402dcc81d65cd1f4d81039b70c4d8c1e803bbaf4251482de8de7076da9f40b48c7eb1684e31e7a316deb5036c192bd3c"
+  ]
+}
diff --git a/packages/upstream/ppx_assert.v0.14.0/opam b/packages/upstream/ppx_assert.v0.15.0/opam
similarity index 58%
rename from packages/upstream/ppx_assert.v0.14.0/opam
rename to packages/upstream/ppx_assert.v0.15.0/opam
index 9d114013d..b912da293 100644
--- a/packages/upstream/ppx_assert.v0.14.0/opam
+++ b/packages/upstream/ppx_assert.v0.15.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ppx_assert"
-version: "v0.14.0"
+version: "v0.15.0"
 synopsis: "Assert-like extension nodes that raise useful errors on failure"
 description: "Part of the Jane Street's PPX rewriters collection."
 maintainer: "Jane Street developers"
@@ -11,19 +11,20 @@ doc:
   "https://ocaml.janestreet.com/ocaml-core/latest/doc/ppx_assert/index.html"
 bug-reports: "https://github.com/janestreet/ppx_assert/issues"
 depends: [
-  "ocaml" {>= "4.04.2"}
-  "base" {>= "v0.14" & < "v0.15"}
-  "ppx_cold" {>= "v0.14" & < "v0.15"}
-  "ppx_compare" {>= "v0.14" & < "v0.15"}
-  "ppx_here" {>= "v0.14" & < "v0.15"}
-  "ppx_sexp_conv" {>= "v0.14" & < "v0.15"}
+  "ocaml" {>= "4.08.0"}
+  "base" {>= "v0.15" & < "v0.16"}
+  "ppx_cold" {>= "v0.15" & < "v0.16"}
+  "ppx_compare" {>= "v0.15" & < "v0.16"}
+  "ppx_here" {>= "v0.15" & < "v0.16"}
+  "ppx_sexp_conv" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
-  "ppxlib" {>= "0.11.0"}
+  "ppxlib" {>= "0.23.0"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/ppx_assert.git"
 url {
   src:
-    "https://ocaml.janestreet.com/ocaml-core/v0.14/files/ppx_assert-v0.14.0.tar.gz"
-  checksum: "md5=535b5f241eb7f10da8c044c26afbc186"
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/ppx_assert-v0.15.0.tar.gz"
+  checksum:
+    "sha256=4e5f653f84232569cd7d8e04d09ebba28b395e4be037c0b1e122e82cbe0f5967"
 }
diff --git a/packages/upstream/ppx_base.v0.14.0/opam b/packages/upstream/ppx_base.v0.15.0/opam
similarity index 59%
rename from packages/upstream/ppx_base.v0.14.0/opam
rename to packages/upstream/ppx_base.v0.15.0/opam
index 683c5ae6e..329db786e 100644
--- a/packages/upstream/ppx_base.v0.14.0/opam
+++ b/packages/upstream/ppx_base.v0.15.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ppx_base"
-version: "v0.14.0"
+version: "v0.15.0"
 synopsis: "Base set of ppx rewriters"
 description: """\
 ppx_base is the set of ppx rewriters used for Base.
@@ -14,20 +14,20 @@ homepage: "https://github.com/janestreet/ppx_base"
 doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/ppx_base/index.html"
 bug-reports: "https://github.com/janestreet/ppx_base/issues"
 depends: [
-  "ocaml" {>= "4.04.2"}
-  "ppx_cold" {>= "v0.14" & < "v0.15"}
-  "ppx_compare" {>= "v0.14" & < "v0.15"}
-  "ppx_enumerate" {>= "v0.14" & < "v0.15"}
-  "ppx_hash" {>= "v0.14" & < "v0.15"}
-  "ppx_js_style" {>= "v0.14" & < "v0.15"}
-  "ppx_sexp_conv" {>= "v0.14" & < "v0.15"}
+  "ocaml" {>= "4.08.0"}
+  "ppx_cold" {>= "v0.15" & < "v0.16"}
+  "ppx_compare" {>= "v0.15" & < "v0.16"}
+  "ppx_enumerate" {>= "v0.15" & < "v0.16"}
+  "ppx_hash" {>= "v0.15" & < "v0.16"}
+  "ppx_sexp_conv" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
-  "ppxlib" {>= "0.11.0"}
+  "ppxlib" {>= "0.23.0"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/ppx_base.git"
 url {
   src:
-    "https://ocaml.janestreet.com/ocaml-core/v0.14/files/ppx_base-v0.14.0.tar.gz"
-  checksum: "md5=b29a24907e60f42e050ad90e5209bb92"
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/ppx_base-v0.15.0.tar.gz"
+  checksum:
+    "sha256=d6bbad352ea547c9c0a3636abe87287d5a680b46a06ddd70d6126905853f3ca0"
 }
diff --git a/packages/upstream/ppx_bench.v0.14.1/opam b/packages/upstream/ppx_bench.v0.15.0/opam
similarity index 67%
rename from packages/upstream/ppx_bench.v0.14.1/opam
rename to packages/upstream/ppx_bench.v0.15.0/opam
index bd14da077..6d5d82fc2 100644
--- a/packages/upstream/ppx_bench.v0.14.1/opam
+++ b/packages/upstream/ppx_bench.v0.15.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ppx_bench"
-version: "v0.14.1"
+version: "v0.15.0"
 synopsis: "Syntax extension for writing in-line benchmarks in ocaml code"
 description: "Part of the Jane Street's PPX rewriters collection."
 maintainer: "Jane Street developers"
@@ -11,14 +11,16 @@ doc:
   "https://ocaml.janestreet.com/ocaml-core/latest/doc/ppx_bench/index.html"
 bug-reports: "https://github.com/janestreet/ppx_bench/issues"
 depends: [
-  "ocaml" {>= "4.04.2"}
-  "ppx_inline_test" {>= "v0.14" & < "v0.15"}
+  "ocaml" {>= "4.08.0"}
+  "ppx_inline_test" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
-  "ppxlib" {>= "0.14.0"}
+  "ppxlib" {>= "0.23.0"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/ppx_bench.git"
 url {
-  src: "https://github.com/janestreet/ppx_bench/archive/v0.14.1.tar.gz"
-  checksum: "md5=f2852170a6396d60d4fc1c156be1ec62"
+  src:
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/ppx_bench-v0.15.0.tar.gz"
+  checksum:
+    "sha256=b188c72c3ecd7273fbecece152da206df937263ed5bf0d3163e9a123a8c2e17e"
 }
diff --git a/packages/upstream/ppx_bin_prot.v0.14.0/opam b/packages/upstream/ppx_bin_prot.v0.15.0/opam
similarity index 63%
rename from packages/upstream/ppx_bin_prot.v0.14.0/opam
rename to packages/upstream/ppx_bin_prot.v0.15.0/opam
index e2cd75da3..7eb838647 100644
--- a/packages/upstream/ppx_bin_prot.v0.14.0/opam
+++ b/packages/upstream/ppx_bin_prot.v0.15.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ppx_bin_prot"
-version: "v0.14.0"
+version: "v0.15.0"
 synopsis: "Generation of bin_prot readers and writers from types"
 description: "Part of the Jane Street's PPX rewriters collection."
 maintainer: "Jane Street developers"
@@ -11,17 +11,18 @@ doc:
   "https://ocaml.janestreet.com/ocaml-core/latest/doc/ppx_bin_prot/index.html"
 bug-reports: "https://github.com/janestreet/ppx_bin_prot/issues"
 depends: [
-  "ocaml" {>= "4.04.2"}
-  "base" {>= "v0.14" & < "v0.15"}
-  "bin_prot" {>= "v0.14" & < "v0.15"}
-  "ppx_here" {>= "v0.14" & < "v0.15"}
+  "ocaml" {>= "4.08.0"}
+  "base" {>= "v0.15" & < "v0.16"}
+  "bin_prot" {>= "v0.15" & < "v0.16"}
+  "ppx_here" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
-  "ppxlib" {>= "0.11.0"}
+  "ppxlib" {>= "0.23.0"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/ppx_bin_prot.git"
 url {
   src:
-    "https://ocaml.janestreet.com/ocaml-core/v0.14/files/ppx_bin_prot-v0.14.0.tar.gz"
-  checksum: "md5=016e777c366b9b464f016d70ae4d7b7f"
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/ppx_bin_prot-v0.15.0.tar.gz"
+  checksum:
+    "sha256=b2c8e62211d9a3ae5f91984613b812e0416c73120a2a18b8670d131110154013"
 }
diff --git a/packages/upstream/ppx_cold.v0.14.0/opam b/packages/upstream/ppx_cold.v0.15.0/opam
similarity index 69%
rename from packages/upstream/ppx_cold.v0.14.0/opam
rename to packages/upstream/ppx_cold.v0.15.0/opam
index 10005e200..edad0cd05 100644
--- a/packages/upstream/ppx_cold.v0.14.0/opam
+++ b/packages/upstream/ppx_cold.v0.15.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ppx_cold"
-version: "v0.14.0"
+version: "v0.15.0"
 synopsis:
   "Expands [@cold] into [@inline never][@specialise never][@local never]"
 description: "Part of the Jane Street's PPX rewriters collection."
@@ -11,15 +11,16 @@ homepage: "https://github.com/janestreet/ppx_cold"
 doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/ppx_cold/index.html"
 bug-reports: "https://github.com/janestreet/ppx_cold/issues"
 depends: [
-  "ocaml" {>= "4.04.2"}
-  "base" {>= "v0.14" & < "v0.15"}
+  "ocaml" {>= "4.08.0"}
+  "base" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
-  "ppxlib" {>= "0.11.0"}
+  "ppxlib" {>= "0.23.0"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/ppx_cold.git"
 url {
   src:
-    "https://ocaml.janestreet.com/ocaml-core/v0.14/files/ppx_cold-v0.14.0.tar.gz"
-  checksum: "md5=6a61807cd3b105b8c885bd2076986339"
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/ppx_cold-v0.15.0.tar.gz"
+  checksum:
+    "sha256=8b9fae3341332411e46209d6639d75810260caa897aff4945500612db8abf88d"
 }
diff --git a/packages/upstream/ppx_compare.v0.14.0/opam b/packages/upstream/ppx_compare.v0.15.0/opam
similarity index 68%
rename from packages/upstream/ppx_compare.v0.14.0/opam
rename to packages/upstream/ppx_compare.v0.15.0/opam
index 93ff474e6..482d5616a 100644
--- a/packages/upstream/ppx_compare.v0.14.0/opam
+++ b/packages/upstream/ppx_compare.v0.15.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ppx_compare"
-version: "v0.14.0"
+version: "v0.15.0"
 synopsis: "Generation of comparison functions from types"
 description: "Part of the Jane Street's PPX rewriters collection."
 maintainer: "Jane Street developers"
@@ -11,15 +11,16 @@ doc:
   "https://ocaml.janestreet.com/ocaml-core/latest/doc/ppx_compare/index.html"
 bug-reports: "https://github.com/janestreet/ppx_compare/issues"
 depends: [
-  "ocaml" {>= "4.04.2"}
-  "base" {>= "v0.14" & < "v0.15"}
+  "ocaml" {>= "4.08.0"}
+  "base" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
-  "ppxlib" {>= "0.11.0"}
+  "ppxlib" {>= "0.23.0"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/ppx_compare.git"
 url {
   src:
-    "https://ocaml.janestreet.com/ocaml-core/v0.14/files/ppx_compare-v0.14.0.tar.gz"
-  checksum: "md5=9149b3a0c954fe2cef2b0705d254b9e3"
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/ppx_compare-v0.15.0.tar.gz"
+  checksum:
+    "sha256=6a0728929a7b591dffa0f1099d989854f871238697c70b34475eb9ffdce17385"
 }
diff --git a/packages/upstream/ppx_custom_printf.v0.14.1/opam b/packages/upstream/ppx_custom_printf.v0.15.0/opam
similarity index 66%
rename from packages/upstream/ppx_custom_printf.v0.14.1/opam
rename to packages/upstream/ppx_custom_printf.v0.15.0/opam
index a4a3ba0c4..635dacf27 100644
--- a/packages/upstream/ppx_custom_printf.v0.14.1/opam
+++ b/packages/upstream/ppx_custom_printf.v0.15.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ppx_custom_printf"
-version: "v0.14.1"
+version: "v0.15.0"
 synopsis: "Printf-style format-strings for user-defined string conversion"
 description: "Part of the Jane Street's PPX rewriters collection."
 maintainer: "Jane Street developers"
@@ -11,16 +11,17 @@ doc:
   "https://ocaml.janestreet.com/ocaml-core/latest/doc/ppx_custom_printf/index.html"
 bug-reports: "https://github.com/janestreet/ppx_custom_printf/issues"
 depends: [
-  "ocaml" {>= "4.04.2"}
-  "base" {>= "v0.14" & < "v0.15"}
-  "ppx_sexp_conv" {>= "v0.14" & < "v0.15"}
+  "ocaml" {>= "4.08.0"}
+  "base" {>= "v0.15" & < "v0.16"}
+  "ppx_sexp_conv" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
-  "ppxlib" {>= "0.18.0"}
+  "ppxlib" {>= "0.23.0"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/ppx_custom_printf.git"
 url {
   src:
-    "https://github.com/janestreet/ppx_custom_printf/archive/v0.14.1.tar.gz"
-  checksum: "md5=18518b0464d61d165f4c73475d648ccb"
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/ppx_custom_printf-v0.15.0.tar.gz"
+  checksum:
+    "sha256=ae0ca7773cdbabf8caac90353c953fc4654ad3d988219c7ce6a03b08f2a3a680"
 }
diff --git a/packages/upstream/ppx_disable_unused_warnings.v0.15.0/opam b/packages/upstream/ppx_disable_unused_warnings.v0.15.0/opam
new file mode 100644
index 000000000..5292e0f51
--- /dev/null
+++ b/packages/upstream/ppx_disable_unused_warnings.v0.15.0/opam
@@ -0,0 +1,28 @@
+opam-version: "2.0"
+name: "ppx_disable_unused_warnings"
+version: "v0.15.0"
+synopsis:
+  "Expands [@disable_unused_warnings] into [@warning \"-20-26-32-33-34-35-36-37-38-39-60-66-67\"]"
+description: "Part of the Jane Street's PPX rewriters collection."
+maintainer: "Jane Street developers"
+authors: "Jane Street Group, LLC"
+license: "MIT"
+homepage: "https://github.com/janestreet/ppx_disable_unused_warnings"
+doc:
+  "https://ocaml.janestreet.com/ocaml-core/latest/doc/ppx_disable_unused_warnings/index.html"
+bug-reports:
+  "https://github.com/janestreet/ppx_disable_unused_warnings/issues"
+depends: [
+  "ocaml" {>= "4.08.0"}
+  "base" {>= "v0.15" & < "v0.16"}
+  "dune" {>= "2.0.0"}
+  "ppxlib" {>= "0.23.0"}
+]
+build: ["dune" "build" "-p" name "-j" jobs]
+dev-repo: "git+https://github.com/janestreet/ppx_disable_unused_warnings.git"
+url {
+  src:
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/ppx_disable_unused_warnings-v0.15.0.tar.gz"
+  checksum:
+    "sha256=aeab318cb7541f9b22da50268492ff9d161ece9003ed5b1977917da346f6eebe"
+}
diff --git a/packages/upstream/ppx_enumerate.v0.14.0/opam b/packages/upstream/ppx_enumerate.v0.15.0/opam
similarity index 69%
rename from packages/upstream/ppx_enumerate.v0.14.0/opam
rename to packages/upstream/ppx_enumerate.v0.15.0/opam
index 2695d7287..63a8e0f5b 100644
--- a/packages/upstream/ppx_enumerate.v0.14.0/opam
+++ b/packages/upstream/ppx_enumerate.v0.15.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ppx_enumerate"
-version: "v0.14.0"
+version: "v0.15.0"
 synopsis: "Generate a list containing all values of a finite type"
 description: "Part of the Jane Street's PPX rewriters collection."
 maintainer: "Jane Street developers"
@@ -11,15 +11,16 @@ doc:
   "https://ocaml.janestreet.com/ocaml-core/latest/doc/ppx_enumerate/index.html"
 bug-reports: "https://github.com/janestreet/ppx_enumerate/issues"
 depends: [
-  "ocaml" {>= "4.04.2"}
-  "base" {>= "v0.14" & < "v0.15"}
+  "ocaml" {>= "4.08.0"}
+  "base" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
-  "ppxlib" {>= "0.11.0"}
+  "ppxlib" {>= "0.23.0"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/ppx_enumerate.git"
 url {
   src:
-    "https://ocaml.janestreet.com/ocaml-core/v0.14/files/ppx_enumerate-v0.14.0.tar.gz"
-  checksum: "md5=188421af960759f6e45dd748f4f08e8d"
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/ppx_enumerate-v0.15.0.tar.gz"
+  checksum:
+    "sha256=deb5fb9ca12ade3e4fb8093f1cfdf50a03735b9db19a7535ad534331fb98d09b"
 }
diff --git a/packages/upstream/ppx_expect.v0.14.2/opam b/packages/upstream/ppx_expect.v0.15.1/opam
similarity index 60%
rename from packages/upstream/ppx_expect.v0.14.2/opam
rename to packages/upstream/ppx_expect.v0.15.1/opam
index 5f5e95821..00d9a21a0 100644
--- a/packages/upstream/ppx_expect.v0.14.2/opam
+++ b/packages/upstream/ppx_expect.v0.15.1/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ppx_expect"
-version: "v0.14.2"
+version: "v0.15.1"
 synopsis: "Cram like framework for OCaml"
 description: "Part of the Jane Street's PPX rewriters collection."
 maintainer: "Jane Street developers"
@@ -11,18 +11,20 @@ doc:
   "https://ocaml.janestreet.com/ocaml-core/latest/doc/ppx_expect/index.html"
 bug-reports: "https://github.com/janestreet/ppx_expect/issues"
 depends: [
-  "ocaml" {>= "4.04.2"}
-  "base" {>= "v0.14" & < "v0.15"}
-  "ppx_here" {>= "v0.14" & < "v0.15"}
-  "ppx_inline_test" {>= "v0.14" & < "v0.15"}
-  "stdio" {>= "v0.14" & < "v0.15"}
+  "ocaml" {>= "4.08.0"}
+  "base" {>= "v0.15" & < "v0.16"}
+  "ppx_here" {>= "v0.15" & < "v0.16"}
+  "ppx_inline_test" {>= "v0.15" & < "v0.16"}
+  "stdio" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
-  "ppxlib" {>= "0.18.0"}
+  "ppxlib" {>= "0.23.0"}
   "re" {>= "1.8.0"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/ppx_expect.git"
 url {
-  src: "https://github.com/janestreet/ppx_expect/archive/v0.14.2.tar.gz"
-  checksum: "md5=ce1bb859cf695eb8f165fe1e03fff2c1"
+  src:
+    "https://github.com/janestreet/ppx_expect/archive/refs/tags/v0.15.1.tar.gz"
+  checksum:
+    "sha256=dd3eaa86e921501414dac6b2f68238ff5455a0f7bec13f851dc51eba2f9a2097"
 }
diff --git a/packages/upstream/ppx_fields_conv.v0.14.2/opam b/packages/upstream/ppx_fields_conv.v0.15.0/opam
similarity index 66%
rename from packages/upstream/ppx_fields_conv.v0.14.2/opam
rename to packages/upstream/ppx_fields_conv.v0.15.0/opam
index d910e30b1..2498bd545 100644
--- a/packages/upstream/ppx_fields_conv.v0.14.2/opam
+++ b/packages/upstream/ppx_fields_conv.v0.15.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ppx_fields_conv"
-version: "v0.14.2"
+version: "v0.15.0"
 synopsis: "Generation of accessor and iteration functions for ocaml records"
 description: "Part of the Jane Street's PPX rewriters collection."
 maintainer: "Jane Street developers"
@@ -11,15 +11,17 @@ doc:
   "https://ocaml.janestreet.com/ocaml-core/latest/doc/ppx_fields_conv/index.html"
 bug-reports: "https://github.com/janestreet/ppx_fields_conv/issues"
 depends: [
-  "ocaml" {>= "4.04.2"}
-  "base" {>= "v0.14" & < "v0.15"}
-  "fieldslib" {>= "v0.14" & < "v0.15"}
+  "ocaml" {>= "4.08.0"}
+  "base" {>= "v0.15" & < "v0.16"}
+  "fieldslib" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
-  "ppxlib" {>= "0.18.0"}
+  "ppxlib" {>= "0.23.0"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/ppx_fields_conv.git"
 url {
-  src: "https://github.com/janestreet/ppx_fields_conv/archive/v0.14.2.tar.gz"
-  checksum: "md5=f9ff1b882775718cba29bd67839405f0"
+  src:
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/ppx_fields_conv-v0.15.0.tar.gz"
+  checksum:
+    "sha256=d22ab3b63b043baf67e2bf9f2a7d92da625b46afc0230f925aef732bd1b62e61"
 }
diff --git a/packages/upstream/ppx_fixed_literal.v0.14.0/opam b/packages/upstream/ppx_fixed_literal.v0.15.0/opam
similarity index 71%
rename from packages/upstream/ppx_fixed_literal.v0.14.0/opam
rename to packages/upstream/ppx_fixed_literal.v0.15.0/opam
index eac6e5497..21e98caa9 100644
--- a/packages/upstream/ppx_fixed_literal.v0.14.0/opam
+++ b/packages/upstream/ppx_fixed_literal.v0.15.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ppx_fixed_literal"
-version: "v0.14.0"
+version: "v0.15.0"
 synopsis: "Simpler notation for fixed point literals"
 description: """\
 A ppx rewriter that rewrites fixed point literal of the 
@@ -13,15 +13,16 @@ doc:
   "https://ocaml.janestreet.com/ocaml-core/latest/doc/ppx_fixed_literal/index.html"
 bug-reports: "https://github.com/janestreet/ppx_fixed_literal/issues"
 depends: [
-  "ocaml" {>= "4.04.2"}
-  "base" {>= "v0.14" & < "v0.15"}
+  "ocaml" {>= "4.08.0"}
+  "base" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
-  "ppxlib" {>= "0.11.0"}
+  "ppxlib" {>= "0.23.0"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/ppx_fixed_literal.git"
 url {
   src:
-    "https://ocaml.janestreet.com/ocaml-core/v0.14/files/ppx_fixed_literal-v0.14.0.tar.gz"
-  checksum: "md5=960bff66d1119cef42c16027e204554f"
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/ppx_fixed_literal-v0.15.0.tar.gz"
+  checksum:
+    "sha256=f04136ce33f999c08cadb92a17f371b4dcb086a7ae0039e5c2c86b2ce985a9fc"
 }
diff --git a/packages/upstream/ppx_hash.v0.14.0/opam b/packages/upstream/ppx_hash.v0.15.0/opam
similarity index 63%
rename from packages/upstream/ppx_hash.v0.14.0/opam
rename to packages/upstream/ppx_hash.v0.15.0/opam
index c9f9c7b33..95105569c 100644
--- a/packages/upstream/ppx_hash.v0.14.0/opam
+++ b/packages/upstream/ppx_hash.v0.15.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ppx_hash"
-version: "v0.14.0"
+version: "v0.15.0"
 synopsis:
   "A ppx rewriter that generates hash functions from type expressions and definitions"
 description: "Part of the Jane Street's PPX rewriters collection."
@@ -11,17 +11,18 @@ homepage: "https://github.com/janestreet/ppx_hash"
 doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/ppx_hash/index.html"
 bug-reports: "https://github.com/janestreet/ppx_hash/issues"
 depends: [
-  "ocaml" {>= "4.04.2"}
-  "base" {>= "v0.14" & < "v0.15"}
-  "ppx_compare" {>= "v0.14" & < "v0.15"}
-  "ppx_sexp_conv" {>= "v0.14" & < "v0.15"}
+  "ocaml" {>= "4.08.0"}
+  "base" {>= "v0.15" & < "v0.16"}
+  "ppx_compare" {>= "v0.15" & < "v0.16"}
+  "ppx_sexp_conv" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
-  "ppxlib" {>= "0.11.0"}
+  "ppxlib" {>= "0.23.0"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/ppx_hash.git"
 url {
   src:
-    "https://ocaml.janestreet.com/ocaml-core/v0.14/files/ppx_hash-v0.14.0.tar.gz"
-  checksum: "md5=b78aee19bb4469731f9626b04fe7f341"
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/ppx_hash-v0.15.0.tar.gz"
+  checksum:
+    "sha256=45bb666a0f93aab5bc120126c4c7d4081d611c64969606799248b2d8418d1711"
 }
diff --git a/packages/upstream/ppx_here.v0.14.0/opam b/packages/upstream/ppx_here.v0.15.0/opam
similarity index 67%
rename from packages/upstream/ppx_here.v0.14.0/opam
rename to packages/upstream/ppx_here.v0.15.0/opam
index 99d109638..75c767de1 100644
--- a/packages/upstream/ppx_here.v0.14.0/opam
+++ b/packages/upstream/ppx_here.v0.15.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ppx_here"
-version: "v0.14.0"
+version: "v0.15.0"
 synopsis: "Expands [%here] into its location"
 description: "Part of the Jane Street's PPX rewriters collection."
 maintainer: "Jane Street developers"
@@ -10,15 +10,16 @@ homepage: "https://github.com/janestreet/ppx_here"
 doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/ppx_here/index.html"
 bug-reports: "https://github.com/janestreet/ppx_here/issues"
 depends: [
-  "ocaml" {>= "4.04.2"}
-  "base" {>= "v0.14" & < "v0.15"}
+  "ocaml" {>= "4.08.0"}
+  "base" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
-  "ppxlib" {>= "0.11.0"}
+  "ppxlib" {>= "0.23.0"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/ppx_here.git"
 url {
   src:
-    "https://ocaml.janestreet.com/ocaml-core/v0.14/files/ppx_here-v0.14.0.tar.gz"
-  checksum: "md5=bb3bbde0964a1f866de09f3df44def4d"
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/ppx_here-v0.15.0.tar.gz"
+  checksum:
+    "sha256=c5bc027c938a4893267c12e5ded6d7391b89851cf69094154ad9d824c3e0cadf"
 }
diff --git a/packages/upstream/ppx_ignore_instrumentation.v0.15.0/opam b/packages/upstream/ppx_ignore_instrumentation.v0.15.0/opam
new file mode 100644
index 000000000..549bacd90
--- /dev/null
+++ b/packages/upstream/ppx_ignore_instrumentation.v0.15.0/opam
@@ -0,0 +1,28 @@
+opam-version: "2.0"
+name: "ppx_ignore_instrumentation"
+version: "v0.15.0"
+synopsis: "Ignore Jane Street specific instrumentation extensions"
+description: """\
+Ignore Jane Street specific instrumentation extensions from internal PPXs or compiler 
+   features not yet upstreamed."""
+maintainer: "Jane Street developers"
+authors: "Jane Street Group, LLC"
+license: "MIT"
+homepage: "https://github.com/janestreet/ppx_ignore_instrumentation"
+doc:
+  "https://ocaml.janestreet.com/ocaml-core/latest/doc/ppx_ignore_instrumentation/index.html"
+bug-reports:
+  "https://github.com/janestreet/ppx_ignore_instrumentation/issues"
+depends: [
+  "ocaml" {>= "4.08.0"}
+  "dune" {>= "2.0.0"}
+  "ppxlib" {>= "0.23.0"}
+]
+build: ["dune" "build" "-p" name "-j" jobs]
+dev-repo: "git+https://github.com/janestreet/ppx_ignore_instrumentation.git"
+url {
+  src:
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/ppx_ignore_instrumentation-v0.15.0.tar.gz"
+  checksum:
+    "sha256=22441d1be03937f32cb329cd5863fcb2d7d7e3f74bacce73b19bc0fd14a89f02"
+}
diff --git a/packages/upstream/ppx_inline_test.v0.14.1/opam b/packages/upstream/ppx_inline_test.v0.15.0/opam
similarity index 65%
rename from packages/upstream/ppx_inline_test.v0.14.1/opam
rename to packages/upstream/ppx_inline_test.v0.15.0/opam
index 52dc590bb..82cd95ba2 100644
--- a/packages/upstream/ppx_inline_test.v0.14.1/opam
+++ b/packages/upstream/ppx_inline_test.v0.15.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ppx_inline_test"
-version: "v0.14.1"
+version: "v0.15.0"
 synopsis: "Syntax extension for writing in-line tests in ocaml code"
 description: "Part of the Jane Street's PPX rewriters collection."
 maintainer: "Jane Street developers"
@@ -11,15 +11,17 @@ doc:
   "https://ocaml.janestreet.com/ocaml-core/latest/doc/ppx_inline_test/index.html"
 bug-reports: "https://github.com/janestreet/ppx_inline_test/issues"
 depends: [
-  "ocaml" {>= "4.04.2"}
-  "base" {>= "v0.14" & < "v0.15"}
-  "time_now" {>= "v0.14" & < "v0.15"}
+  "ocaml" {>= "4.08.0"}
+  "base" {>= "v0.15" & < "v0.16"}
+  "time_now" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
-  "ppxlib" {>= "0.14.0"}
+  "ppxlib" {>= "0.23.0"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/ppx_inline_test.git"
 url {
-  src: "https://github.com/janestreet/ppx_inline_test/archive/v0.14.1.tar.gz"
-  checksum: "md5=132754f0757188c3b700a2c5b6a2fb3f"
+  src:
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/ppx_inline_test-v0.15.0.tar.gz"
+  checksum:
+    "sha256=3f78d141abc4a8e2ff69354299f8b2215ad33aa79a36a7f7fb82635e4ea1871b"
 }
diff --git a/packages/upstream/ppx_jane.v0.14.0/opam b/packages/upstream/ppx_jane.v0.14.0/opam
deleted file mode 100644
index 2233c2d4a..000000000
--- a/packages/upstream/ppx_jane.v0.14.0/opam
+++ /dev/null
@@ -1,47 +0,0 @@
-opam-version: "2.0"
-name: "ppx_jane"
-version: "v0.14.0"
-synopsis: "Standard Jane Street ppx rewriters"
-description: """\
-This package installs a ppx-jane executable, which is a ppx driver
-including all standard Jane Street ppx rewriters."""
-maintainer: "Jane Street developers"
-authors: "Jane Street Group, LLC"
-license: "MIT"
-homepage: "https://github.com/janestreet/ppx_jane"
-doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/ppx_jane/index.html"
-bug-reports: "https://github.com/janestreet/ppx_jane/issues"
-depends: [
-  "ocaml" {>= "4.04.2"}
-  "base_quickcheck" {>= "v0.14" & < "v0.15"}
-  "ppx_assert" {>= "v0.14" & < "v0.15"}
-  "ppx_base" {>= "v0.14" & < "v0.15"}
-  "ppx_bench" {>= "v0.14" & < "v0.15"}
-  "ppx_bin_prot" {>= "v0.14" & < "v0.15"}
-  "ppx_custom_printf" {>= "v0.14" & < "v0.15"}
-  "ppx_expect" {>= "v0.14" & < "v0.15"}
-  "ppx_fields_conv" {>= "v0.14" & < "v0.15"}
-  "ppx_fixed_literal"
-  "ppx_here" {>= "v0.14" & < "v0.15"}
-  "ppx_inline_test" {>= "v0.14" & < "v0.15"}
-  "ppx_let" {>= "v0.14" & < "v0.15"}
-  "ppx_module_timer" {>= "v0.14" & < "v0.15"}
-  "ppx_optcomp" {>= "v0.14" & < "v0.15"}
-  "ppx_optional" {>= "v0.14" & < "v0.15"}
-  "ppx_pipebang" {>= "v0.14" & < "v0.15"}
-  "ppx_sexp_message" {>= "v0.14" & < "v0.15"}
-  "ppx_sexp_value" {>= "v0.14" & < "v0.15"}
-  "ppx_stable" {>= "v0.14" & < "v0.15"}
-  "ppx_string" {>= "v0.14" & < "v0.15"}
-  "ppx_typerep_conv" {>= "v0.14" & < "v0.15"}
-  "ppx_variants_conv" {>= "v0.14" & < "v0.15"}
-  "dune" {>= "2.0.0"}
-  "ppxlib" {>= "0.11.0"}
-]
-build: ["dune" "build" "-p" name "-j" jobs]
-dev-repo: "git+https://github.com/janestreet/ppx_jane.git"
-url {
-  src:
-    "https://ocaml.janestreet.com/ocaml-core/v0.14/files/ppx_jane-v0.14.0.tar.gz"
-  checksum: "md5=ce8e39f9fe7ddcaf821e468a27766083"
-}
diff --git a/packages/upstream/ppx_jane.v0.15.0/opam b/packages/upstream/ppx_jane.v0.15.0/opam
new file mode 100644
index 000000000..4658483c5
--- /dev/null
+++ b/packages/upstream/ppx_jane.v0.15.0/opam
@@ -0,0 +1,51 @@
+opam-version: "2.0"
+name: "ppx_jane"
+version: "v0.15.0"
+synopsis: "Standard Jane Street ppx rewriters"
+description: """\
+This package installs a ppx-jane executable, which is a ppx driver
+including all standard Jane Street ppx rewriters."""
+maintainer: "Jane Street developers"
+authors: "Jane Street Group, LLC"
+license: "MIT"
+homepage: "https://github.com/janestreet/ppx_jane"
+doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/ppx_jane/index.html"
+bug-reports: "https://github.com/janestreet/ppx_jane/issues"
+depends: [
+  "ocaml" {>= "4.08.0"}
+  "base_quickcheck" {>= "v0.15" & < "v0.16"}
+  "ppx_assert" {>= "v0.15" & < "v0.16"}
+  "ppx_base" {>= "v0.15" & < "v0.16"}
+  "ppx_bench" {>= "v0.15" & < "v0.16"}
+  "ppx_bin_prot" {>= "v0.15" & < "v0.16"}
+  "ppx_custom_printf" {>= "v0.15" & < "v0.16"}
+  "ppx_disable_unused_warnings" {>= "v0.15" & < "v0.16"}
+  "ppx_expect" {>= "v0.15" & < "v0.16"}
+  "ppx_fields_conv" {>= "v0.15" & < "v0.16"}
+  "ppx_fixed_literal" {>= "v0.15" & < "v0.16"}
+  "ppx_here" {>= "v0.15" & < "v0.16"}
+  "ppx_ignore_instrumentation" {>= "v0.15" & < "v0.16"}
+  "ppx_inline_test" {>= "v0.15" & < "v0.16"}
+  "ppx_let" {>= "v0.15" & < "v0.16"}
+  "ppx_log" {>= "v0.15" & < "v0.16"}
+  "ppx_module_timer" {>= "v0.15" & < "v0.16"}
+  "ppx_optcomp" {>= "v0.15" & < "v0.16"}
+  "ppx_optional" {>= "v0.15" & < "v0.16"}
+  "ppx_pipebang" {>= "v0.15" & < "v0.16"}
+  "ppx_sexp_message" {>= "v0.15" & < "v0.16"}
+  "ppx_sexp_value" {>= "v0.15" & < "v0.16"}
+  "ppx_stable" {>= "v0.15" & < "v0.16"}
+  "ppx_string" {>= "v0.15" & < "v0.16"}
+  "ppx_typerep_conv" {>= "v0.15" & < "v0.16"}
+  "ppx_variants_conv" {>= "v0.15" & < "v0.16"}
+  "dune" {>= "2.0.0"}
+  "ppxlib" {>= "0.23.0"}
+]
+build: ["dune" "build" "-p" name "-j" jobs]
+dev-repo: "git+https://github.com/janestreet/ppx_jane.git"
+url {
+  src:
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/ppx_jane-v0.15.0.tar.gz"
+  checksum:
+    "sha256=d0fa44d2279adfd24223c7e7a6d2a9be9fccc737810bf53876214181858e8146"
+}
diff --git a/packages/upstream/ppx_js_style.v0.14.1/opam b/packages/upstream/ppx_js_style.v0.14.1/opam
deleted file mode 100644
index 71216912e..000000000
--- a/packages/upstream/ppx_js_style.v0.14.1/opam
+++ /dev/null
@@ -1,30 +0,0 @@
-opam-version: "2.0"
-name: "ppx_js_style"
-version: "v0.14.1"
-synopsis: "Code style checker for Jane Street Packages"
-description: """\
-Part of the Jane Street's PPX rewriters collection.
-
-This packages is a no-op ppx rewriter. It is used as a 'lint' tool to
-enforce some coding conventions across all Jane Street packages."""
-maintainer: "Jane Street developers"
-authors: "Jane Street Group, LLC"
-license: "MIT"
-homepage: "https://github.com/janestreet/ppx_js_style"
-doc:
-  "https://ocaml.janestreet.com/ocaml-core/latest/doc/ppx_js_style/index.html"
-bug-reports: "https://github.com/janestreet/ppx_js_style/issues"
-depends: [
-  "ocaml" {>= "4.04.2"}
-  "base" {>= "v0.14" & < "v0.15"}
-  "dune" {>= "2.0.0"}
-  "octavius"
-  "ppxlib" {>= "0.11.0"}
-]
-build: ["dune" "build" "-p" name "-j" jobs]
-dev-repo: "git+https://github.com/janestreet/ppx_js_style.git"
-url {
-  src:
-    "https://github.com/janestreet/ppx_js_style/archive/refs/tags/v0.14.1.tar.gz"
-  checksum: "md5=2d79afa4f954aeafb81b64ecfc11c3fb"
-}
diff --git a/packages/upstream/ppx_let.v0.14.0/opam b/packages/upstream/ppx_let.v0.15.0/opam
similarity index 64%
rename from packages/upstream/ppx_let.v0.14.0/opam
rename to packages/upstream/ppx_let.v0.15.0/opam
index a324b610b..133b09e38 100644
--- a/packages/upstream/ppx_let.v0.14.0/opam
+++ b/packages/upstream/ppx_let.v0.15.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ppx_let"
-version: "v0.14.0"
+version: "v0.15.0"
 synopsis: "Monadic let-bindings"
 description: "Part of the Jane Street's PPX rewriters collection."
 maintainer: "Jane Street developers"
@@ -10,15 +10,17 @@ homepage: "https://github.com/janestreet/ppx_let"
 doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/ppx_let/index.html"
 bug-reports: "https://github.com/janestreet/ppx_let/issues"
 depends: [
-  "ocaml" {>= "4.04.2"}
-  "base" {>= "v0.14" & < "v0.15"}
+  "ocaml" {>= "4.08.0"}
+  "base" {>= "v0.15" & < "v0.16"}
+  "ppx_here" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
-  "ppxlib" {>= "0.11.0"}
+  "ppxlib" {>= "0.23.0"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/ppx_let.git"
 url {
   src:
-    "https://ocaml.janestreet.com/ocaml-core/v0.14/files/ppx_let-v0.14.0.tar.gz"
-  checksum: "md5=faf5b4b69ef2595916f74fff251a9d2c"
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/ppx_let-v0.15.0.tar.gz"
+  checksum:
+    "sha256=64742c11eab6d6915a5213b20648af16ea2f65771170887ad91f8f1da38f3655"
 }
diff --git a/packages/upstream/ppx_log.v0.15.0/opam b/packages/upstream/ppx_log.v0.15.0/opam
new file mode 100644
index 000000000..ef74b0cc1
--- /dev/null
+++ b/packages/upstream/ppx_log.v0.15.0/opam
@@ -0,0 +1,30 @@
+opam-version: "2.0"
+name: "ppx_log"
+version: "v0.15.0"
+synopsis:
+  "Ppx_sexp_message-like extension nodes for lazily rendering log messages"
+description: "Part of the Jane Street's PPX rewriters collection."
+maintainer: "Jane Street developers"
+authors: "Jane Street Group, LLC"
+license: "MIT"
+homepage: "https://github.com/janestreet/ppx_log"
+doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/ppx_log/index.html"
+bug-reports: "https://github.com/janestreet/ppx_log/issues"
+depends: [
+  "ocaml" {>= "4.08.0"}
+  "base" {>= "v0.15" & < "v0.16"}
+  "ppx_here" {>= "v0.15" & < "v0.16"}
+  "ppx_sexp_conv" {>= "v0.15" & < "v0.16"}
+  "ppx_sexp_message" {>= "v0.15" & < "v0.16"}
+  "sexplib" {>= "v0.15" & < "v0.16"}
+  "dune" {>= "2.0.0"}
+  "ppxlib" {>= "0.23.0"}
+]
+build: ["dune" "build" "-p" name "-j" jobs]
+dev-repo: "git+https://github.com/janestreet/ppx_log.git"
+url {
+  src:
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/ppx_log-v0.15.0.tar.gz"
+  checksum:
+    "sha256=037aa3c8c4dca5c7ce9154e981c146c92faeeac456931cf3c9496b4f9698763e"
+}
diff --git a/packages/upstream/ppx_module_timer.v0.14.0/opam b/packages/upstream/ppx_module_timer.v0.15.0/opam
similarity index 62%
rename from packages/upstream/ppx_module_timer.v0.14.0/opam
rename to packages/upstream/ppx_module_timer.v0.15.0/opam
index 2e926a4c6..673445e9d 100644
--- a/packages/upstream/ppx_module_timer.v0.14.0/opam
+++ b/packages/upstream/ppx_module_timer.v0.15.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ppx_module_timer"
-version: "v0.14.0"
+version: "v0.15.0"
 synopsis: "Ppx rewriter that records top-level module startup times"
 description: "Part of the Jane Street's PPX rewriters collection."
 maintainer: "Jane Street developers"
@@ -11,18 +11,19 @@ doc:
   "https://ocaml.janestreet.com/ocaml-core/latest/doc/ppx_module_timer/index.html"
 bug-reports: "https://github.com/janestreet/ppx_module_timer/issues"
 depends: [
-  "ocaml" {>= "4.04.2"}
-  "base" {>= "v0.14" & < "v0.15"}
-  "ppx_base" {>= "v0.14" & < "v0.15"}
-  "stdio" {>= "v0.14" & < "v0.15"}
-  "time_now" {>= "v0.14" & < "v0.15"}
+  "ocaml" {>= "4.08.0"}
+  "base" {>= "v0.15" & < "v0.16"}
+  "ppx_base" {>= "v0.15" & < "v0.16"}
+  "stdio" {>= "v0.15" & < "v0.16"}
+  "time_now" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
-  "ppxlib" {>= "0.11.0"}
+  "ppxlib" {>= "0.23.0"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/ppx_module_timer.git"
 url {
   src:
-    "https://ocaml.janestreet.com/ocaml-core/v0.14/files/ppx_module_timer-v0.14.0.tar.gz"
-  checksum: "md5=7ec9de2d5f07a1ceecdbefce0f0dea2c"
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/ppx_module_timer-v0.15.0.tar.gz"
+  checksum:
+    "sha256=22a8d0347cb0c7a349a316ff250f059ab90dafd20f14373f08ef04500b967c62"
 }
diff --git a/packages/upstream/ppx_optcomp.v0.14.3/opam b/packages/upstream/ppx_optcomp.v0.15.0/opam
similarity index 56%
rename from packages/upstream/ppx_optcomp.v0.14.3/opam
rename to packages/upstream/ppx_optcomp.v0.15.0/opam
index 3a59217b2..63f531226 100644
--- a/packages/upstream/ppx_optcomp.v0.14.3/opam
+++ b/packages/upstream/ppx_optcomp.v0.15.0/opam
@@ -1,25 +1,27 @@
 opam-version: "2.0"
 name: "ppx_optcomp"
-version: "v0.14.3"
+version: "v0.15.0"
 synopsis: "Optional compilation for OCaml"
 description: "Part of the Jane Street's PPX rewriters collection."
-maintainer: "opensource@janestreet.com"
-authors: "Jane Street Group, LLC <opensource@janestreet.com>"
+maintainer: "Jane Street developers"
+authors: "Jane Street Group, LLC"
 license: "MIT"
 homepage: "https://github.com/janestreet/ppx_optcomp"
 doc:
   "https://ocaml.janestreet.com/ocaml-core/latest/doc/ppx_optcomp/index.html"
 bug-reports: "https://github.com/janestreet/ppx_optcomp/issues"
 depends: [
-  "ocaml" {>= "4.08"}
-  "base" {>= "v0.14" & < "v0.15"}
-  "stdio" {>= "v0.14" & < "v0.15"}
+  "ocaml" {>= "4.08.0"}
+  "base" {>= "v0.15" & < "v0.16"}
+  "stdio" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
-  "ppxlib" {>= "0.18.0"}
+  "ppxlib" {>= "0.23.0"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/ppx_optcomp.git"
 url {
-  src: "https://github.com/janestreet/ppx_optcomp/archive/v0.14.3.tar.gz"
-  checksum: "md5=2d012df62dd0bc82d2ea4ab25b628992"
+  src:
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/ppx_optcomp-v0.15.0.tar.gz"
+  checksum:
+    "sha256=c44e70d7b3c80f9e2bf8456da1076d16dc4504fc3e02d8709ca1b2e080caa6ed"
 }
diff --git a/packages/upstream/ppx_optional.v0.14.0/opam b/packages/upstream/ppx_optional.v0.15.0/opam
similarity index 69%
rename from packages/upstream/ppx_optional.v0.14.0/opam
rename to packages/upstream/ppx_optional.v0.15.0/opam
index 72e9f4072..9978be6fa 100644
--- a/packages/upstream/ppx_optional.v0.14.0/opam
+++ b/packages/upstream/ppx_optional.v0.15.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ppx_optional"
-version: "v0.14.0"
+version: "v0.15.0"
 synopsis: "Pattern matching on flat options"
 description: """\
 A ppx rewriter that rewrites simple match statements with an if then
@@ -13,15 +13,16 @@ doc:
   "https://ocaml.janestreet.com/ocaml-core/latest/doc/ppx_optional/index.html"
 bug-reports: "https://github.com/janestreet/ppx_optional/issues"
 depends: [
-  "ocaml" {>= "4.04.2"}
-  "base" {>= "v0.14" & < "v0.15"}
+  "ocaml" {>= "4.08.0"}
+  "base" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
-  "ppxlib" {>= "0.11.0"}
+  "ppxlib" {>= "0.23.0"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/ppx_optional.git"
 url {
   src:
-    "https://ocaml.janestreet.com/ocaml-core/v0.14/files/ppx_optional-v0.14.0.tar.gz"
-  checksum: "md5=0c85a3233f660a500f7d7481a1ab3c6c"
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/ppx_optional-v0.15.0.tar.gz"
+  checksum:
+    "sha256=72bb1319fc697c769df15ad659bdd0da2782df286212dd6b004c06e6a057c729"
 }
diff --git a/packages/upstream/ppx_pipebang.v0.14.0/opam b/packages/upstream/ppx_pipebang.v0.15.0/opam
similarity index 72%
rename from packages/upstream/ppx_pipebang.v0.14.0/opam
rename to packages/upstream/ppx_pipebang.v0.15.0/opam
index c6671c62d..73eff3ede 100644
--- a/packages/upstream/ppx_pipebang.v0.14.0/opam
+++ b/packages/upstream/ppx_pipebang.v0.15.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ppx_pipebang"
-version: "v0.14.0"
+version: "v0.15.0"
 synopsis:
   "A ppx rewriter that inlines reverse application operators `|>` and `|!`"
 description: "Part of the Jane Street's PPX rewriters collection."
@@ -12,14 +12,15 @@ doc:
   "https://ocaml.janestreet.com/ocaml-core/latest/doc/ppx_pipebang/index.html"
 bug-reports: "https://github.com/janestreet/ppx_pipebang/issues"
 depends: [
-  "ocaml" {>= "4.04.2"}
+  "ocaml" {>= "4.08.0"}
   "dune" {>= "2.0.0"}
-  "ppxlib" {>= "0.11.0"}
+  "ppxlib" {>= "0.23.0"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/ppx_pipebang.git"
 url {
   src:
-    "https://ocaml.janestreet.com/ocaml-core/v0.14/files/ppx_pipebang-v0.14.0.tar.gz"
-  checksum: "md5=fa42f83b1851956dbae5716fab4776d3"
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/ppx_pipebang-v0.15.0.tar.gz"
+  checksum:
+    "sha256=1e56554d86ab61830492cc922b02dab0110cdd7584e90ffef4832dc6335620a8"
 }
diff --git a/packages/upstream/ppx_sexp_conv.v0.14.3/opam b/packages/upstream/ppx_sexp_conv.v0.15.0/opam
similarity index 65%
rename from packages/upstream/ppx_sexp_conv.v0.14.3/opam
rename to packages/upstream/ppx_sexp_conv.v0.15.0/opam
index 93480ccc7..cd3b6d841 100644
--- a/packages/upstream/ppx_sexp_conv.v0.14.3/opam
+++ b/packages/upstream/ppx_sexp_conv.v0.15.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ppx_sexp_conv"
-version: "v0.14.3"
+version: "v0.15.0"
 synopsis: "[@@deriving] plugin to generate S-expression conversion functions"
 description: "Part of the Jane Street's PPX rewriters collection."
 maintainer: "Jane Street developers"
@@ -11,15 +11,17 @@ doc:
   "https://ocaml.janestreet.com/ocaml-core/latest/doc/ppx_sexp_conv/index.html"
 bug-reports: "https://github.com/janestreet/ppx_sexp_conv/issues"
 depends: [
-  "ocaml" {>= "4.04.2"}
-  "base" {>= "v0.14" & < "v0.15"}
-  "sexplib0" {>= "v0.14" & < "v0.15"}
+  "ocaml" {>= "4.08.0"}
+  "base" {>= "v0.15" & < "v0.16"}
+  "sexplib0" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
-  "ppxlib" {>= "0.22.0"}
+  "ppxlib" {>= "0.23.0" & < "0.26.0"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/ppx_sexp_conv.git"
 url {
-  src: "https://github.com/janestreet/ppx_sexp_conv/archive/v0.14.3.tar.gz"
-  checksum: "md5=25caf01245e0113e035ccefe275f85d9"
+  src:
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/ppx_sexp_conv-v0.15.0.tar.gz"
+  checksum:
+    "sha256=d9cd1eefa179acedb8954ba95ed01e8fd685dae6e278061936ce5930d95a8380"
 }
diff --git a/packages/upstream/ppx_sexp_message.v0.14.1/opam b/packages/upstream/ppx_sexp_message.v0.15.0/opam
similarity index 63%
rename from packages/upstream/ppx_sexp_message.v0.14.1/opam
rename to packages/upstream/ppx_sexp_message.v0.15.0/opam
index 542afe26f..12b253c73 100644
--- a/packages/upstream/ppx_sexp_message.v0.14.1/opam
+++ b/packages/upstream/ppx_sexp_message.v0.15.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ppx_sexp_message"
-version: "v0.14.1"
+version: "v0.15.0"
 synopsis: "A ppx rewriter for easy construction of s-expressions"
 description: "Part of the Jane Street's PPX rewriters collection."
 maintainer: "Jane Street developers"
@@ -11,17 +11,18 @@ doc:
   "https://ocaml.janestreet.com/ocaml-core/latest/doc/ppx_sexp_message/index.html"
 bug-reports: "https://github.com/janestreet/ppx_sexp_message/issues"
 depends: [
-  "ocaml" {>= "4.04.2"}
-  "base" {>= "v0.14" & < "v0.15"}
-  "ppx_here" {>= "v0.14" & < "v0.15"}
-  "ppx_sexp_conv" {>= "v0.14" & < "v0.15"}
+  "ocaml" {>= "4.08.0"}
+  "base" {>= "v0.15" & < "v0.16"}
+  "ppx_here" {>= "v0.15" & < "v0.16"}
+  "ppx_sexp_conv" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
-  "ppxlib" {>= "0.18.0"}
+  "ppxlib" {>= "0.23.0"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/ppx_sexp_message.git"
 url {
   src:
-    "https://github.com/janestreet/ppx_sexp_message/archive/v0.14.1.tar.gz"
-  checksum: "md5=a6f4478ba28e7f16cd37789e64a7cb79"
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/ppx_sexp_message-v0.15.0.tar.gz"
+  checksum:
+    "sha256=0d94785f80e45b97269e2e34b762a0909eba6a46e55c383cf8c1bdb8ffffdaba"
 }
diff --git a/packages/upstream/ppx_sexp_value.v0.14.0/opam b/packages/upstream/ppx_sexp_value.v0.15.0/opam
similarity index 64%
rename from packages/upstream/ppx_sexp_value.v0.14.0/opam
rename to packages/upstream/ppx_sexp_value.v0.15.0/opam
index bfe2ee4e7..0bf9d7c89 100644
--- a/packages/upstream/ppx_sexp_value.v0.14.0/opam
+++ b/packages/upstream/ppx_sexp_value.v0.15.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ppx_sexp_value"
-version: "v0.14.0"
+version: "v0.15.0"
 synopsis:
   "A ppx rewriter that simplifies building s-expressions from ocaml values"
 description: "Part of the Jane Street's PPX rewriters collection."
@@ -12,17 +12,18 @@ doc:
   "https://ocaml.janestreet.com/ocaml-core/latest/doc/ppx_sexp_value/index.html"
 bug-reports: "https://github.com/janestreet/ppx_sexp_value/issues"
 depends: [
-  "ocaml" {>= "4.04.2"}
-  "base" {>= "v0.14" & < "v0.15"}
-  "ppx_here" {>= "v0.14" & < "v0.15"}
-  "ppx_sexp_conv" {>= "v0.14" & < "v0.15"}
+  "ocaml" {>= "4.08.0"}
+  "base" {>= "v0.15" & < "v0.16"}
+  "ppx_here" {>= "v0.15" & < "v0.16"}
+  "ppx_sexp_conv" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
-  "ppxlib" {>= "0.11.0"}
+  "ppxlib" {>= "0.23.0"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/ppx_sexp_value.git"
 url {
   src:
-    "https://ocaml.janestreet.com/ocaml-core/v0.14/files/ppx_sexp_value-v0.14.0.tar.gz"
-  checksum: "md5=8bc8a75c992e8af371dfd71804ac2133"
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/ppx_sexp_value-v0.15.0.tar.gz"
+  checksum:
+    "sha256=376ed3dcfb2f98b22d0c3a41a2adec3255ace7c93b8b72a8b3a46154395b558d"
 }
diff --git a/packages/upstream/ppx_stable.v0.14.1/opam b/packages/upstream/ppx_stable.v0.15.0/opam
similarity index 69%
rename from packages/upstream/ppx_stable.v0.14.1/opam
rename to packages/upstream/ppx_stable.v0.15.0/opam
index d3080c7f0..78af216a0 100644
--- a/packages/upstream/ppx_stable.v0.14.1/opam
+++ b/packages/upstream/ppx_stable.v0.15.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ppx_stable"
-version: "v0.14.1"
+version: "v0.15.0"
 synopsis: "Stable types conversions generator"
 description: """\
 A ppx extension for easier implementation of conversion functions between almost
@@ -13,14 +13,16 @@ doc:
   "https://ocaml.janestreet.com/ocaml-core/latest/doc/ppx_stable/index.html"
 bug-reports: "https://github.com/janestreet/ppx_stable/issues"
 depends: [
-  "ocaml" {>= "4.04.2"}
-  "base" {>= "v0.14" & < "v0.15"}
+  "ocaml" {>= "4.08.0"}
+  "base" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
-  "ppxlib" {>= "0.14.0"}
+  "ppxlib" {>= "0.23.0"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/ppx_stable.git"
 url {
-  src: "https://github.com/janestreet/ppx_stable/archive/v0.14.1.tar.gz"
-  checksum: "md5=78fd32fd0e72ebfd8e522008949066b5"
+  src:
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/ppx_stable-v0.15.0.tar.gz"
+  checksum:
+    "sha256=90b4e87a590c695938db2b148aeb4a6543d32525ee826432812034470c012bb3"
 }
diff --git a/packages/upstream/ppx_string.v0.14.1/opam b/packages/upstream/ppx_string.v0.15.0/opam
similarity index 64%
rename from packages/upstream/ppx_string.v0.14.1/opam
rename to packages/upstream/ppx_string.v0.15.0/opam
index 5e1072f0a..dd5924676 100644
--- a/packages/upstream/ppx_string.v0.14.1/opam
+++ b/packages/upstream/ppx_string.v0.15.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ppx_string"
-version: "v0.14.1"
+version: "v0.15.0"
 synopsis: "Ppx extension for string interpolation"
 description: "Part of the Jane Street's PPX rewriters collection."
 maintainer: "Jane Street developers"
@@ -11,16 +11,17 @@ doc:
   "https://ocaml.janestreet.com/ocaml-core/latest/doc/ppx_string/index.html"
 bug-reports: "https://github.com/janestreet/ppx_string/issues"
 depends: [
-  "ocaml" {>= "4.04.2"}
-  "base" {>= "v0.14" & < "v0.15"}
-  "ppx_base" {>= "v0.14" & < "v0.15"}
-  "stdio" {>= "v0.14" & < "v0.15"}
+  "ocaml" {>= "4.08.0"}
+  "base" {>= "v0.15" & < "v0.16"}
+  "ppx_base" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
-  "ppxlib" {>= "0.11.0"}
+  "ppxlib" {>= "0.23.0"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/ppx_string.git"
 url {
-  src: "https://github.com/janestreet/ppx_string/archive/v0.14.1.tar.gz"
-  checksum: "md5=5765a8ca47970b2290fbd7c5d589b449"
+  src:
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/ppx_string-v0.15.0.tar.gz"
+  checksum:
+    "sha256=f33d4956792fd022c63f8eef4269fcbf77aa06402d7b17df80cb493482b71393"
 }
diff --git a/packages/upstream/ppx_tools.6.4/opam b/packages/upstream/ppx_tools.6.4/opam
deleted file mode 100644
index 13f1b5f7b..000000000
--- a/packages/upstream/ppx_tools.6.4/opam
+++ /dev/null
@@ -1,25 +0,0 @@
-opam-version: "2.0"
-name: "ppx_tools"
-version: "6.4"
-synopsis: "Tools for authors of ppx rewriters and other syntactic tools"
-maintainer: "Kate <kit.ty.kate@disroot.org>"
-authors: "Alain Frisch <alain.frisch@lexifi.com>"
-license: "MIT"
-tags: "syntax"
-homepage: "https://github.com/ocaml-ppx/ppx_tools"
-bug-reports: "https://github.com/ocaml-ppx/ppx_tools/issues"
-depends: [
-  "ocaml" {>= "4.08.0" & < "4.14.0"}
-  "dune" {>= "1.6"}
-  "cppo" {build & >= "1.1.0"}
-]
-build: ["dune" "build" "-p" name "-j" jobs]
-dev-repo: "git+https://github.com/ocaml-ppx/ppx_tools.git"
-url {
-  src:
-    "https://github.com/ocaml-ppx/ppx_tools/releases/download/6.4/ppx_tools-6.4.tbz"
-  checksum: [
-    "md5=e526ca3f0394166ef9694f9fd453b83d"
-    "sha512=9c51ae08a3ad0ea9d52ef856f396a13530199f9d2d66b97d2b1c6f66b52430bc195c909b4bd007d233014e2d7bba7e423b28e5ab41c8595b1c954308e9f18289"
-  ]
-}
diff --git a/packages/upstream/ppx_typerep_conv.v0.14.2/opam b/packages/upstream/ppx_typerep_conv.v0.15.0/opam
similarity index 66%
rename from packages/upstream/ppx_typerep_conv.v0.14.2/opam
rename to packages/upstream/ppx_typerep_conv.v0.15.0/opam
index ef3e156b9..d308c979d 100644
--- a/packages/upstream/ppx_typerep_conv.v0.14.2/opam
+++ b/packages/upstream/ppx_typerep_conv.v0.15.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ppx_typerep_conv"
-version: "v0.14.2"
+version: "v0.15.0"
 synopsis: "Generation of runtime types from type declarations"
 description: "Part of the Jane Street's PPX rewriters collection."
 maintainer: "Jane Street developers"
@@ -11,16 +11,17 @@ doc:
   "https://ocaml.janestreet.com/ocaml-core/latest/doc/ppx_typerep_conv/index.html"
 bug-reports: "https://github.com/janestreet/ppx_typerep_conv/issues"
 depends: [
-  "ocaml" {>= "4.04.2"}
-  "base" {>= "v0.14" & < "v0.15"}
-  "typerep" {>= "v0.14" & < "v0.15"}
+  "ocaml" {>= "4.08.0"}
+  "base" {>= "v0.15" & < "v0.16"}
+  "typerep" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
-  "ppxlib" {>= "0.22.0"}
+  "ppxlib" {>= "0.23.0"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/ppx_typerep_conv.git"
 url {
   src:
-    "https://github.com/janestreet/ppx_typerep_conv/archive/v0.14.2.tar.gz"
-  checksum: "md5=33ce6d705b7323772379712511daac0b"
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/ppx_typerep_conv-v0.15.0.tar.gz"
+  checksum:
+    "sha256=e71729ed13a3cafd8f541056340bf167e8b510f3090ff5825402ed61af3b5e9f"
 }
diff --git a/packages/upstream/ppx_variants_conv.v0.14.1/opam b/packages/upstream/ppx_variants_conv.v0.15.0/opam
similarity index 67%
rename from packages/upstream/ppx_variants_conv.v0.14.1/opam
rename to packages/upstream/ppx_variants_conv.v0.15.0/opam
index 3ffb60b69..0dac2c30b 100644
--- a/packages/upstream/ppx_variants_conv.v0.14.1/opam
+++ b/packages/upstream/ppx_variants_conv.v0.15.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ppx_variants_conv"
-version: "v0.14.1"
+version: "v0.15.0"
 synopsis:
   "Generation of accessor and iteration functions for ocaml variant types"
 description: "Part of the Jane Street's PPX rewriters collection."
@@ -12,16 +12,17 @@ doc:
   "https://ocaml.janestreet.com/ocaml-core/latest/doc/ppx_variants_conv/index.html"
 bug-reports: "https://github.com/janestreet/ppx_variants_conv/issues"
 depends: [
-  "ocaml" {>= "4.04.2"}
-  "base" {>= "v0.14" & < "v0.15"}
-  "variantslib" {>= "v0.14" & < "v0.15"}
+  "ocaml" {>= "4.08.0"}
+  "base" {>= "v0.15" & < "v0.16"}
+  "variantslib" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
-  "ppxlib" {>= "0.14.0" & < "0.23.0"}
+  "ppxlib" {>= "0.23.0"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/ppx_variants_conv.git"
 url {
   src:
-    "https://github.com/janestreet/ppx_variants_conv/archive/v0.14.1.tar.gz"
-  checksum: "md5=5967b6bdf8d1d95ac25f79ffa925397d"
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/ppx_variants_conv-v0.15.0.tar.gz"
+  checksum:
+    "sha256=6e7096f6e7b6c2fa916e85d2b526a4574234f72185b40f7d409d08f339dfac9c"
 }
diff --git a/packages/upstream/ppxlib.0.22.2/opam b/packages/upstream/ppxlib.0.25.1/opam
similarity index 73%
rename from packages/upstream/ppxlib.0.22.2/opam
rename to packages/upstream/ppxlib.0.25.1/opam
index e36cfefec..e27c3b7ae 100644
--- a/packages/upstream/ppxlib.0.22.2/opam
+++ b/packages/upstream/ppxlib.0.25.1/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ppxlib"
-version: "0.22.2"
+version: "0.25.1"
 synopsis: "Standard library for ppx rewriters"
 description: """\
 Ppxlib is the standard library for ppx rewriters and other programs
@@ -21,11 +21,11 @@ doc: "https://ocaml-ppx.github.io/ppxlib/"
 bug-reports: "https://github.com/ocaml-ppx/ppxlib/issues"
 depends: [
   "dune" {>= "2.7"}
-  "ocaml" {>= "4.04.1" & < "4.14"}
+  "ocaml" {>= "4.04.1" & < "5.1.0"}
   "ocaml-compiler-libs" {>= "v0.11.0"}
-  "ocaml-migrate-parsetree" {>= "2.2.0"}
   "ppx_derivers" {>= "1.0"}
   "sexplib0" {>= "v0.12"}
+  "sexplib0" {with-test & < "v0.15"}
   "stdlib-shims"
   "ocamlfind" {with-test}
   "re" {with-test & >= "1.9.0"}
@@ -34,6 +34,10 @@ depends: [
   "stdio" {with-test}
   "odoc" {with-doc}
 ]
+conflicts: [
+  "ocaml-migrate-parsetree" {< "2.0.0"}
+  "base-effects"
+]
 build: [
   ["dune" "subst"] {dev}
   [
@@ -51,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.22.2/ppxlib-0.22.2.tbz"
+    "https://github.com/ocaml-ppx/ppxlib/releases/download/0.25.1/ppxlib-0.25.1.tbz"
   checksum: [
-    "sha256=d0e8a1ebdc6220b1574d7a926f008460c5118ccef79bf9a0ce0242f34cff225a"
-    "sha512=6010a59be6af873eaf193670f9cc8c9a7f091cfd89ec6c5b68d1f0c72d7c6015eec6371c009fc473cf2cb37d24f0934d04d0eacefa567a4945234197c3b31741"
+    "sha256=a51b3868029e62ff14a0f2bd8d278dacfc0c3fc5b22d484a296be90c53e4ffd7"
+    "sha512=6a6d9af49344e901cc9e6da7bcf38c2973705c8cee4cff1c64c0393e9ccc55a6abec1f58d5b56d0807939a3741bec722ee7bfc244f94619167a30438f182488a"
   ]
 }
-x-commit-hash: "3cf57772fef4666a2992041cf3a670dd2be98603"
+x-commit-hash: "15e70402feadd98365f36e0a255e78dcd168e6bb"
diff --git a/packages/upstream/protocol_version_header.v0.14.0/opam b/packages/upstream/protocol_version_header.v0.15.0/opam
similarity index 75%
rename from packages/upstream/protocol_version_header.v0.14.0/opam
rename to packages/upstream/protocol_version_header.v0.15.0/opam
index a6022c332..475b0423e 100644
--- a/packages/upstream/protocol_version_header.v0.14.0/opam
+++ b/packages/upstream/protocol_version_header.v0.15.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "protocol_version_header"
-version: "v0.14.0"
+version: "v0.15.0"
 synopsis: "Protocol versioning"
 description: """\
 This library offers a lightweight way for applications protocols to
@@ -16,14 +16,15 @@ doc:
 bug-reports: "https://github.com/janestreet/protocol_version_header/issues"
 depends: [
   "ocaml" {>= "4.08.0"}
-  "core_kernel" {>= "v0.14" & < "v0.15"}
-  "ppx_jane" {>= "v0.14" & < "v0.15"}
+  "core" {>= "v0.15" & < "v0.16"}
+  "ppx_jane" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/protocol_version_header.git"
 url {
   src:
-    "https://ocaml.janestreet.com/ocaml-core/v0.14/files/protocol_version_header-v0.14.0.tar.gz"
-  checksum: "md5=b318922abe9d7b8c91523ff7ea767069"
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/protocol_version_header-v0.15.0.tar.gz"
+  checksum:
+    "sha256=d0c4e467bacc4bfb71dbd9575828634b222d4579b6ecc86b978f34dca1d1f3c7"
 }
diff --git a/packages/upstream/ptime.0.8.5/opam b/packages/upstream/ptime.1.0.0/opam
similarity index 50%
rename from packages/upstream/ptime.0.8.5/opam
rename to packages/upstream/ptime.1.0.0/opam
index d225355b0..626c254ef 100644
--- a/packages/upstream/ptime.0.8.5/opam
+++ b/packages/upstream/ptime.1.0.0/opam
@@ -1,55 +1,43 @@
 opam-version: "2.0"
 name: "ptime"
-version: "0.8.5"
+version: "1.0.0"
 synopsis: "POSIX time for OCaml"
 description: """\
 Ptime has platform independent POSIX time support in pure OCaml. It
 provides a type to represent a well-defined range of POSIX timestamps
 with picosecond precision, conversion with date-time values,
-conversion with [RFC 3339 timestamps][rfc3339] and pretty printing to a
-human-readable, locale-independent representation.
+conversion with [RFC 3339 timestamps][rfc3339] and pretty printing to
+a human-readable, locale-independent representation.
 
 The additional Ptime_clock library provides access to a system POSIX
 clock and to the system's current time zone offset.
 
 Ptime is not a calendar library.
 
-Ptime depends on the `result` compatibility package. Ptime_clock
-depends on your system library. Ptime_clock's optional JavaScript
-support depends on [js_of_ocaml][jsoo]. Ptime and its libraries are
-distributed under the ISC license.
+Ptime has no dependency. Ptime_clock depends on your system library or
+JavaScript runtime system. Ptime and its libraries are distributed
+under the ISC license.
 
 [rfc3339]: http://tools.ietf.org/html/rfc3339
-[jsoo]: http://ocsigen.org/js_of_ocaml/"""
+
+Home page: http://erratique.ch/software/ptime"""
 maintainer: "Daniel Bünzli <daniel.buenzl i@erratique.ch>"
 authors: "The ptime programmers"
 license: "ISC"
 tags: ["time" "posix" "system" "org:erratique"]
 homepage: "https://erratique.ch/software/ptime"
-doc: "https://erratique.ch/software/ptime/doc"
+doc: "https://erratique.ch/software/ptime/doc/"
 bug-reports: "https://github.com/dbuenzli/ptime/issues"
 depends: [
-  "ocaml" {>= "4.01.0"}
+  "ocaml" {>= "4.08.0"}
   "ocamlfind" {build}
-  "ocamlbuild" {build}
-  "topkg" {build}
-  "result"
-]
-depopts: ["js_of_ocaml"]
-conflicts: [
-  "js_of_ocaml" {< "3.3.0"}
-]
-build: [
-  "ocaml"
-  "pkg/pkg.ml"
-  "build"
-  "--pinned"
-  "%{pinned}%"
-  "--with-js_of_ocaml"
-  "%{js_of_ocaml:installed}%"
+  "ocamlbuild" {build & != "0.9.0"}
+  "topkg" {build & >= "1.0.3"}
 ]
-dev-repo: "git+http://erratique.ch/repos/ptime.git"
+build: ["ocaml" "pkg/pkg.ml" "build" "--dev-pkg" "%{dev}%"]
+dev-repo: "git+https://erratique.ch/repos/ptime.git"
 url {
-  src: "https://erratique.ch/software/ptime/releases/ptime-0.8.5.tbz"
-  checksum: "md5=4d48055d623ecf2db792439b3e96a520"
+  src: "https://erratique.ch/software/ptime/releases/ptime-1.0.0.tbz"
+  checksum:
+    "sha512=df2410d9cc25a33083fe968a584b8fb4d68ad5c077f3356da0a20427e6cd8756a5b946b921e5cf8ed4097f2c506e93345d9dca63b113be644d5a7cc0753d1534"
 }
diff --git a/packages/upstream/qcheck-core.0.18/opam b/packages/upstream/qcheck-core.0.19.1/opam
similarity index 71%
rename from packages/upstream/qcheck-core.0.18/opam
rename to packages/upstream/qcheck-core.0.19.1/opam
index be0589376..b7badb4c9 100644
--- a/packages/upstream/qcheck-core.0.18/opam
+++ b/packages/upstream/qcheck-core.0.19.1/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "qcheck-core"
-version: "0.18"
+version: "0.19.1"
 synopsis: "Core qcheck library"
 maintainer: "simon.cruanes.2007@m4x.org"
 authors: "the qcheck contributors"
@@ -16,6 +16,7 @@ depends: [
   "alcotest" {with-test}
   "odoc" {with-doc}
   "ocaml" {>= "4.08.0"}
+  "ocaml" {with-test & < "5.0"}
 ]
 conflicts: [
   "ounit" {< "2.0"}
@@ -27,9 +28,9 @@ build: [
 ]
 dev-repo: "git+https://github.com/c-cube/qcheck.git"
 url {
-  src: "https://github.com/c-cube/qcheck/archive/v0.18.tar.gz"
+  src: "https://github.com/c-cube/qcheck/archive/v0.19.1.tar.gz"
   checksum: [
-    "md5=a830f187d3eed60eba960c8d626035a4"
-    "sha512=08da783ca991dcee26f88b8d6db2fcf2589d3e753ce355d5e3c8944b58ce43b444c6cde054971a557d7d345b4386e6e976111d4c537840a1269c7e361340fcfe"
+    "md5=c100c4912ef0cf863b0191e155aeddb1"
+    "sha512=f6af650381d4100ca019082c77f9aceda00b6158356f46a5bcb091ca1f56d41d9c819d3bae7736f1e70b3d1827c5a4af53cc80d94d66025dd52044438207a4c1"
   ]
 }
diff --git a/packages/upstream/qcheck-ounit.0.18/opam b/packages/upstream/qcheck-ounit.0.19.1/opam
similarity index 71%
rename from packages/upstream/qcheck-ounit.0.18/opam
rename to packages/upstream/qcheck-ounit.0.19.1/opam
index cf1d605c5..88b8c7332 100644
--- a/packages/upstream/qcheck-ounit.0.18/opam
+++ b/packages/upstream/qcheck-ounit.0.19.1/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "qcheck-ounit"
-version: "0.18"
+version: "0.19.1"
 synopsis: "OUnit backend for qcheck"
 maintainer: "simon.cruanes.2007@m4x.org"
 authors: "the qcheck contributors"
@@ -17,6 +17,7 @@ depends: [
   "ounit2"
   "odoc" {with-doc}
   "ocaml" {>= "4.08.0"}
+  "ocaml" {with-test & < "5.0"}
 ]
 build: [
   ["dune" "build" "-p" name "-j" jobs]
@@ -25,9 +26,9 @@ build: [
 ]
 dev-repo: "git+https://github.com/c-cube/qcheck.git"
 url {
-  src: "https://github.com/c-cube/qcheck/archive/v0.18.tar.gz"
+  src: "https://github.com/c-cube/qcheck/archive/v0.19.1.tar.gz"
   checksum: [
-    "md5=a830f187d3eed60eba960c8d626035a4"
-    "sha512=08da783ca991dcee26f88b8d6db2fcf2589d3e753ce355d5e3c8944b58ce43b444c6cde054971a557d7d345b4386e6e976111d4c537840a1269c7e361340fcfe"
+    "md5=c100c4912ef0cf863b0191e155aeddb1"
+    "sha512=f6af650381d4100ca019082c77f9aceda00b6158356f46a5bcb091ca1f56d41d9c819d3bae7736f1e70b3d1827c5a4af53cc80d94d66025dd52044438207a4c1"
   ]
 }
diff --git a/packages/upstream/qcheck.0.18/opam b/packages/upstream/qcheck.0.19.1/opam
similarity index 73%
rename from packages/upstream/qcheck.0.18/opam
rename to packages/upstream/qcheck.0.19.1/opam
index c5f8aff97..e71910e8a 100644
--- a/packages/upstream/qcheck.0.18/opam
+++ b/packages/upstream/qcheck.0.19.1/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "qcheck"
-version: "0.18"
+version: "0.19.1"
 synopsis: "Compatibility package for qcheck"
 maintainer: "simon.cruanes.2007@m4x.org"
 authors: "the qcheck contributors"
@@ -18,6 +18,7 @@ depends: [
   "alcotest" {with-test}
   "odoc" {with-doc}
   "ocaml" {>= "4.08.0"}
+  "ocaml" {with-test & < "5.0"}
 ]
 conflicts: [
   "ounit" {< "2.0"}
@@ -29,9 +30,9 @@ build: [
 ]
 dev-repo: "git+https://github.com/c-cube/qcheck.git"
 url {
-  src: "https://github.com/c-cube/qcheck/archive/v0.18.tar.gz"
+  src: "https://github.com/c-cube/qcheck/archive/v0.19.1.tar.gz"
   checksum: [
-    "md5=a830f187d3eed60eba960c8d626035a4"
-    "sha512=08da783ca991dcee26f88b8d6db2fcf2589d3e753ce355d5e3c8944b58ce43b444c6cde054971a557d7d345b4386e6e976111d4c537840a1269c7e361340fcfe"
+    "md5=c100c4912ef0cf863b0191e155aeddb1"
+    "sha512=f6af650381d4100ca019082c77f9aceda00b6158356f46a5bcb091ca1f56d41d9c819d3bae7736f1e70b3d1827c5a4af53cc80d94d66025dd52044438207a4c1"
   ]
 }
diff --git a/packages/upstream/re.1.10.3/opam b/packages/upstream/re.1.10.4/opam
similarity index 65%
rename from packages/upstream/re.1.10.3/opam
rename to packages/upstream/re.1.10.4/opam
index b3f0a458a..79379bd02 100644
--- a/packages/upstream/re.1.10.3/opam
+++ b/packages/upstream/re.1.10.4/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "re"
-version: "1.10.3"
+version: "1.10.4"
 synopsis: "RE is a regular expression library for OCaml"
 description: """\
 Pure OCaml regular expressions with:
@@ -17,27 +17,27 @@ authors: [
   "Rudi Grinberg"
   "Gabriel Radanne"
 ]
-license: "LGPL-2.0 with OCaml linking exception"
+license: "LGPL-2.0-or-later WITH OCaml-LGPL-linking-exception"
 homepage: "https://github.com/ocaml/ocaml-re"
 bug-reports: "https://github.com/ocaml/ocaml-re/issues"
 depends: [
-  "ocaml" {>= "4.02"}
+  "ocaml" {>= "4.03"}
   "dune" {>= "2.0"}
   "ounit" {with-test}
   "seq"
 ]
 build: [
-  ["dune" "subst"] {pinned}
+  ["dune" "subst"] {dev}
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
 dev-repo: "git+https://github.com/ocaml/ocaml-re.git"
 url {
   src:
-    "https://github.com/ocaml/ocaml-re/releases/download/1.10.3/re-1.10.3.tbz"
+    "https://github.com/ocaml/ocaml-re/releases/download/1.10.4/re-1.10.4.tbz"
   checksum: [
-    "sha256=846546967f3fe31765935dd40a6460a9424337ecce7b12727fcba49480790ebb"
-    "sha512=d02103b7b8b8d8bc797341dcc933554745427f3c1b51b54b4ac9ff81badfd68c94726c57548b08e00ca99f3e09741b54b6500e97c19fc0e8fcefd6dfbe71da7f"
+    "sha256=83eb3e4300aa9b1dc7820749010f4362ea83524742130524d78c20ce99ca747c"
+    "sha512=92b05cf92c389fa8c753f2acca837b15dd05a4a2e8e2bec7a269d2e14c35b1a786d394258376648f80b4b99250ba1900cfe68230b8385aeac153149d9ce56099"
   ]
 }
-x-commit-hash: "c5d5df80e128c3d7646b7d8b1322012c5fcc35f3"
+x-commit-hash: "e9a4cecb8294c1839db18b1d0c30e755ec85ed5e"
diff --git a/packages/upstream/sexp_pretty.v0.15.1/opam b/packages/upstream/sexp_pretty.v0.15.1/opam
new file mode 100644
index 000000000..56f0a474a
--- /dev/null
+++ b/packages/upstream/sexp_pretty.v0.15.1/opam
@@ -0,0 +1,30 @@
+opam-version: "2.0"
+name: "sexp_pretty"
+version: "v0.15.1"
+synopsis: "S-expression pretty-printer"
+description: """\
+A library for pretty-printing s-expressions, using better indentation rules than
+the default pretty printer in Sexplib."""
+maintainer: "Jane Street developers"
+authors: "Jane Street Group, LLC"
+license: "MIT"
+homepage: "https://github.com/janestreet/sexp_pretty"
+doc:
+  "https://ocaml.janestreet.com/ocaml-core/latest/doc/sexp_pretty/index.html"
+bug-reports: "https://github.com/janestreet/sexp_pretty/issues"
+depends: [
+  "ocaml" {>= "4.08.0"}
+  "base" {>= "v0.15" & < "v0.16"}
+  "ppx_base" {>= "v0.15" & < "v0.16"}
+  "sexplib" {>= "v0.15" & < "v0.16"}
+  "dune" {>= "2.0.0"}
+  "re" {>= "1.8.0"}
+]
+build: ["dune" "build" "-p" name "-j" jobs]
+dev-repo: "git+https://github.com/janestreet/sexp_pretty.git"
+url {
+  src:
+    "https://github.com/janestreet/sexp_pretty/archive/refs/tags/v0.15.1.tar.gz"
+  checksum:
+    "sha256=7e150c26068948fab42b2e9a1c2aec7032e204c02b77cf5ef14c0fab7b87e7e8"
+}
diff --git a/packages/upstream/sexplib.v0.14.0/opam b/packages/upstream/sexplib.v0.15.1/opam
similarity index 72%
rename from packages/upstream/sexplib.v0.14.0/opam
rename to packages/upstream/sexplib.v0.15.1/opam
index d54849fb1..0e1992852 100644
--- a/packages/upstream/sexplib.v0.14.0/opam
+++ b/packages/upstream/sexplib.v0.15.1/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "sexplib"
-version: "v0.14.0"
+version: "v0.15.1"
 synopsis: "Library for serializing OCaml values to and from S-expressions"
 description: """\
 Part of Jane Street's Core library
@@ -14,9 +14,9 @@ homepage: "https://github.com/janestreet/sexplib"
 doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/sexplib/index.html"
 bug-reports: "https://github.com/janestreet/sexplib/issues"
 depends: [
-  "ocaml" {>= "4.04.2"}
-  "parsexp" {>= "v0.14" & < "v0.15"}
-  "sexplib0" {>= "v0.14" & < "v0.15"}
+  "ocaml" {>= "4.08.0"}
+  "parsexp" {>= "v0.15" & < "v0.16"}
+  "sexplib0" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
   "num"
 ]
@@ -24,6 +24,7 @@ build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/sexplib.git"
 url {
   src:
-    "https://ocaml.janestreet.com/ocaml-core/v0.14/files/sexplib-v0.14.0.tar.gz"
-  checksum: "md5=6e230eae22face46cb8645e53e351067"
+    "https://github.com/janestreet/sexplib/archive/refs/tags/v0.15.1.tar.gz"
+  checksum:
+    "sha256=75da7d290d92d758c01f441f9589ccce031e11301563efde1c19149d39edbcbc"
 }
diff --git a/packages/upstream/sexplib0.v0.14.0/opam b/packages/upstream/sexplib0.v0.15.1/opam
similarity index 81%
rename from packages/upstream/sexplib0.v0.14.0/opam
rename to packages/upstream/sexplib0.v0.15.1/opam
index 26be98990..5b48daace 100644
--- a/packages/upstream/sexplib0.v0.14.0/opam
+++ b/packages/upstream/sexplib0.v0.15.1/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "sexplib0"
-version: "v0.14.0"
+version: "v0.15.1"
 synopsis:
   "Library containing the definition of S-expressions and some base converters"
 description: """\
@@ -15,13 +15,13 @@ homepage: "https://github.com/janestreet/sexplib0"
 doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/sexplib0/index.html"
 bug-reports: "https://github.com/janestreet/sexplib0/issues"
 depends: [
-  "ocaml" {>= "4.04.2"}
+  "ocaml" {>= "4.08"}
   "dune" {>= "2.0.0"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/sexplib0.git"
 url {
   src:
-    "https://ocaml.janestreet.com/ocaml-core/v0.14/files/sexplib0-v0.14.0.tar.gz"
-  checksum: "md5=37aff0af8f8f6f759249475684aebdc4"
+    "https://github.com/janestreet/sexplib0/archive/refs/tags/v0.15.1.tar.gz"
+  checksum: "md5=ab8fd6273f35a792cad48cbb3024a7f9"
 }
diff --git a/packages/upstream/sha.1.15.1/opam b/packages/upstream/sha.1.15.2/opam
similarity index 76%
rename from packages/upstream/sha.1.15.1/opam
rename to packages/upstream/sha.1.15.2/opam
index 038bbdc02..6532e6c13 100644
--- a/packages/upstream/sha.1.15.1/opam
+++ b/packages/upstream/sha.1.15.2/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "sha"
-version: "1.15.1"
+version: "1.15.2"
 synopsis: "Binding to the SHA cryptographic functions"
 description: """\
 This is the binding for SHA interface code in OCaml. Offering the same
@@ -52,10 +52,10 @@ build: [
 dev-repo: "git+https://github.com/djs55/ocaml-sha.git"
 url {
   src:
-    "https://github.com/djs55/ocaml-sha/releases/download/v1.15.1/sha-v1.15.1.tbz"
+    "https://github.com/djs55/ocaml-sha/releases/download/1.15.2/sha-1.15.2.tbz"
   checksum: [
-    "sha256=711b63c9dbf08178229a2e85dc2e3c8fb2eb5a07cc3ba9bd5092a32a5c6fa744"
-    "sha512=6c18039bac7fb420c918217c3119f3913235e4ca1846818b6b7d6a8df24221aef32f9c6ccf1c235a499d296d76471b0709b73faf4b3c525ffbf814f96d557b66"
+    "sha256=3fbd57b39a7c40068eb41ae1eccba140938beb5e3806a4cbbd79593b2183ffb7"
+    "sha512=25b01596c49427af484ae903508359261bd2cef355d43b5f29a2a87fb45b2a8a3e913e1324592c3efa02b5fef75b1aea76989d96268356d7a946b6d42c3be1ad"
   ]
 }
-x-commit-hash: "af5c7b1c7d3b8f9492038b7b40ba9cad82fb4ee8"
+x-commit-hash: "a3e1e7e2f661e2f33c04c630623a73a94bb0679b"
diff --git a/packages/upstream/shared-block-ring.3.0.0/opam b/packages/upstream/shared-block-ring.3.0.1/opam
similarity index 65%
rename from packages/upstream/shared-block-ring.3.0.0/opam
rename to packages/upstream/shared-block-ring.3.0.1/opam
index 05008de3d..16ff25d37 100644
--- a/packages/upstream/shared-block-ring.3.0.0/opam
+++ b/packages/upstream/shared-block-ring.3.0.1/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "shared-block-ring"
-version: "3.0.0"
+version: "3.0.1"
 synopsis: "A single-consumer single-producer queue on a block device"
 description: """\
 This is a simple queue containing variable-length items stored on a
@@ -14,42 +14,39 @@ bug-reports: "https://github.com/mirage/shared-block-ring/issues/"
 depends: [
   "ocaml" {>= "4.06.0"}
   "bisect_ppx" {dev & >= "2.5.0"}
-  "cmdliner"
-  "cstruct" {>= "3.0.0"}
+  "cmdliner" {>= "1.1.0"}
+  "cstruct" {>= "6.0.0"}
   "dune" {>= "2.7.0"}
   "duration"
-  "io-page"
-  "io-page-unix" {>= "2.0.0"}
+  "io-page" {>= "2.4.0"}
   "logs"
   "lwt"
   "lwt_log"
-  "mirage-block" {>= "2.0.1"}
-  "mirage-block-unix" {< "2.13.0"}
+  "mirage-block" {>= "3.0.0"}
+  "mirage-block-unix" {>= "2.13.0"}
   "mirage-clock" {>= "3.0.0"}
   "mirage-clock-unix" {with-test}
   "mirage-time" {>= "2.0.1"}
   "mirage-time-unix"
   "ounit2" {with-test}
   "ppx_cstruct"
-  "ppx_sexp_conv" {>= "v0.12.0"}
+  "ppx_sexp_conv" {>= "v0.10.0"}
   "result"
   "rresult"
   "sexplib"
   "sexplib0"
-  "conf-libev" {with-test}
 ]
 build: [
   ["dune" "subst"] {dev}
   ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
 dev-repo: "git+https://github.com/mirage/shared-block-ring.git"
 url {
   src:
-    "https://github.com/mirage/shared-block-ring/releases/download/3.0.0/shared-block-ring-3.0.0.tbz"
+    "https://github.com/mirage/shared-block-ring/releases/download/v3.0.1/shared-block-ring-3.0.1.tbz"
   checksum: [
-    "sha256=e8fc63805afee9d3a7f954edcea9faff8b990ae3f616ebd6ef87fd42624873ec"
-    "sha512=3d2d75c9b1cad3031de9ba6aa7e1ba2fa5e0040f25bbdb95fd5192ddf3fc1d6659e806dcc53e0eb7c78ef64dec6ceca63686e8d5c79c3a5379e66d977973de19"
+    "sha256=cf2ad61fbbf598f2aa6cb85fbea2e554a0a1fdaaadb0c8161eccbaa1910f3b83"
+    "sha512=274c9edaf7cc9bec72afd50f366bdc7287e354485649b5c29a9c4441356e222592573b31e2b5e3e28d98253d6303a77b8c353a3345d2664e5795ae35075f9b9c"
   ]
 }
-x-commit-hash: "1c22e3abdc45514cad188d7984dc0d985fb21f25"
+x-commit-hash: "e780fd9ed2186c14dd49f9e8d00211be648aa762"
diff --git a/packages/upstream/spawn.v0.14.0/opam b/packages/upstream/spawn.v0.15.1/opam
similarity index 70%
rename from packages/upstream/spawn.v0.14.0/opam
rename to packages/upstream/spawn.v0.15.1/opam
index 26f1bd60e..c758e376e 100644
--- a/packages/upstream/spawn.v0.14.0/opam
+++ b/packages/upstream/spawn.v0.15.1/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "spawn"
-version: "v0.14.0"
+version: "v0.15.1"
 synopsis: "Spawning sub-processes"
 description: """\
 Spawn is a small library exposing only one functionality: spawning sub-process.
@@ -14,7 +14,7 @@ working directory
 sub-process. For instance if a command is not found, you get a proper
 [Unix.Unix_error] exception
 
-3. improve performances by using vfork when available. It is often
+3. improve performance by using vfork when available. It is often
 claimed that nowadays fork is as fast as vfork, however in practice
 fork takes time proportional to the process memory while vfork is
 constant time. In application using a lot of memory, vfork can be
@@ -26,9 +26,10 @@ homepage: "https://github.com/janestreet/spawn"
 doc: "https://janestreet.github.io/spawn/"
 bug-reports: "https://github.com/janestreet/spawn/issues"
 depends: [
-  "dune" {>= "2.5"}
+  "dune" {>= "2.8"}
   "ppx_expect" {with-test}
-  "ocaml" {>= "4.02.3"}
+  "ocaml" {>= "4.05"}
+  "odoc" {with-doc}
 ]
 build: [
   ["dune" "subst"] {dev}
@@ -46,11 +47,10 @@ build: [
 ]
 dev-repo: "git+https://github.com/janestreet/spawn.git"
 url {
-  src:
-    "https://github.com/janestreet/spawn/releases/download/v0.14.0/spawn-v0.14.0.tbz"
+  src: "https://github.com/janestreet/spawn/archive/v0.15.1.tar.gz"
   checksum: [
-    "sha256=1a7b473dad236fad11573137dbb3f6d8d35340eb9d1612c178dc4459f6007d94"
-    "sha512=2f78b00d831bcb9343d5b28155110efd60597cd5097f2cee033360a34ceba8f32074aa5c7feba94edb3abf44453551a64156feaf4f64ddc3a69c48530921d89c"
+    "sha256=9afdee314fab6c3fcd689ab6eb5608d6b78078e6dede3953a47debde06c19d50"
+    "sha512=efdb31d5ec5ea36d0bc80224d4ee04e46ce3428d1662870e6cebece92bc313d6eebee378802c0c059dd6e0cafea515308c31b7dfaf04a098eb4566583c1e9ed4"
   ]
 }
-x-commit-hash: "b5a25cab2f53a5ee9e10a7b8a96506cc61ce1198"
+x-commit-hash: "13d279ebfa8c40d4bafe18cddfdff0de54b4eaff"
diff --git a/packages/upstream/splittable_random.v0.14.0/opam b/packages/upstream/splittable_random.v0.15.0/opam
similarity index 69%
rename from packages/upstream/splittable_random.v0.14.0/opam
rename to packages/upstream/splittable_random.v0.15.0/opam
index 7f9baabd0..509466d7d 100644
--- a/packages/upstream/splittable_random.v0.14.0/opam
+++ b/packages/upstream/splittable_random.v0.15.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "splittable_random"
-version: "v0.14.0"
+version: "v0.15.0"
 synopsis: "PRNG that can be split into independent streams"
 description: """\
 PRNG that can be split into independent streams
@@ -19,18 +19,19 @@ doc:
   "https://ocaml.janestreet.com/ocaml-core/latest/doc/splittable_random/index.html"
 bug-reports: "https://github.com/janestreet/splittable_random/issues"
 depends: [
-  "ocaml" {>= "4.04.2"}
-  "base" {>= "v0.14" & < "v0.15"}
-  "ppx_assert" {>= "v0.14" & < "v0.15"}
-  "ppx_bench" {>= "v0.14" & < "v0.15"}
-  "ppx_inline_test" {>= "v0.14" & < "v0.15"}
-  "ppx_sexp_message" {>= "v0.14" & < "v0.15"}
+  "ocaml" {>= "4.08.0"}
+  "base" {>= "v0.15" & < "v0.16"}
+  "ppx_assert" {>= "v0.15" & < "v0.16"}
+  "ppx_bench" {>= "v0.15" & < "v0.16"}
+  "ppx_inline_test" {>= "v0.15" & < "v0.16"}
+  "ppx_sexp_message" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/splittable_random.git"
 url {
   src:
-    "https://ocaml.janestreet.com/ocaml-core/v0.14/files/splittable_random-v0.14.0.tar.gz"
-  checksum: "md5=18ecdf4352883c70c48a3e02931b9521"
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/splittable_random-v0.15.0.tar.gz"
+  checksum:
+    "sha256=9ff8e6c85fb5c39f45ca8bcf499a8bc3f419a18e759091d3a8d82b2aabeedb00"
 }
diff --git a/packages/upstream/ssl.0.5.9/opam b/packages/upstream/ssl.0.5.13/opam
similarity index 59%
rename from packages/upstream/ssl.0.5.9/opam
rename to packages/upstream/ssl.0.5.13/opam
index 932b7491d..16cc5659c 100644
--- a/packages/upstream/ssl.0.5.9/opam
+++ b/packages/upstream/ssl.0.5.13/opam
@@ -1,29 +1,30 @@
 opam-version: "2.0"
 name: "ssl"
-version: "0.5.9"
+version: "0.5.13"
 synopsis: "Bindings for OpenSSL"
-license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 maintainer: "Samuel Mimram <samuel.mimram@ens-lyon.org>"
 authors: "Samuel Mimram <samuel.mimram@ens-lyon.org>"
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 homepage: "https://github.com/savonet/ocaml-ssl"
 bug-reports: "https://github.com/savonet/ocaml-ssl/issues"
 depends: [
   "ocaml" {>= "4.02.0"}
-  "dune" {>= "1.2.1"}
+  "dune" {>= "2.0.0"}
   "dune-configurator"
   "base-unix"
   "conf-libssl"
 ]
-conflicts: ["base-nnp" "ocaml-option-nppchecker"]
 build: [
   ["dune" "subst"] {dev}
   ["dune" "build" "-p" name "-j" jobs]
 ]
 dev-repo: "git+https://github.com/savonet/ocaml-ssl.git"
 url {
-  src: "https://github.com/savonet/ocaml-ssl/archive/0.5.9.tar.gz"
+  src:
+    "https://github.com/savonet/ocaml-ssl/releases/download/0.5.13/ssl-0.5.13.tbz"
   checksum: [
-    "md5=09265ae2dee5ac48507ccb8a81244a15"
-    "sha512=6826e5a6ab9f51013e8d097900f443d091e085e3d2d232a315a0e3a90ca334c9b9779d20dcae267f9ed961bc4a08fcb80372e669389c59a22d5c7706d37fcd5f"
+    "sha256=d68550952c8fed5e7922b273597a4da801c254edd21a971360f510529e1c2b39"
+    "sha512=0d6b4265bf75c3d9b7f262486ab52410f9a16208193171d7a5b74e4e233dfab847c153aa711aaf9114f4997546c4c39d45273ce20e9cbdaaf5d41c58c1635adc"
   ]
 }
+x-commit-hash: "d9f9695947498b43afe47d7078b6d53f77104717"
diff --git a/packages/upstream/stdio.v0.14.0/opam b/packages/upstream/stdio.v0.15.0/opam
similarity index 73%
rename from packages/upstream/stdio.v0.14.0/opam
rename to packages/upstream/stdio.v0.15.0/opam
index 15a3d06a7..86fac07df 100644
--- a/packages/upstream/stdio.v0.14.0/opam
+++ b/packages/upstream/stdio.v0.15.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "stdio"
-version: "v0.14.0"
+version: "v0.15.0"
 synopsis: "Standard IO library for OCaml"
 description: """\
 Stdio implements simple input/output functionalities for OCaml.
@@ -14,14 +14,15 @@ homepage: "https://github.com/janestreet/stdio"
 doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/stdio/index.html"
 bug-reports: "https://github.com/janestreet/stdio/issues"
 depends: [
-  "ocaml" {>= "4.04.2"}
-  "base" {>= "v0.14" & < "v0.15"}
+  "ocaml" {>= "4.08.0"}
+  "base" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/stdio.git"
 url {
   src:
-    "https://ocaml.janestreet.com/ocaml-core/v0.14/files/stdio-v0.14.0.tar.gz"
-  checksum: "md5=4cbdf15f0be88c3258aaeff9e04e00e9"
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/stdio-v0.15.0.tar.gz"
+  checksum:
+    "sha256=c37292921dc6a88425f773eba6bdbeac1dedacd1f55917fa4bcd9c4b25795e4b"
 }
diff --git a/packages/upstream/stringext.1.6.0/opam b/packages/upstream/stringext.1.6.0/opam
index 54d5a0517..81af80ba4 100644
--- a/packages/upstream/stringext.1.6.0/opam
+++ b/packages/upstream/stringext.1.6.0/opam
@@ -15,7 +15,6 @@ depends: [
   "dune" {>= "1.0"}
   "ounit" {with-test}
   "qtest" {with-test & >= "2.2"}
-  "base-bytes"
 ]
 build: [
   ["dune" "subst"] {dev}
diff --git a/packages/upstream/tar-unix.1.1.0/opam b/packages/upstream/tar-unix.1.1.0/opam
deleted file mode 100644
index 95f3b152b..000000000
--- a/packages/upstream/tar-unix.1.1.0/opam
+++ /dev/null
@@ -1,36 +0,0 @@
-opam-version: "2.0"
-name: "tar-unix"
-version: "1.1.0"
-synopsis: "Decode and encode tar format files from Unix"
-description: """\
-tar is a simple library to read and write tar files with an emphasis on
-streaming.  This library provides a Unix or Windows compatible interface."""
-maintainer: "dave@recoil.org"
-authors: ["Dave Scott" "Thomas Gazagnaire" "David Allsopp"]
-tags: ["org:xapi-project" "org:mirage"]
-homepage: "https://github.com/mirage/ocaml-tar"
-doc: "https://mirage.github.io/ocaml-tar/"
-bug-reports: "https://github.com/mirage/ocaml-tar/issues"
-license: "ISC"
-depends: [
-  "ocaml" {>= "4.03.0"}
-  "dune" {>= "1.0"}
-  "tar" {>= "1.0.0" & < "2.0.0"}
-  "cstruct" {>= "1.9.0"}
-  "cstruct-lwt"
-  "re" {>= "1.7.2"}
-  "lwt"
-]
-build: [
-  ["dune" "subst"] {dev}
-  ["dune" "build" "-p" name "-j" jobs]
-]
-dev-repo: "git+https://github.com/mirage/ocaml-tar.git"
-url {
-  src:
-    "https://github.com/mirage/ocaml-tar/releases/download/v1.1.0/tar-v1.1.0.tbz"
-  checksum: [
-    "sha256=c48e4ce128058fac4ae1a0f3d2d49f42d9a736a3bf166b59f086e6e6f926018d"
-    "sha512=ea273a8fefab42624c42da9d1a02557d1c51d4d8c0d032e8d8a17e0f6866c56b3ab0b32eacb8ad788bbf6983bff36ac072353af08a730b6b26f9c45d4d4f521a"
-  ]
-}
diff --git a/packages/upstream/tar-unix.2.0.1/opam b/packages/upstream/tar-unix.2.0.1/opam
new file mode 100644
index 000000000..2ad445ae3
--- /dev/null
+++ b/packages/upstream/tar-unix.2.0.1/opam
@@ -0,0 +1,50 @@
+opam-version: "2.0"
+name: "tar-unix"
+version: "2.0.1"
+synopsis: "Decode and encode tar format files from Unix"
+description: """\
+tar is a simple library to read and write tar files with an emphasis on
+streaming.  This library provides a Unix or Windows compatible interface."""
+maintainer: "dave@recoil.org"
+authors: ["Dave Scott" "Thomas Gazagnaire" "David Allsopp" "Antonin Décimo"]
+license: "ISC"
+tags: ["org:xapi-project" "org:mirage"]
+homepage: "https://github.com/mirage/ocaml-tar"
+doc: "https://mirage.github.io/ocaml-tar/"
+bug-reports: "https://github.com/mirage/ocaml-tar/issues"
+depends: [
+  "dune" {>= "2.9"}
+  "ocaml" {>= "4.03.0"}
+  "cstruct" {>= "6.0.0"}
+  "cstruct-lwt"
+  "lwt"
+  "re" {>= "1.7.2"}
+  "tar" {= version}
+  "odoc" {with-doc}
+]
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "--promote-install-files=false"
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+  ["dune" "install" "-p" name "--create-install-files" name]
+]
+dev-repo: "git+https://github.com/mirage/ocaml-tar.git"
+url {
+  src:
+    "https://github.com/mirage/ocaml-tar/releases/download/v2.0.1/tar-mirage-2.0.1.tbz"
+  checksum: [
+    "sha256=e9565fb43dab9e944d1860f9a3b5c681df72211b859c66ee1d7085cafc13ee9b"
+    "sha512=e4486274b44e6b34540afc9893bc0f2b604ba01c576b01aeb0b494f30791a0c353d1809de62e2f0ae04de771a2391affb17b98b1fc6c0d2fc2e963741bc65a55"
+  ]
+}
+x-commit-hash: "a6552cb5e82d3100de3a8d93d803ca1677b34207"
diff --git a/packages/upstream/tar.1.1.0/opam b/packages/upstream/tar.1.1.0/opam
deleted file mode 100644
index 27f0301ff..000000000
--- a/packages/upstream/tar.1.1.0/opam
+++ /dev/null
@@ -1,37 +0,0 @@
-opam-version: "2.0"
-name: "tar"
-version: "1.1.0"
-synopsis: "Decode and encode tar format files in pure OCaml"
-description: """\
-tar is a simple library to read and write tar files with an emphasis on
-streaming.
-
-This is pure OCaml code, no C bindings."""
-maintainer: "dave@recoil.org"
-authors: ["Dave Scott" "Thomas Gazagnaire" "David Allsopp"]
-tags: ["org:xapi-project" "org:mirage"]
-homepage: "https://github.com/mirage/ocaml-tar"
-doc: "https://mirage.github.io/ocaml-tar/"
-bug-reports: "https://github.com/mirage/ocaml-tar/issues"
-license: "ISC"
-depends: [
-  "ocaml" {>= "4.03.0"}
-  "dune" {>= "1.0"}
-  "ppx_tools" {build}
-  "ppx_cstruct" {>= "3.6.0"}
-  "cstruct" {>= "1.9.0"}
-  "re"
-]
-build: [
-  ["dune" "subst"] {dev}
-  ["dune" "build" "-p" name "-j" jobs]
-]
-dev-repo: "git+https://github.com/mirage/ocaml-tar.git"
-url {
-  src:
-    "https://github.com/mirage/ocaml-tar/releases/download/v1.1.0/tar-v1.1.0.tbz"
-  checksum: [
-    "sha256=c48e4ce128058fac4ae1a0f3d2d49f42d9a736a3bf166b59f086e6e6f926018d"
-    "sha512=ea273a8fefab42624c42da9d1a02557d1c51d4d8c0d032e8d8a17e0f6866c56b3ab0b32eacb8ad788bbf6983bff36ac072353af08a730b6b26f9c45d4d4f521a"
-  ]
-}
diff --git a/packages/upstream/tar.2.0.1/opam b/packages/upstream/tar.2.0.1/opam
new file mode 100644
index 000000000..8f7d22f5c
--- /dev/null
+++ b/packages/upstream/tar.2.0.1/opam
@@ -0,0 +1,51 @@
+opam-version: "2.0"
+name: "tar"
+version: "2.0.1"
+synopsis: "Decode and encode tar format files in pure OCaml"
+description: """\
+tar is a simple library to read and write tar files with an emphasis on
+streaming.
+
+This is pure OCaml code, no C bindings."""
+maintainer: "dave@recoil.org"
+authors: ["Dave Scott" "Thomas Gazagnaire" "David Allsopp" "Antonin Décimo"]
+license: "ISC"
+tags: ["org:xapi-project" "org:mirage"]
+homepage: "https://github.com/mirage/ocaml-tar"
+doc: "https://mirage.github.io/ocaml-tar/"
+bug-reports: "https://github.com/mirage/ocaml-tar/issues"
+depends: [
+  "dune" {>= "2.9"}
+  "camlp-streams"
+  "ocaml" {>= "4.08.0"}
+  "ppx_cstruct" {build & >= "3.6.0"}
+  "cstruct" {>= "6.0.0"}
+  "re" {>= "1.7.2"}
+  "odoc" {with-doc}
+]
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "--promote-install-files=false"
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+  ["dune" "install" "-p" name "--create-install-files" name]
+]
+dev-repo: "git+https://github.com/mirage/ocaml-tar.git"
+url {
+  src:
+    "https://github.com/mirage/ocaml-tar/releases/download/v2.0.1/tar-mirage-2.0.1.tbz"
+  checksum: [
+    "sha256=e9565fb43dab9e944d1860f9a3b5c681df72211b859c66ee1d7085cafc13ee9b"
+    "sha512=e4486274b44e6b34540afc9893bc0f2b604ba01c576b01aeb0b494f30791a0c353d1809de62e2f0ae04de771a2391affb17b98b1fc6c0d2fc2e963741bc65a55"
+  ]
+}
+x-commit-hash: "a6552cb5e82d3100de3a8d93d803ca1677b34207"
diff --git a/packages/upstream/textutils.v0.14.0/opam b/packages/upstream/textutils.v0.15.0/opam
similarity index 56%
rename from packages/upstream/textutils.v0.14.0/opam
rename to packages/upstream/textutils.v0.15.0/opam
index 1d08ab43e..6bba392fd 100644
--- a/packages/upstream/textutils.v0.14.0/opam
+++ b/packages/upstream/textutils.v0.15.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "textutils"
-version: "v0.14.0"
+version: "v0.15.0"
 synopsis: "Text output utilities"
 maintainer: "Jane Street developers"
 authors: "Jane Street Group, LLC"
@@ -11,15 +11,19 @@ doc:
 bug-reports: "https://github.com/janestreet/textutils/issues"
 depends: [
   "ocaml" {>= "4.08.0"}
-  "core" {>= "v0.14" & < "v0.15"}
-  "core_kernel" {>= "v0.14" & < "v0.15"}
-  "ppx_jane" {>= "v0.14" & < "v0.15"}
+  "core" {>= "v0.15" & < "v0.16"}
+  "core_kernel" {>= "v0.15" & < "v0.16"}
+  "core_unix" {>= "v0.15" & < "v0.16"}
+  "ppx_jane" {>= "v0.15" & < "v0.16"}
+  "textutils_kernel" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
+  "uutf" {>= "1.0.2"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/textutils.git"
 url {
   src:
-    "https://ocaml.janestreet.com/ocaml-core/v0.14/files/textutils-v0.14.0.tar.gz"
-  checksum: "md5=32980ca8c5c6128273bb6f662efc7c60"
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/textutils-v0.15.0.tar.gz"
+  checksum:
+    "sha256=c0368fb6ad18727cd69fbfb20dd734fb7f7189707107d1f88d8de15837dc22df"
 }
diff --git a/packages/upstream/textutils_kernel.v0.15.0/opam b/packages/upstream/textutils_kernel.v0.15.0/opam
new file mode 100644
index 000000000..60b5e8072
--- /dev/null
+++ b/packages/upstream/textutils_kernel.v0.15.0/opam
@@ -0,0 +1,26 @@
+opam-version: "2.0"
+name: "textutils_kernel"
+version: "v0.15.0"
+synopsis: "Text output utilities"
+maintainer: "Jane Street developers"
+authors: "Jane Street Group, LLC"
+license: "MIT"
+homepage: "https://github.com/janestreet/textutils_kernel"
+doc:
+  "https://ocaml.janestreet.com/ocaml-core/latest/doc/textutils_kernel/index.html"
+bug-reports: "https://github.com/janestreet/textutils_kernel/issues"
+depends: [
+  "ocaml" {>= "4.08.0"}
+  "core" {>= "v0.15" & < "v0.16"}
+  "ppx_jane" {>= "v0.15" & < "v0.16"}
+  "dune" {>= "2.0.0"}
+  "uutf" {>= "1.0.2"}
+]
+build: ["dune" "build" "-p" name "-j" jobs]
+dev-repo: "git+https://github.com/janestreet/textutils_kernel.git"
+url {
+  src:
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/textutils_kernel-v0.15.0.tar.gz"
+  checksum:
+    "sha256=acac915dc3240a0888141e89dc9fcc8fe696c25003f331ca0f014bcbeb57fa37"
+}
diff --git a/packages/upstream/time_now.v0.14.0/opam b/packages/upstream/time_now.v0.15.0/opam
similarity index 60%
rename from packages/upstream/time_now.v0.14.0/opam
rename to packages/upstream/time_now.v0.15.0/opam
index c0939b336..517a3b26e 100644
--- a/packages/upstream/time_now.v0.14.0/opam
+++ b/packages/upstream/time_now.v0.15.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "time_now"
-version: "v0.14.0"
+version: "v0.15.0"
 synopsis: "Reports the current time"
 description: """\
 Provides a single function to report the current time in nanoseconds
@@ -12,18 +12,19 @@ homepage: "https://github.com/janestreet/time_now"
 doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/time_now/index.html"
 bug-reports: "https://github.com/janestreet/time_now/issues"
 depends: [
-  "ocaml" {>= "4.04.2"}
-  "base" {>= "v0.14" & < "v0.15"}
-  "jane-street-headers" {>= "v0.14" & < "v0.15"}
-  "jst-config" {>= "v0.14" & < "v0.15"}
-  "ppx_base" {>= "v0.14" & < "v0.15"}
-  "ppx_optcomp" {>= "v0.14" & < "v0.15"}
+  "ocaml" {>= "4.08.0"}
+  "base" {>= "v0.15" & < "v0.16"}
+  "jane-street-headers" {>= "v0.15" & < "v0.16"}
+  "jst-config" {>= "v0.15" & < "v0.16"}
+  "ppx_base" {>= "v0.15" & < "v0.16"}
+  "ppx_optcomp" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/time_now.git"
 url {
   src:
-    "https://ocaml.janestreet.com/ocaml-core/v0.14/files/time_now-v0.14.0.tar.gz"
-  checksum: "md5=a93116938783587f8b9f5152dd543037"
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/time_now-v0.15.0.tar.gz"
+  checksum:
+    "sha256=13b353305da2d349fce3bb47be24307a7163318872238eda0a91f15a8a0bcba8"
 }
diff --git a/packages/upstream/timezone.v0.14.0/opam b/packages/upstream/timezone.v0.15.0/opam
similarity index 71%
rename from packages/upstream/timezone.v0.14.0/opam
rename to packages/upstream/timezone.v0.15.0/opam
index 39a0ae8fe..0eb6d2afa 100644
--- a/packages/upstream/timezone.v0.14.0/opam
+++ b/packages/upstream/timezone.v0.15.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "timezone"
-version: "v0.14.0"
+version: "v0.15.0"
 synopsis: "Time-zone handling"
 description: """\
 Timezone handles parsing timezone data and create [Timezone.t] that
@@ -13,14 +13,15 @@ doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/timezone/index.html"
 bug-reports: "https://github.com/janestreet/timezone/issues"
 depends: [
   "ocaml" {>= "4.08.0"}
-  "core_kernel" {>= "v0.14" & < "v0.15"}
-  "ppx_jane" {>= "v0.14" & < "v0.15"}
+  "core" {>= "v0.15" & < "v0.16"}
+  "ppx_jane" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/timezone.git"
 url {
   src:
-    "https://ocaml.janestreet.com/ocaml-core/v0.14/files/timezone-v0.14.0.tar.gz"
-  checksum: "md5=41a3d1bc43d3215e44018674776b07ca"
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/timezone-v0.15.0.tar.gz"
+  checksum:
+    "sha256=a5fecedd06c779a7a6c0b910e2a1bfc7119049a57e8f6c59bf18752c1271410d"
 }
diff --git a/packages/upstream/topkg.1.0.4/opam b/packages/upstream/topkg.1.0.5/opam
similarity index 87%
rename from packages/upstream/topkg.1.0.4/opam
rename to packages/upstream/topkg.1.0.5/opam
index 300cb6e6f..01dad5be8 100644
--- a/packages/upstream/topkg.1.0.4/opam
+++ b/packages/upstream/topkg.1.0.5/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "topkg"
-version: "1.0.4"
+version: "1.0.5"
 synopsis: "The transitory OCaml software packager"
 description: """\
 Topkg is a packager for distributing OCaml software. It provides an
@@ -36,14 +36,14 @@ homepage: "https://erratique.ch/software/topkg"
 doc: "https://erratique.ch/software/topkg/doc"
 bug-reports: "https://github.com/dbuenzli/topkg/issues"
 depends: [
-  "ocaml" {>= "4.03.0"}
+  "ocaml" {>= "4.05.0"}
   "ocamlfind" {build & >= "1.6.1"}
   "ocamlbuild"
 ]
 build: ["ocaml" "pkg/pkg.ml" "build" "--pkg-name" name "--dev-pkg" "%{dev}%"]
 dev-repo: "git+https://erratique.ch/repos/topkg.git"
 url {
-  src: "https://erratique.ch/software/topkg/releases/topkg-1.0.4.tbz"
+  src: "https://erratique.ch/software/topkg/releases/topkg-1.0.5.tbz"
   checksum:
-    "sha512=5baa1bf0105397589b741acd0195069823548b2051e453dffd641e5d00536b7a5f41b38d005b2b063f9e7cfb9a3b627bec3e6ad48e56769cc35a71f97a897f1b"
+    "sha512=9450e9139209aacd8ddb4ba18e4225770837e526a52a56d94fd5c9c4c9941e83e0e7102e2292b440104f4c338fabab47cdd6bb51d69b41cc92cc7a551e6fefab"
 }
diff --git a/packages/upstream/typerep.v0.14.0/opam b/packages/upstream/typerep.v0.15.0/opam
similarity index 67%
rename from packages/upstream/typerep.v0.14.0/opam
rename to packages/upstream/typerep.v0.15.0/opam
index f7655aaca..0004ea618 100644
--- a/packages/upstream/typerep.v0.14.0/opam
+++ b/packages/upstream/typerep.v0.15.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "typerep"
-version: "v0.14.0"
+version: "v0.15.0"
 synopsis: "Typerep is a library for runtime types"
 maintainer: "Jane Street developers"
 authors: "Jane Street Group, LLC"
@@ -9,14 +9,15 @@ homepage: "https://github.com/janestreet/typerep"
 doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/typerep/index.html"
 bug-reports: "https://github.com/janestreet/typerep/issues"
 depends: [
-  "ocaml" {>= "4.04.2"}
-  "base" {>= "v0.14" & < "v0.15"}
+  "ocaml" {>= "4.08.0"}
+  "base" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/typerep.git"
 url {
   src:
-    "https://ocaml.janestreet.com/ocaml-core/v0.14/files/typerep-v0.14.0.tar.gz"
-  checksum: "md5=a1d10bec724e500fd2f6b7798fc0409c"
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/typerep-v0.15.0.tar.gz"
+  checksum:
+    "sha256=26c8d37db41440a417593fcb389aaebafdf2e33e62bd762e1f148875a7a3183e"
 }
diff --git a/packages/upstream/uuidm.0.9.7/opam b/packages/upstream/uuidm.0.9.8/opam
similarity index 60%
rename from packages/upstream/uuidm.0.9.7/opam
rename to packages/upstream/uuidm.0.9.8/opam
index fc50d1195..dfccc895d 100644
--- a/packages/upstream/uuidm.0.9.7/opam
+++ b/packages/upstream/uuidm.0.9.8/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "uuidm"
-version: "0.9.7"
+version: "0.9.8"
 synopsis: "Universally unique identifiers (UUIDs) for OCaml"
 description: """\
 Uuidm is an OCaml module implementing 128 bits universally unique
@@ -9,32 +9,38 @@ identifiers version 3, 5 (named based with MD5, SHA-1 hashing) and 4
 
 Uuidm has no dependency and is distributed under the ISC license.
 
-[rfc4122]: http://tools.ietf.org/html/rfc4122"""
+[rfc4122]: http://tools.ietf.org/html/rfc4122
+
+Homepage: <http://erratique.ch/software/uuidm>"""
 maintainer: "Daniel Bünzli <daniel.buenzl i@erratique.ch>"
-authors: "Daniel Bünzli <daniel.buenzl i@erratique.ch>"
+authors: "The uuidm programmers"
 license: "ISC"
 tags: ["uuid" "codec" "org:erratique"]
 homepage: "https://erratique.ch/software/uuidm"
-doc: "https://erratique.ch/software/uuidm/doc/Uuidm"
+doc: "https://erratique.ch/software/uuidm/doc/"
 bug-reports: "https://github.com/dbuenzli/uuidm/issues"
 depends: [
-  "ocaml" {>= "4.03.0"}
+  "ocaml" {>= "4.08.0"}
   "ocamlfind" {build}
   "ocamlbuild" {build}
-  "topkg" {build}
+  "topkg" {build & >= "1.0.3"}
 ]
 depopts: ["cmdliner"]
+conflicts: [
+  "cmdliner" {< "1.1.0"}
+]
 build: [
   "ocaml"
   "pkg/pkg.ml"
   "build"
-  "--pinned"
-  "%{pinned}%"
+  "--dev-pkg"
+  "%{dev}%"
   "--with-cmdliner"
   "%{cmdliner:installed}%"
 ]
 dev-repo: "git+https://erratique.ch/repos/uuidm.git"
 url {
-  src: "https://erratique.ch/software/uuidm/releases/uuidm-0.9.7.tbz"
-  checksum: "md5=54658248e3981d8c05237d0a4277ccd3"
+  src: "https://erratique.ch/software/uuidm/releases/uuidm-0.9.8.tbz"
+  checksum:
+    "sha512=d5073ae49c402ab3ea6dc8f86bc5b8cc14129437e23e47da4d91431648fcb31c4dce6308f9c936c58df9a2c6afda61d77105a3022e369cca4e4c140320e803b5"
 }
diff --git a/packages/upstream/uutf.1.0.2/opam b/packages/upstream/uutf.1.0.3/opam
similarity index 55%
rename from packages/upstream/uutf.1.0.2/opam
rename to packages/upstream/uutf.1.0.3/opam
index c2152df41..174ba7d66 100644
--- a/packages/upstream/uutf.1.0.2/opam
+++ b/packages/upstream/uutf.1.0.3/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "uutf"
-version: "1.0.2"
+version: "1.0.3"
 synopsis: "Non-blocking streaming Unicode codec for OCaml"
 description: """\
 Uutf is a non-blocking streaming codec to decode and encode the UTF-8,
@@ -10,38 +10,42 @@ character position tracking and support newline normalization.
 
 Functions are also provided to fold over the characters of UTF encoded
 OCaml string values and to directly encode characters in OCaml
-Buffer.t values.
+Buffer.t values. **Note** that since OCaml 4.14, that functionality
+can be found in the Stdlib and you are encouraged to migrate to it.
 
-Uutf has no dependency and is distributed under the ISC license."""
+Uutf has no dependency and is distributed under the ISC license.
+
+Home page: http://erratique.ch/software/uutf  
+Contact: Daniel Bünzli `<daniel.buenzl i@erratique.ch>`"""
 maintainer: "Daniel Bünzli <daniel.buenzl i@erratique.ch>"
-authors: "Daniel Bünzli <daniel.buenzl i@erratique.ch>"
+authors: "The uutf programmers"
 license: "ISC"
 tags: ["unicode" "text" "utf-8" "utf-16" "codec" "org:erratique"]
-homepage: "http://erratique.ch/software/uutf"
-doc: "http://erratique.ch/software/uutf/doc/Uutf"
+homepage: "https://erratique.ch/software/uutf"
+doc: "https://erratique.ch/software/uutf/doc/"
 bug-reports: "https://github.com/dbuenzli/uutf/issues"
 depends: [
-  "ocaml" {>= "4.01.0"}
+  "ocaml" {>= "4.03.0"}
   "ocamlfind" {build}
   "ocamlbuild" {build}
-  "topkg" {build}
-  "uchar"
+  "topkg" {build & >= "1.0.3"}
 ]
 depopts: ["cmdliner"]
 conflicts: [
-  "cmdliner" {< "0.9.6"}
+  "cmdliner" {< "0.9.8"}
 ]
 build: [
   "ocaml"
   "pkg/pkg.ml"
   "build"
-  "--pinned"
-  "%{pinned}%"
+  "--dev-pkg"
+  "%{dev}%"
   "--with-cmdliner"
   "%{cmdliner:installed}%"
 ]
-dev-repo: "git+http://erratique.ch/repos/uutf.git"
+dev-repo: "git+https://erratique.ch/repos/uutf.git"
 url {
-  src: "http://erratique.ch/software/uutf/releases/uutf-1.0.2.tbz"
-  checksum: "md5=a7c542405a39630c689a82bd7ef2292c"
+  src: "https://erratique.ch/software/uutf/releases/uutf-1.0.3.tbz"
+  checksum:
+    "sha512=50cc4486021da46fb08156e9daec0d57b4ca469b07309c508d5a9a41e9dbcf1f32dec2ed7be027326544453dcaf9c2534919395fd826dc7768efc6cc4bfcc9f8"
 }
diff --git a/packages/upstream/variantslib.v0.14.0/opam b/packages/upstream/variantslib.v0.15.0/opam
similarity index 74%
rename from packages/upstream/variantslib.v0.14.0/opam
rename to packages/upstream/variantslib.v0.15.0/opam
index 54f9a905f..15b9066da 100644
--- a/packages/upstream/variantslib.v0.14.0/opam
+++ b/packages/upstream/variantslib.v0.15.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "variantslib"
-version: "v0.14.0"
+version: "v0.15.0"
 synopsis: "Part of Jane Street's Core library"
 description: """\
 The Core suite of libraries is an industrial strength alternative to
@@ -14,14 +14,15 @@ doc:
   "https://ocaml.janestreet.com/ocaml-core/latest/doc/variantslib/index.html"
 bug-reports: "https://github.com/janestreet/variantslib/issues"
 depends: [
-  "ocaml" {>= "4.04.2"}
-  "base" {>= "v0.14" & < "v0.15"}
+  "ocaml" {>= "4.08.0"}
+  "base" {>= "v0.15" & < "v0.16"}
   "dune" {>= "2.0.0"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/variantslib.git"
 url {
   src:
-    "https://ocaml.janestreet.com/ocaml-core/v0.14/files/variantslib-v0.14.0.tar.gz"
-  checksum: "md5=c0a0481de7df3df028bdec76d9993892"
+    "https://ocaml.janestreet.com/ocaml-core/v0.15/files/variantslib-v0.15.0.tar.gz"
+  checksum:
+    "sha256=e5d87438e439877d8580ed209b17c0ba5e36e1405fcf9ddd972f1bbf48d7ba89"
 }
diff --git a/packages/upstream/vhd-format-lwt.0.12.2/opam b/packages/upstream/vhd-format-lwt.0.12.3/opam
similarity index 72%
rename from packages/upstream/vhd-format-lwt.0.12.2/opam
rename to packages/upstream/vhd-format-lwt.0.12.3/opam
index 9ddc38803..00ff919c8 100644
--- a/packages/upstream/vhd-format-lwt.0.12.2/opam
+++ b/packages/upstream/vhd-format-lwt.0.12.3/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "vhd-format-lwt"
-version: "0.12.2"
+version: "0.12.3"
 synopsis: "Lwt interface to read/write VHD format data"
 description: """\
 A pure OCaml library to read and write
@@ -18,15 +18,14 @@ homepage: "https://github.com/mirage/ocaml-vhd"
 doc: "https://mirage.github.io/ocaml-vhd/"
 bug-reports: "https://github.com/mirage/ocaml-vhd/issues"
 depends: [
-  "ocaml" {>= "4.02.3"}
-  "cstruct"
+  "ocaml" {>= "4.02.3" & < "5.0.0"}
+  "cstruct" {< "6.1.0"}
   "lwt" {>= "3.2.0"}
   "mirage-block" {>= "2.0.1"}
-  "ounit" {with-test}
+  "ounit2" {with-test}
   "vhd-format"
-  "io-page-unix" {with-test}
   "dune" {>= "1.0"}
-  "io-page" {with-test & >= "2.4.0"}
+  "io-page" {with-test & >= "2.4.0" & < "3.0.0"}
 ]
 available: os = "linux" | os = "macos"
 build: [
@@ -37,10 +36,10 @@ depexts: ["linux-headers"] {os-distribution = "alpine"}
 dev-repo: "git+https://github.com/mirage/ocaml-vhd.git"
 url {
   src:
-    "https://github.com/mirage/ocaml-vhd/releases/download/v0.12.2/vhd-format-v0.12.2.tbz"
+    "https://github.com/mirage/ocaml-vhd/releases/download/v0.12.3/vhd-format-0.12.3.tbz"
   checksum: [
-    "sha256=c14d8ed7714d6f422ed17bd6e8a20f9a15cfc0f29497d2d7c6725fdcf3c410eb"
-    "sha512=3b9b9434f54fa481e84dcfbd9b4757fd1bd9d5c6e22d76f5d43881dfa1433404b2bc0993306a941da7c9f1bb16f39d20d8190cb3f21e122c13a50603d0800766"
+    "sha256=e3da58f79172f7c55d8b07cea100358771248b435baf5fbe941e61e6d0840730"
+    "sha512=3af8d9f618266c5bd9c65e1b81c97c6e68c07ab84b8031dbef691ac7775fe7ea308be995dfdba8a785f404aeb44a3e094c78861f1e9f8d8321a1110c1da64fd5"
   ]
 }
-x-commit-hash: "d80cceda1c28d8ad4716afb91d8bfc6e5c5cbc69"
+x-commit-hash: "6f3f75bc881c6f22117e01aa8520fa70564fde42"
diff --git a/packages/upstream/vhd-format.0.12.2/opam b/packages/upstream/vhd-format.0.12.3/opam
similarity index 74%
rename from packages/upstream/vhd-format.0.12.2/opam
rename to packages/upstream/vhd-format.0.12.3/opam
index 8a8db5ce2..c0b7f9844 100644
--- a/packages/upstream/vhd-format.0.12.2/opam
+++ b/packages/upstream/vhd-format.0.12.3/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "vhd-format"
-version: "0.12.2"
+version: "0.12.3"
 synopsis: "Pure OCaml library to read/write VHD format data"
 description: """\
 A pure OCaml library to read and write
@@ -17,10 +17,10 @@ doc: "https://mirage.github.io/ocaml-vhd/"
 bug-reports: "https://github.com/mirage/ocaml-vhd/issues"
 depends: [
   "ocaml" {>= "4.03.0"}
-  "cstruct" {>= "1.9"}
+  "cstruct" {>= "1.9" & < "6.1.0"}
   "io-page"
   "rresult" {>= "0.3.0"}
-  "uuidm"
+  "uuidm" {>= "0.9.6"}
   "stdlib-shims"
   "dune" {>= "1.0"}
   "ppx_cstruct" {build & >= "3.0.0"}
@@ -31,10 +31,10 @@ depexts: ["linux-headers"] {os-distribution = "alpine"}
 dev-repo: "git+https://github.com/mirage/ocaml-vhd.git"
 url {
   src:
-    "https://github.com/mirage/ocaml-vhd/releases/download/v0.12.2/vhd-format-v0.12.2.tbz"
+    "https://github.com/mirage/ocaml-vhd/releases/download/v0.12.3/vhd-format-0.12.3.tbz"
   checksum: [
-    "sha256=c14d8ed7714d6f422ed17bd6e8a20f9a15cfc0f29497d2d7c6725fdcf3c410eb"
-    "sha512=3b9b9434f54fa481e84dcfbd9b4757fd1bd9d5c6e22d76f5d43881dfa1433404b2bc0993306a941da7c9f1bb16f39d20d8190cb3f21e122c13a50603d0800766"
+    "sha256=e3da58f79172f7c55d8b07cea100358771248b435baf5fbe941e61e6d0840730"
+    "sha512=3af8d9f618266c5bd9c65e1b81c97c6e68c07ab84b8031dbef691ac7775fe7ea308be995dfdba8a785f404aeb44a3e094c78861f1e9f8d8321a1110c1da64fd5"
   ]
 }
-x-commit-hash: "d80cceda1c28d8ad4716afb91d8bfc6e5c5cbc69"
+x-commit-hash: "6f3f75bc881c6f22117e01aa8520fa70564fde42"
diff --git a/packages/upstream/x509.0.11.2/opam b/packages/upstream/x509.0.16.0/opam
similarity index 71%
rename from packages/upstream/x509.0.11.2/opam
rename to packages/upstream/x509.0.16.0/opam
index 303570c0b..fbcbddae6 100644
--- a/packages/upstream/x509.0.11.2/opam
+++ b/packages/upstream/x509.0.16.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "x509"
-version: "0.11.2"
+version: "0.16.0"
 synopsis: "Public Key Infrastructure (RFC 5280, PKCS) purely in OCaml"
 description: """\
 X.509 is a public key infrastructure used mostly on the Internet.  It consists
@@ -9,7 +9,7 @@ authority. Authorities must be exchanged over a second channel to establish the
 trust relationship. This library implements most parts of RFC5280 and RFC6125.
 The Public Key Cryptography Standards (PKCS) defines encoding and decoding
 (in ASN.1 DER and PEM format), which is also implemented by this library -
-namely PKCS 1, PKCS 7, PKCS 8, PKCS 9 and PKCS 10."""
+namely PKCS 1, PKCS 5, PKCS 7, PKCS 8, PKCS 9, PKCS 10, and PKCS 12."""
 maintainer: "Hannes Mehnert <hannes@mehnert.org>"
 authors: [
   "Hannes Mehnert <hannes@mehnert.org>" "David Kaloper <dk505@cam.ac.uk>"
@@ -20,23 +20,27 @@ homepage: "https://github.com/mirleft/ocaml-x509"
 doc: "https://mirleft.github.io/ocaml-x509/doc"
 bug-reports: "https://github.com/mirleft/ocaml-x509/issues"
 depends: [
-  "ocaml" {>= "4.07.0"}
+  "ocaml" {>= "4.08.0"}
   "dune" {>= "1.2"}
-  "cstruct" {>= "4.0.0"}
+  "cstruct" {>= "6.0.0"}
   "asn1-combinators" {>= "0.2.0"}
   "ptime"
-  "base64" {>= "3.1.0"}
+  "base64" {>= "3.3.0"}
   "mirage-crypto"
   "mirage-crypto-pk"
-  "rresult"
+  "mirage-crypto-ec" {>= "0.10.0"}
+  "mirage-crypto-rng"
   "fmt" {>= "0.8.7"}
   "alcotest" {with-test}
   "cstruct-unix" {with-test & >= "3.0.0"}
-  "mirage-crypto-rng" {with-test}
-  "mirage-crypto-pk" {with-test & < "0.8.9"}
   "gmap" {>= "0.3.0"}
   "domain-name" {>= "0.3.0"}
   "logs"
+  "pbkdf"
+  "ipaddr" {>= "5.2.0"}
+]
+conflicts: [
+  "result" {< "1.5"}
 ]
 build: [
   ["dune" "subst"] {dev}
@@ -46,9 +50,10 @@ build: [
 dev-repo: "git+https://github.com/mirleft/ocaml-x509.git"
 url {
   src:
-    "https://github.com/mirleft/ocaml-x509/releases/download/v0.11.2/x509-v0.11.2.tbz"
+    "https://github.com/mirleft/ocaml-x509/releases/download/v0.16.0/x509-0.16.0.tbz"
   checksum: [
-    "sha256=42ccf807a7b397b8f5411d261f64ae3cb671e59b2a2f10f16b507a5ae16594ac"
-    "sha512=e7f9757f74e2b4caa4f5fb2eb801aa203ba1b77ab7629f01a4bd6e4a02cb82dc67bd97353d45999a5862519b2c704b8285f5e36115efc3e01553379a6f9d1f6c"
+    "sha256=67a6727fb4c38b919334eef2f8ef4eac0237029a439ff981d408eca8b9833595"
+    "sha512=c9b4cf55d16d8b1e6b6faa18fc9ac08065fa09937f07a3447d4b637539b37bea6374c98d184eba159a8ba8eba860303a78563097e47ef30529fedaaf722115c6"
   ]
 }
+x-commit-hash: "e87d4baef3faedc05e1e4f2e36e16a4def5894ff"
diff --git a/packages/upstream/xen-gnt-unix.4.0.0/opam b/packages/upstream/xen-gnt-unix.4.0.1/opam
similarity index 64%
rename from packages/upstream/xen-gnt-unix.4.0.0/opam
rename to packages/upstream/xen-gnt-unix.4.0.1/opam
index 4c655981b..d7608b1c0 100644
--- a/packages/upstream/xen-gnt-unix.4.0.0/opam
+++ b/packages/upstream/xen-gnt-unix.4.0.1/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "xen-gnt-unix"
-version: "4.0.0"
+version: "4.0.1"
 synopsis: "Xen grant table bindings for OCaml"
 description: """\
 These are used to create Xen device driver "backends" (servers)
@@ -21,19 +21,24 @@ doc: "https://mirage.github.io/ocaml-gnt/"
 bug-reports: "https://github.com/mirage/ocaml-gnt/issues"
 license: "ISC"
 depends: [
-  "ocaml" {>= "4.03.0"}
+  "ocaml" {>= "4.08.0"}
   "dune" {>= "1.0"}
-  "xen-gnt"
-  "io-page-unix" {>= "2.0.0"}
-  "conf-xen" {build}
+  "xen-gnt" {= version}
+  "conf-xen"
 ]
+available: arch != "s390x" & arch != "ppc64"
 build: [
   ["dune" "subst"] {dev}
   ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
 dev-repo: "git+https://github.com/mirage/ocaml-gnt.git"
 url {
   src:
-    "https://github.com/mirage/ocaml-gnt/releases/download/v4.0.0/xen-gnt-v4.0.0.tbz"
-  checksum: "md5=3d64522c82c663546ebb0904f52d7c05"
+    "https://github.com/mirage/ocaml-gnt/releases/download/v4.0.1/xen-gnt-4.0.1.tbz"
+  checksum: [
+    "sha256=1faef511d25047b131f2028561a9316acff66d480bae0369f8d0fdc5a645b2f9"
+    "sha512=24d34dc8d21eb65a0ead77b47a772120c084844732d3c4243aa7a6b61a269668c380eb8e625faf06d7d53fe69fc986cc19caec9a188717bdcf850ddee968f839"
+  ]
 }
+x-commit-hash: "d6b47b3e4c5029eb596b49e22b6657ee088b0863"
diff --git a/packages/upstream/xen-gnt.4.0.0/opam b/packages/upstream/xen-gnt.4.0.1/opam
similarity index 70%
rename from packages/upstream/xen-gnt.4.0.0/opam
rename to packages/upstream/xen-gnt.4.0.1/opam
index 2cde7d2b2..52d283a16 100644
--- a/packages/upstream/xen-gnt.4.0.0/opam
+++ b/packages/upstream/xen-gnt.4.0.1/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "xen-gnt"
-version: "4.0.0"
+version: "4.0.1"
 synopsis: "Xen grant table bindings for OCaml"
 description: """\
 These are used to create Xen device driver "backends" (servers)
@@ -22,10 +22,10 @@ doc: "https://mirage.github.io/ocaml-gnt/"
 bug-reports: "https://github.com/mirage/ocaml-gnt/issues"
 license: "ISC"
 depends: [
-  "ocaml" {>= "4.03.0"}
+  "ocaml" {>= "4.08.0"}
   "dune" {>= "1.0"}
   "cstruct" {>= "1.0.1"}
-  "io-page"
+  "io-page" {>= "2.4.0"}
   "lwt" {>= "2.4.3"}
   "lwt-dllist"
   "cmdliner"
@@ -34,10 +34,15 @@ depends: [
 build: [
   ["dune" "subst"] {dev}
   ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
 dev-repo: "git+https://github.com/mirage/ocaml-gnt.git"
 url {
   src:
-    "https://github.com/mirage/ocaml-gnt/releases/download/v4.0.0/xen-gnt-v4.0.0.tbz"
-  checksum: "md5=3d64522c82c663546ebb0904f52d7c05"
+    "https://github.com/mirage/ocaml-gnt/releases/download/v4.0.1/xen-gnt-4.0.1.tbz"
+  checksum: [
+    "sha256=1faef511d25047b131f2028561a9316acff66d480bae0369f8d0fdc5a645b2f9"
+    "sha512=24d34dc8d21eb65a0ead77b47a772120c084844732d3c4243aa7a6b61a269668c380eb8e625faf06d7d53fe69fc986cc19caec9a188717bdcf850ddee968f839"
+  ]
 }
+x-commit-hash: "d6b47b3e4c5029eb596b49e22b6657ee088b0863"
diff --git a/packages/upstream/xenstore.2.1.1/opam b/packages/upstream/xenstore.2.2.0/opam
similarity index 77%
rename from packages/upstream/xenstore.2.1.1/opam
rename to packages/upstream/xenstore.2.2.0/opam
index 810e827e2..3f2e13814 100644
--- a/packages/upstream/xenstore.2.1.1/opam
+++ b/packages/upstream/xenstore.2.2.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "xenstore"
-version: "2.1.1"
+version: "2.2.0"
 synopsis: "Xenstore protocol in pure OCaml"
 description: """\
 This repo contains:
@@ -18,6 +18,7 @@ authors: [
   "Anil Madhavapeddy"
   "Vincent Bernardoff"
 ]
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 homepage: "https://github.com/mirage/ocaml-xenstore"
 doc: "https://mirage.github.io/ocaml-xenstore/"
 bug-reports: "https://github.com/mirage/ocaml-xenstore/issues"
@@ -27,9 +28,8 @@ depends: [
   "cstruct" {>= "3.2.0"}
   "ppx_cstruct" {>= "3.2.0"}
   "lwt"
-  "ounit" {with-test}
+  "ounit2" {with-test}
 ]
-license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 build: [
   ["dune" "subst"] {dev}
   ["dune" "build" "-p" name "-j" jobs]
@@ -38,9 +38,10 @@ build: [
 dev-repo: "git+https://github.com/mirage/ocaml-xenstore.git"
 url {
   src:
-    "https://github.com/mirage/ocaml-xenstore/releases/download/2.1.1/xenstore-2.1.1.tbz"
+    "https://github.com/mirage/ocaml-xenstore/releases/download/v2.2.0/xenstore-2.2.0.tbz"
   checksum: [
-    "sha256=283814ea21adc345c4d59cfcb17b2f7c1185004ecaecc3871557c961874c84f5"
-    "sha512=9cd80f7912a77f628fd346b30790981a8802528a6240dc5faeeb83e61aa4a2e2ee9a1cafbc4058eb9f6c38f1a4ac6c59408fdc92b545633cde06369d2c1e1890"
+    "sha256=d4c9eab6de731de45d6091ef85d40d8cdf1de32c5410a0f6729c2da1cec3182d"
+    "sha512=79411344d5d4dfb49202bb9ca6e0e9d1343dcef60bc617dc24d5538b81f4e9265233870ab996a7043dd65cd9aff933b677a45371314a03ca35a79a00b1690e97"
   ]
 }
+x-commit-hash: "ef2d94e4dc82c5ea87807d24f07b14db4e7be878"
diff --git a/packages/upstream/xmlm.1.3.0/opam b/packages/upstream/xmlm.1.3.0/opam
deleted file mode 100644
index a561d7df6..000000000
--- a/packages/upstream/xmlm.1.3.0/opam
+++ /dev/null
@@ -1,30 +0,0 @@
-opam-version: "2.0"
-name: "xmlm"
-version: "1.3.0"
-synopsis: "Streaming XML codec for OCaml"
-description: """\
-Xmlm is a streaming codec to decode and encode the XML data format. It
-can process XML documents without a complete in-memory representation of the
-data.
-
-Xmlm is made of a single independent module and 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: ["xml" "codec" "org:erratique"]
-homepage: "http://erratique.ch/software/xmlm"
-doc: "http://erratique.ch/software/xmlm/doc/Xmlm"
-bug-reports: "https://github.com/dbuenzli/xmlm/issues"
-depends: [
-  "ocaml" {>= "4.02.0"}
-  "ocamlfind" {build}
-  "ocamlbuild" {build}
-  "topkg" {build & >= "0.9.0"}
-]
-build: ["ocaml" "pkg/pkg.ml" "build" "--dev-pkg" "%{pinned}%"]
-dev-repo: "git+http://erratique.ch/repos/xmlm.git"
-url {
-  src: "http://erratique.ch/software/xmlm/releases/xmlm-1.3.0.tbz"
-  checksum: "md5=d63ce15d913975211196b5079e86a797"
-}
diff --git a/packages/upstream/xmlm.1.4.0/opam b/packages/upstream/xmlm.1.4.0/opam
new file mode 100644
index 000000000..984d2db0a
--- /dev/null
+++ b/packages/upstream/xmlm.1.4.0/opam
@@ -0,0 +1,33 @@
+opam-version: "2.0"
+name: "xmlm"
+version: "1.4.0"
+synopsis: "Streaming XML codec for OCaml"
+description: """\
+Xmlm is a streaming codec to decode and encode the XML data format. It
+can process XML documents without a complete in-memory representation of the
+data.
+
+Xmlm is made of a single independent module and distributed
+under the ISC license.
+
+Home page: http://erratique.ch/software/xmlm"""
+maintainer: "Daniel Bünzli <daniel.buenzl i@erratique.ch>"
+authors: "The xmlm programmers"
+license: "ISC"
+tags: ["xml" "codec" "org:erratique"]
+homepage: "https://erratique.ch/software/xmlm"
+doc: "https://erratique.ch/software/xmlm/doc/"
+bug-reports: "https://github.com/dbuenzli/xmlm/issues"
+depends: [
+  "ocaml" {>= "4.05.0"}
+  "ocamlfind" {build}
+  "ocamlbuild" {build}
+  "topkg" {build & >= "1.0.3"}
+]
+build: ["ocaml" "pkg/pkg.ml" "build" "--dev-pkg" "%{dev}%"]
+dev-repo: "git+https://erratique.ch/repos/xmlm.git"
+url {
+  src: "https://erratique.ch/software/xmlm/releases/xmlm-1.4.0.tbz"
+  checksum:
+    "sha512=69f6112e6466952256d670fe1751fe4ae79e20d50f018ece1709eb2240cb1b00968ac7cee110771e0617a38ebc1cdb43e9d146471ce66ac1b176e4a1660531eb"
+}
diff --git a/packages/upstream/yojson.1.7.0/opam b/packages/upstream/yojson.2.0.2/opam
similarity index 57%
rename from packages/upstream/yojson.1.7.0/opam
rename to packages/upstream/yojson.2.0.2/opam
index bff483962..e618009a9 100644
--- a/packages/upstream/yojson.1.7.0/opam
+++ b/packages/upstream/yojson.2.0.2/opam
@@ -1,41 +1,40 @@
 opam-version: "2.0"
 name: "yojson"
-version: "1.7.0"
+version: "2.0.2"
 synopsis:
   "Yojson is an optimized parsing and printing library for the JSON format"
 description: """\
 Yojson is an optimized parsing and printing library for the JSON format.
 
-It addresses a few shortcomings of json-wheel including 2x speedup,
-polymorphic variants and optional syntax for tuples and variants.
-
 ydump is a pretty-printing command-line program provided with the
-yojson package.
-
-The program atdgen can be used to derive OCaml-JSON serializers and
-deserializers from type definitions."""
-license: "BSD-3-Clause"
-maintainer: "martin@mjambon.com"
+yojson package."""
+maintainer: ["nathan@cryptosense.com" "marek@xivilization.net"]
 authors: "Martin Jambon"
+license: "BSD-3-Clause"
 homepage: "https://github.com/ocaml-community/yojson"
 doc: "https://ocaml-community.github.io/yojson/"
 bug-reports: "https://github.com/ocaml-community/yojson/issues"
 depends: [
   "ocaml" {>= "4.02.3"}
-  "dune"
+  "dune" {>= "2.0"}
   "cppo" {build}
-  "easy-format"
-  "biniou" {>= "1.2.0"}
   "alcotest" {with-test & >= "0.8.5"}
+  "odoc" {with-doc}
+  "seq" {>= "0.2.2"}
 ]
 build: [
   ["dune" "subst"] {dev}
   ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+  ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc}
 ]
-run-test: ["dune" "runtest" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/ocaml-community/yojson.git"
 url {
   src:
-    "https://github.com/ocaml-community/yojson/releases/download/1.7.0/yojson-1.7.0.tbz"
-  checksum: "md5=b89d39ca3f8c532abe5f547ad3b8f84d"
+    "https://github.com/ocaml-community/yojson/releases/download/2.0.2/yojson-2.0.2.tbz"
+  checksum: [
+    "sha256=876bb6f38af73a84a29438a3da35e4857c60a14556a606525b148c6fdbe5461b"
+    "sha512=9e150689a814a64e53e361e336fe826df5a3e3851d1367fda4a001392175c29348de55db0b7d7ba18539dec2cf78198efcb7f41b77a9861763f5aa97c05509ad"
+  ]
 }
+x-commit-hash: "17ca03c5877a4346f0691443f35ed9678f99962f"
diff --git a/packages/xs-extra/message-switch.master/opam b/packages/xs-extra/message-switch.master/opam
index a79ad87c4..7267b4725 100644
--- a/packages/xs-extra/message-switch.master/opam
+++ b/packages/xs-extra/message-switch.master/opam
@@ -18,7 +18,7 @@ depends: [
   "cmdliner"
   "cohttp-async" {with-test}
   "cohttp-lwt-unix"
-  "io-page-unix"
+  "io-page" {>= "2.4.0"}
   "lwt_log"
   "message-switch-async" {with-test}
   "message-switch-lwt"
diff --git a/packages/xs/nbd-tool.5.0.0/opam b/packages/xs/nbd-tool.5.0.0/opam
deleted file mode 100644
index 3987ecb70..000000000
--- a/packages/xs/nbd-tool.5.0.0/opam
+++ /dev/null
@@ -1,34 +0,0 @@
-opam-version: "2.0"
-synopsis: "Network Block Device (NBD) protocol implementation"
-description: """
-This library allows applications to export and consume block
-devices using the NBD protocol (as used by Linux, qemu etc)"""
-maintainer: "jonathan.ludlam@citrix.com"
-authors: ["Jonathan Ludlam" "David Scott" "Thomas Sanders"]
-license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
-tags: ["org:mirage" "org:xapi-project"]
-homepage: "https://github.com/xapi-project/nbd"
-bug-reports: "https://github.com/xapi-project/nbd/issues"
-depends: [
-  "ocaml" {>= "4.08.0"}
-  "dune" {>= "2.7.0"}
-  "alcotest" {with-test}
-  "alcotest-lwt" {with-test}
-  "cmdliner"
-  "lwt" {>= "2.7.0"}
-  "lwt_log"
-  "mirage-block-unix"
-  "nbd-unix" {=version}
-  "uri"
-]
-depexts: [
-  ["qemu-img" "nbd" "nmap-ncat"] {with-test & os-family = "rhel"}
-  ["qemu-utils" "nbd-client" "netcat-openbsd"] {with-test & os-family = "debian"}
-]
-build: ["dune" "build" "-p" name "-j" jobs]
-run-test: ["dune" "runtest" "-p" name "-j" jobs]
-dev-repo: "git+https://github.com/xapi-project/nbd.git"
-url {
-  src: "https://github.com/xapi-project/nbd/archive/v5.0.0.tar.gz"
-  checksum: "sha256=0f6c57fa519cfe1ec6c84a8d571b67cf604f63120b89a82a06449496665a9d38"
-}
diff --git a/packages/xs/nbd-tool.6.0.1/opam b/packages/xs/nbd-tool.6.0.1/opam
new file mode 100644
index 000000000..fe31af67d
--- /dev/null
+++ b/packages/xs/nbd-tool.6.0.1/opam
@@ -0,0 +1,47 @@
+opam-version: "2.0"
+name: "nbd-tool"
+version: "6.0.1"
+synopsis: "Network Block Device (NBD) protocol implementation"
+description: """\
+This library allows applications to export and consume block
+devices using the NBD protocol (as used by Linux, qemu etc)"""
+maintainer: "Xapi project maintainers"
+authors: ["Jonathan Ludlam" "David Scott" "Thomas Sanders"]
+license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception"
+tags: ["org:mirage" "org:xapi-project"]
+homepage: "https://github.com/xapi-project/nbd"
+bug-reports: "https://github.com/xapi-project/nbd/issues"
+depends: [
+  "ocaml" {>= "4.08.0"}
+  "dune" {>= "2.7.0"}
+  "alcotest" {with-test}
+  "alcotest-lwt" {with-test}
+  "cmdliner" {>= "1.1.0"}
+  "lwt" {>= "2.7.0"}
+  "lwt_log"
+  "mirage-block-unix"
+  "nbd-unix" {= version}
+  "odoc" {with-doc}
+  "uri"
+]
+build: [
+  ["dune" "subst"] {dev}
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "build" "-p" name "-j" jobs "@doc"] {with-doc}
+  ["dune" "build" "-p" name "-j" jobs "@runtest"] {with-test}
+]
+depexts: [
+  ["nbd" "nmap-ncat" "qemu-img"] {with-test & os-family = "rhel"}
+  ["nbd-client" "netcat-openbsd" "qemu-utils"]
+    {with-test & os-family = "debian"}
+]
+dev-repo: "git+https://github.com/xapi-project/nbd.git"
+url {
+  src:
+    "https://github.com/xapi-project/nbd/releases/download/6.0.1/nbd-6.0.1.tbz"
+  checksum: [
+    "sha256=2bd3db48f84d5cc3e67ef46d323034118a6936276b2ca2689c871733482d59d0"
+    "sha512=c8588b81a7e99609c934b7f720caf50d0cee1fd3f86465ead3f9a5da2de94cb8d14a767b365efe66f5e75112889bf2debc97b33f71ec58afb877b06c11d49c22"
+  ]
+}
+x-commit-hash: "aa1bfc5eb58c1defd89cd96bb98f7b6a72fadf42"
diff --git a/packages/xs/nbd-unix.5.0.0/opam b/packages/xs/nbd-unix.6.0.1/opam
similarity index 60%
rename from packages/xs/nbd-unix.5.0.0/opam
rename to packages/xs/nbd-unix.6.0.1/opam
index 62541e1b5..716fd30da 100644
--- a/packages/xs/nbd-unix.5.0.0/opam
+++ b/packages/xs/nbd-unix.6.0.1/opam
@@ -1,27 +1,30 @@
 opam-version: "2.0"
+name: "nbd-unix"
+version: "6.0.1"
 synopsis: "Network Block Device (NBD) protocol implementation"
-description: """
+description: """\
 This library allows applications to export and consume block
 devices using the NBD protocol (as used by Linux, qemu etc)"""
-maintainer: "jonathan.ludlam@citrix.com"
+maintainer: "Xapi project maintainers"
 authors: ["Jonathan Ludlam" "David Scott" "Thomas Sanders"]
-license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
+license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception"
 tags: ["org:mirage" "org:xapi-project"]
 homepage: "https://github.com/xapi-project/nbd"
 doc: "https://xapi-project.github.io/nbd/nbd-unix/index.html"
 bug-reports: "https://github.com/xapi-project/nbd/issues"
 depends: [
   "ocaml" {>= "4.08.0"}
+  "bigarray-compat"
   "bisect_ppx" {dev & >= "2.5.0"}
   "dune" {>= "2.7.0"}
   "cstruct-lwt"
-  "io-page"
-  "io-page-unix"
+  "io-page" {>= "2.4.0"}
   "lwt" {>= "2.7.0"}
+  "lwt_ssl"
   "mirage-block" {>= "2.0.0"}
   "mirage-block-unix"
-  "nbd" {=version}
-  "lwt_ssl"
+  "nbd" {= version}
+  "odoc" {with-doc}
   "ssl"
 ]
 build: [
@@ -32,6 +35,11 @@ build: [
 ]
 dev-repo: "git+https://github.com/xapi-project/nbd.git"
 url {
-  src: "https://github.com/xapi-project/nbd/archive/v5.0.0.tar.gz"
-  checksum: "sha256=0f6c57fa519cfe1ec6c84a8d571b67cf604f63120b89a82a06449496665a9d38"
+  src:
+    "https://github.com/xapi-project/nbd/releases/download/6.0.1/nbd-6.0.1.tbz"
+  checksum: [
+    "sha256=2bd3db48f84d5cc3e67ef46d323034118a6936276b2ca2689c871733482d59d0"
+    "sha512=c8588b81a7e99609c934b7f720caf50d0cee1fd3f86465ead3f9a5da2de94cb8d14a767b365efe66f5e75112889bf2debc97b33f71ec58afb877b06c11d49c22"
+  ]
 }
+x-commit-hash: "aa1bfc5eb58c1defd89cd96bb98f7b6a72fadf42"
diff --git a/packages/xs/nbd.5.0.0/opam b/packages/xs/nbd.5.0.0/opam
deleted file mode 100644
index fecb80f17..000000000
--- a/packages/xs/nbd.5.0.0/opam
+++ /dev/null
@@ -1,40 +0,0 @@
-opam-version: "2.0"
-maintainer: "jonathan.ludlam@citrix.com"
-authors: [ "Jonathan Ludlam" "David Scott" "Thomas Sanders" ]
-license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
-homepage: "https://github.com/xapi-project/nbd"
-doc: "https://xapi-project.github.io/nbd/nbd/index.html"
-dev-repo: "git+https://github.com/xapi-project/nbd.git"
-bug-reports: "https://github.com/xapi-project/nbd/issues"
-
-build: ["dune" "build" "-p" name "-j" jobs]
-run-test: ["dune" "runtest" "-p" name "-j" jobs]
-
-depends: [
-  "ocaml" {>= "4.08.0"}
-  "bisect_ppx" {dev & >= "2.5.0"}
-  "dune" {>= "2.7.0"}
-  "alcotest" {with-test}
-  "alcotest-lwt" {with-test}
-  "io-page-unix" {with-test}
-  "cstruct" {>= "3.1.0"}
-  "io-page"
-  "mirage-block" {>= "2.0.0"}
-  "mirage-block-unix"
-  "lwt" {>= "2.7.0"}
-  "lwt_log"
-  "rresult"
-  "sexplib"
-  "uri"
-  "ppx_cstruct" {>= "3.1.0"}
-  "ppx_sexp_conv" {>= "v0.9.0"}
-]
-tags: [ "org:mirage" "org:xapi-project" ]
-synopsis: "Network Block Device (NBD) protocol implementation"
-description: """
-This library allows applications to export and consume block
-devices using the NBD protocol (as used by Linux, qemu etc)"""
-url {
-  src: "https://github.com/xapi-project/nbd/archive/v5.0.0.tar.gz"
-  checksum: "sha256=0f6c57fa519cfe1ec6c84a8d571b67cf604f63120b89a82a06449496665a9d38"
-}
diff --git a/packages/xs/nbd.6.0.1/opam b/packages/xs/nbd.6.0.1/opam
new file mode 100644
index 000000000..0f54c1d36
--- /dev/null
+++ b/packages/xs/nbd.6.0.1/opam
@@ -0,0 +1,52 @@
+opam-version: "2.0"
+name: "nbd"
+version: "6.0.1"
+synopsis: "Network Block Device (NBD) protocol implementation"
+description: """\
+This library allows applications to export and consume block
+devices using the NBD protocol (as used by Linux, qemu etc)"""
+maintainer: "Xapi project maintainers"
+authors: ["Jonathan Ludlam" "David Scott" "Thomas Sanders"]
+license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception"
+tags: ["org:mirage" "org:xapi-project"]
+homepage: "https://github.com/xapi-project/nbd"
+doc: "https://xapi-project.github.io/nbd/nbd/index.html"
+bug-reports: "https://github.com/xapi-project/nbd/issues"
+depends: [
+  "ocaml" {>= "4.08.0"}
+  "bisect_ppx" {dev & >= "2.5.0"}
+  "dune" {>= "2.7.0"}
+  "alcotest" {with-test}
+  "alcotest-lwt" {with-test}
+  "cstruct" {>= "6.0.0"}
+  "io-page" {>= "2.4.0"}
+  "mirage-block" {>= "3.0.0"}
+  "mirage-block-unix"
+  "lwt" {>= "2.7.0"}
+  "lwt_log"
+  "odoc" {with-doc}
+  "ppx_cstruct" {>= "3.1.0"}
+  "ppx_sexp_conv" {>= "v0.9.0"}
+  "rresult"
+  "sexplib"
+  "uri"
+]
+conflicts: [
+  "result" {< "1.5"}
+]
+build: [
+  ["dune" "subst"] {dev}
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "build" "-p" name "-j" jobs "@doc"] {with-doc}
+  ["dune" "build" "-p" name "-j" jobs "@runtest"] {with-test}
+]
+dev-repo: "git+https://github.com/xapi-project/nbd.git"
+url {
+  src:
+    "https://github.com/xapi-project/nbd/releases/download/6.0.1/nbd-6.0.1.tbz"
+  checksum: [
+    "sha256=2bd3db48f84d5cc3e67ef46d323034118a6936276b2ca2689c871733482d59d0"
+    "sha512=c8588b81a7e99609c934b7f720caf50d0cee1fd3f86465ead3f9a5da2de94cb8d14a767b365efe66f5e75112889bf2debc97b33f71ec58afb877b06c11d49c22"
+  ]
+}
+x-commit-hash: "aa1bfc5eb58c1defd89cd96bb98f7b6a72fadf42"