diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5178ef6b3..b5581ca25 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -20,7 +20,7 @@ jobs:
         - ocaml-version: "4.14.2"
           runs-on: ["ubuntu-22.04-arm"]
           experimental: true
-        - ocaml-version: "5.3.0"
+        - ocaml-version: "5.4.0"
           runs-on: ["ubuntu-22.04"]
           experimental: true
 
diff --git a/packages/alcotest/alcotest.1.9.0/opam b/packages/alcotest/alcotest.1.9.0/opam
index ff09f4d89..ed798b4f0 100644
--- a/packages/alcotest/alcotest.1.9.0/opam
+++ b/packages/alcotest/alcotest.1.9.0/opam
@@ -24,6 +24,7 @@ depends: [
   "fmt" {>= "0.8.7"}
   "astring"
   "cmdliner" {>= "1.2.0"}
+  "cmdliner" {with-test & < "2.0.0"}
   "re" {>= "1.7.2"}
   "stdlib-shims"
   "uutf" {>= "1.0.1"}
diff --git a/packages/angstrom/angstrom.0.16.1/opam b/packages/angstrom/angstrom.0.16.1/opam
index ccee0e975..677028925 100644
--- a/packages/angstrom/angstrom.0.16.1/opam
+++ b/packages/angstrom/angstrom.0.16.1/opam
@@ -1,15 +1,20 @@
 opam-version: "2.0"
+name: "angstrom"
+version: "0.16.1"
+synopsis: "Parser combinators built for speed and memory-efficiency"
+description: """\
+Angstrom is a parser-combinator library that makes it easy to write efficient,
+expressive, and reusable parsers suitable for high-performance applications. It
+exposes monadic and applicative interfaces for composition, and supports
+incremental input through buffered and unbuffered interfaces. Both interfaces
+give the user total control over the blocking behavior of their application,
+with the unbuffered interface enabling zero-copy IO. Parsers are backtracking by
+default and support unbounded lookahead."""
 maintainer: "Spiros Eliopoulos <spiros@inhabitedtype.com>"
-authors: [ "Spiros Eliopoulos <spiros@inhabitedtype.com>" ]
-license: "BSD-3-Clause"
+authors: "Spiros Eliopoulos <spiros@inhabitedtype.com>"
+license: "BSD-3-clause"
 homepage: "https://github.com/inhabitedtype/angstrom"
 bug-reports: "https://github.com/inhabitedtype/angstrom/issues"
-dev-repo: "git+https://github.com/inhabitedtype/angstrom.git"
-build: [
-  ["dune" "subst"] {dev}
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
 depends: [
   "ocaml" {>= "4.04.0"}
   "dune" {>= "1.8"}
@@ -18,15 +23,12 @@ depends: [
   "ppx_let" {with-test & >= "v0.14.0"}
   "ocaml-syntax-shims" {build}
 ]
-synopsis: "Parser combinators built for speed and memory-efficiency"
-description: """
-Angstrom is a parser-combinator library that makes it easy to write efficient,
-expressive, and reusable parsers suitable for high-performance applications. It
-exposes monadic and applicative interfaces for composition, and supports
-incremental input through buffered and unbuffered interfaces. Both interfaces
-give the user total control over the blocking behavior of their application,
-with the unbuffered interface enabling zero-copy IO. Parsers are backtracking by
-default and support unbounded lookahead."""
+build: [
+  ["dune" "subst"] {dev}
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+]
+dev-repo: "git+https://github.com/inhabitedtype/angstrom.git"
 url {
   src: "https://github.com/inhabitedtype/angstrom/archive/0.16.1.tar.gz"
   checksum: [
diff --git a/packages/asetmap/asetmap.0.8.1/opam b/packages/asetmap/asetmap.0.8.1/opam
index 46c693d00..6b0b9f093 100644
--- a/packages/asetmap/asetmap.0.8.1/opam
+++ b/packages/asetmap/asetmap.0.8.1/opam
@@ -1,29 +1,29 @@
 opam-version: "2.0"
+name: "asetmap"
+version: "0.8.1"
+synopsis: "Alternative, compatible, OCaml standard library Sets and Maps"
+description: """\
+asetmap provides slightly tweaked OCaml standard library Set and Map
+functors. asetmap tries to maximize compatibility with the standard
+library. It essentially gets rid of `Not_found` exceptions and provide
+pretty-printers for the data types.
+
+asetmap has no dependency is distributed under the ISC license."""
 maintainer: "Daniel Bünzli <daniel.buenzl i@erratique.ch>"
-authors: ["Daniel Bünzli <daniel.buenzl i@erratique.ch>"]
+authors: "Daniel Bünzli <daniel.buenzl i@erratique.ch>"
+license: "ISC"
+tags: ["org:erratique" "set" "map" "stdlib"]
 homepage: "http://erratique.ch/software/asetmap"
 doc: "http://erratique.ch/software/asetmap/doc"
-license: "ISC"
-dev-repo: "git+http://erratique.ch/repos/asetmap.git"
 bug-reports: "https://github.com/dbuenzli/asetmap/issues"
-tags: [ "org:erratique" "set" "map" "stdlib" ]
 depends: [
   "ocaml" {>= "4.01.0"}
   "ocamlfind" {build}
   "ocamlbuild" {build}
   "topkg" {build}
 ]
-build: [
-  "ocaml" "pkg/pkg.ml" "build"
-          "--pinned" "%{pinned}%" ]
-synopsis: "Alternative, compatible, OCaml standard library Sets and Maps"
-description: """
-asetmap provides slightly tweaked OCaml standard library Set and Map
-functors. asetmap tries to maximize compatibility with the standard
-library. It essentially gets rid of `Not_found` exceptions and provide
-pretty-printers for the data types.
-
-asetmap has no dependency is distributed under the ISC license."""
+build: ["ocaml" "pkg/pkg.ml" "build" "--pinned" "%{pinned}%"]
+dev-repo: "git+http://erratique.ch/repos/asetmap.git"
 url {
   src: "http://erratique.ch/software/asetmap/releases/asetmap-0.8.1.tbz"
   checksum: [
@@ -31,5 +31,4 @@ url {
     "md5=9e4a518bfb6350e2f296c7f3147989c7"
   ]
 }
-
-x-maintenance-intent: ["(latest)"]
\ No newline at end of file
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/astring/astring.0.8.5/opam b/packages/astring/astring.0.8.5/opam
index af4fd0697..2ea3bc63d 100644
--- a/packages/astring/astring.0.8.5/opam
+++ b/packages/astring/astring.0.8.5/opam
@@ -38,3 +38,4 @@ url {
     "md5=e148907c24157d1df43bec89b58b3ec8"
   ]
 }
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/b0/b0.0.0.5/opam b/packages/b0/b0.0.0.5/opam
index 0a298beaf..48d9319de 100644
--- a/packages/b0/b0.0.0.5/opam
+++ b/packages/b0/b0.0.0.5/opam
@@ -44,3 +44,4 @@ url {
   checksum:
     "sha512=00a6868b4dfa34565d0141b335622a81a0e8d5b9e3c6dfad025dabfa3df2db2a1302b492953bbbce30c3a4406c324fcec25250a00b38f6d18a69e15605e3b07e"
 }
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/base-bytes/base-bytes.base/opam b/packages/base-bytes/base-bytes.base/opam
index 203b824d0..0655dcdb7 100644
--- a/packages/base-bytes/base-bytes.base/opam
+++ b/packages/base-bytes/base-bytes.base/opam
@@ -9,3 +9,4 @@ depends: [
   "ocaml" {>= "4.02.0"}
   "ocamlfind" {>= "1.5.3"}
 ]
+x-maintained: true
diff --git a/packages/base/base.v0.17.3/opam b/packages/base/base.v0.17.3/opam
new file mode 100644
index 000000000..677979ba6
--- /dev/null
+++ b/packages/base/base.v0.17.3/opam
@@ -0,0 +1,41 @@
+opam-version: "2.0"
+name: "base"
+version: "v0.17.3"
+synopsis: "Full standard library replacement for OCaml"
+description: """\
+Full standard library replacement for OCaml
+
+Base is a complete and portable alternative to the OCaml standard
+library. It provides all standard functionalities one would expect
+from a language standard library. It uses consistent conventions
+across all of its module.
+
+Base aims to be usable in any context. As a result system dependent
+features such as I/O are not offered by Base. They are instead
+provided by companion libraries such as stdio:
+
+  https://github.com/janestreet/stdio"""
+maintainer: "Jane Street developers"
+authors: "Jane Street Group, LLC"
+license: "MIT"
+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" {>= "5.1.0"}
+  "ocaml_intrinsics_kernel" {>= "v0.17.0" & < "v0.18~"}
+  "sexplib0" {>= "v0.17.0" & < "v0.18~"}
+  "dune" {>= "3.11.0"}
+  "dune-configurator"
+]
+available: arch != "arm32" & arch != "x86_32"
+build: ["dune" "build" "-p" name "-j" jobs]
+dev-repo: "git+https://github.com/janestreet/base.git"
+url {
+  src: "https://github.com/janestreet/base/archive/refs/tags/v0.17.3.tar.gz"
+  checksum: [
+    "md5=2100b0ed13fecf43be86ed45c5b2cc4d"
+    "sha512=628610caff7e124631870fa1e29661caac28bdfdb18750ee43b868037da3d65d6dd9023b4be7c4c52405679efb5e865a6632d95606a22b28a36636a6bf706ef3"
+  ]
+}
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/base64/base64.3.5.1/opam b/packages/base64/base64.3.5.1/opam
index 7965c4dce..24feaf761 100644
--- a/packages/base64/base64.3.5.1/opam
+++ b/packages/base64/base64.3.5.1/opam
@@ -37,3 +37,4 @@ url {
   ]
 }
 x-commit-hash: "084346f14ed1e6706d733402dd6ff65b0dc4f718"
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/bisect_ppx/bisect_ppx.2.8.3/opam b/packages/bisect_ppx/bisect_ppx.2.8.3/opam
deleted file mode 100644
index 7875b13cc..000000000
--- a/packages/bisect_ppx/bisect_ppx.2.8.3/opam
+++ /dev/null
@@ -1,46 +0,0 @@
-opam-version: "2.0"
-name: "bisect_ppx"
-version: "2.8.3"
-synopsis: "Code coverage for OCaml"
-description: """\
-Bisect_ppx helps you test thoroughly. It is a small preprocessor
-that inserts instrumentation at places in your code, such as if-then-else and
-match expressions. After you run tests, Bisect_ppx gives a nice HTML report
-showing which places were visited and which were missed.
-
-Usage is simple - add package bisect_ppx when building tests, run your tests,
-then run the Bisect_ppx report tool on the generated visitation files."""
-maintainer: [
-  "Anton Bachin <antonbachin@yahoo.com>"
-  "Leonid Rozenberg <leonidr@gmail.com>"
-]
-authors: [
-  "Xavier Clerc <bisect@x9c.fr>"
-  "Leonid Rozenberg <leonidr@gmail.com>"
-  "Anton Bachin <antonbachin@yahoo.com>"
-]
-license: "MIT"
-homepage: "https://github.com/aantron/bisect_ppx"
-doc: "https://github.com/aantron/bisect_ppx"
-bug-reports: "https://github.com/aantron/bisect_ppx/issues"
-depends: [
-  "base-unix"
-  "cmdliner" {>= "1.0.0"}
-  "dune" {>= "2.7.0"}
-  "ocaml" {>= "4.03.0"}
-  "ppxlib" {>= "0.28.0"}
-  "dune" {with-test & >= "3.0.0"}
-  "ocamlformat" {with-test & = "0.16.0"}
-]
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "build" "-p" name "-j" jobs "@compatible"] {with-test}
-]
-dev-repo: "git+https://github.com/aantron/bisect_ppx.git"
-url {
-  src: "https://github.com/aantron/bisect_ppx/archive/2.8.3.tar.gz"
-  checksum: [
-    "sha256=27ddeb2f60fbae50dc504e63e63cd5f012689084a76d5fdd4d1371d5341ff8db"
-    "md5=8c755c13e8d90f665986d842a41669f5"
-  ]
-}
diff --git a/packages/bos/bos.0.2.1/opam b/packages/bos/bos.0.2.1/opam
index b68ca8c9b..9c0d3270f 100644
--- a/packages/bos/bos.0.2.1/opam
+++ b/packages/bos/bos.0.2.1/opam
@@ -51,3 +51,4 @@ url {
   checksum:
     "sha512=8daeb8a4c2dd1f2460f6274ada19f4f1b6ebe875ff83a938c93418ce0e6bdb74b8afc5c9a7d410c1c9df2dad030e4fa276b6ed2da580639484e8b5bc92610b1d"
 }
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/camlp-streams/camlp-streams.5.0.1/opam b/packages/camlp-streams/camlp-streams.5.0.1/opam
index 9ff255927..6fa04020c 100644
--- a/packages/camlp-streams/camlp-streams.5.0.1/opam
+++ b/packages/camlp-streams/camlp-streams.5.0.1/opam
@@ -57,3 +57,4 @@ url {
     "sha512=2efa8dd4a636217c8d49bac1e4e7e5558fc2f45cfea66514140a59fd99dd08d61fb9f1e17804997ff648b71b13820a5d4a1eb70fed9d848aa2abd6e41f853c86"
   ]
 }
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/cdrom/cdrom.0.9.4/opam b/packages/cdrom/cdrom.0.9.4/opam
index 4bc70cc45..c9439ce80 100644
--- a/packages/cdrom/cdrom.0.9.4/opam
+++ b/packages/cdrom/cdrom.0.9.4/opam
@@ -1,10 +1,10 @@
 opam-version: "2.0"
 name: "cdrom"
 version: "0.9.4"
-license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 synopsis: "Query the state and contents of CDROM devices under Linux"
 maintainer: "xen-api@list.xen.org"
 authors: "Dave Scott <dave@recoil.org>"
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 tags: "org:xapi-project"
 homepage: "https://github.com/xapi-project/cdrom"
 bug-reports: "https://github.com/xapi-project/cdrom/issues"
diff --git a/packages/checkseum/checkseum.0.5.2/opam b/packages/checkseum/checkseum.0.5.2/opam
index b5b83dc90..e0d6f86be 100644
--- a/packages/checkseum/checkseum.0.5.2/opam
+++ b/packages/checkseum/checkseum.0.5.2/opam
@@ -50,3 +50,4 @@ url {
   ]
 }
 x-commit-hash: "79867ddb97f347657ff2ec026da1d77ec7864db6"
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/cmdliner/cmdliner.1.3.0/opam b/packages/cmdliner/cmdliner.1.3.0/opam
index 62d90442c..5f71abec6 100644
--- a/packages/cmdliner/cmdliner.1.3.0/opam
+++ b/packages/cmdliner/cmdliner.1.3.0/opam
@@ -39,3 +39,4 @@ url {
   checksum:
     "sha512=4c46bc334444ff772637deae2f5ba03645d7a1b7db523470a1246acfce79b971c764d964cbb02388639b3161b279700d9ade95da550446fb32aa4849c8a8f283"
 }
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/cohttp-lwt-unix/cohttp-lwt-unix.5.3.0/opam b/packages/cohttp-lwt-unix/cohttp-lwt-unix.5.3.0/opam
index ee4a50950..34fb20c52 100644
--- a/packages/cohttp-lwt-unix/cohttp-lwt-unix.5.3.0/opam
+++ b/packages/cohttp-lwt-unix/cohttp-lwt-unix.5.3.0/opam
@@ -31,7 +31,7 @@ depends: [
   "dune" {>= "2.0"}
   "conduit-lwt" {>= "5.0.0"}
   "conduit-lwt-unix" {>= "5.0.0"}
-  "cmdliner" {>= "1.1.0"}
+  "cmdliner" {>= "1.1.0" & < "2.0.0"}
   "magic-mime"
   "logs"
   "fmt" {>= "0.8.2"}
diff --git a/packages/conf-libcurl/conf-libcurl.2/opam b/packages/conf-libcurl/conf-libcurl.2/opam
index 62d2138d2..1f18c49bb 100644
--- a/packages/conf-libcurl/conf-libcurl.2/opam
+++ b/packages/conf-libcurl/conf-libcurl.2/opam
@@ -10,6 +10,7 @@ license: "curl"
 homepage: "http://curl.haxx.se/"
 bug-reports: "https://github.com/ocaml/opam-repository/issues"
 depends: [
+  "mingw-w64-shims" {os-distribution = "cygwin" & build}
   ("host-arch-x86_32" {os = "win32" & os-distribution != "cygwinports"} &
    "conf-mingw-w64-curl-i686"
      {os = "win32" & os-distribution != "cygwinports"} |
@@ -33,7 +34,7 @@ depexts: [
   ["curl"] {os = "win32" & os-distribution = "cygwinports"}
   ["curl-dev"] {os-distribution = "alpine"}
   ["libcurl-devel"] {os-family = "suse" | os-family = "opensuse"}
-  ["libcurl-devel"] {os-distribution = "fedora"}
+  ["libcurl-devel"] {os-family = "fedora"}
   ["libcurl-devel"] {os-distribution = "ol"}
   ["curl"] {os-distribution = "homebrew" & os = "macos"}
   ["curl"] {os-distribution = "macports" & os = "macos"}
diff --git a/packages/conf-libev/conf-libev.4-12/opam b/packages/conf-libev/conf-libev.4-12/opam
index bf792dedf..c7f157119 100644
--- a/packages/conf-libev/conf-libev.4-12/opam
+++ b/packages/conf-libev/conf-libev.4-12/opam
@@ -23,7 +23,7 @@ depexts: [
   ["libev"] {os = "macos" & os-distribution = "homebrew"}
   ["libev-dev"] {os-family = "alpine"}
   ["libev"] {os-family = "arch"}
-  ["libev-devel"] {os-distribution = "fedora"}
+  ["libev-devel"] {os-family = "fedora"}
   ["libev-devel"] {os-distribution = "rhel"}
   ["libev-devel"] {os-distribution = "centos"}
   ["libev-devel"] {os-distribution = "ol" & os-version >= "8"}
diff --git a/packages/conf-libffi/conf-libffi.2.0.0/opam b/packages/conf-libffi/conf-libffi.2.0.0/opam
index 8d5415171..62da8885c 100644
--- a/packages/conf-libffi/conf-libffi.2.0.0/opam
+++ b/packages/conf-libffi/conf-libffi.2.0.0/opam
@@ -20,12 +20,14 @@ depends: [
 ]
 flags: conf
 build: [
-  "pkgconf" {os = "win32" & os-distribution = "cygwin"}
+  "pkgconf" {os = "win32" & os-distribution != "cygwinports"}
   "--personality=i686-w64-mingw32"
-    {os = "win32" & os-distribution = "cygwin" & host-arch-x86_32:installed}
+    {os = "win32" & os-distribution != "cygwinports" &
+     host-arch-x86_32:installed}
   "--personality=x86_64-w64-mingw32"
-    {os = "win32" & os-distribution = "cygwin" & host-arch-x86_64:installed}
-  "pkg-config" {os != "win32" | os-distribution != "cygwin"}
+    {os = "win32" & os-distribution != "cygwinports" &
+     host-arch-x86_64:installed}
+  "pkg-config" {os != "win32" | os-distribution = "cygwinports"}
   "libffi"
 ]
 depexts: [
@@ -35,7 +37,7 @@ depexts: [
   ["libffi-dev"] {os-family = "debian"}
   ["libffi-dev"] {os-family = "ubuntu"}
   ["libffi-devel"] {os-distribution = "centos"}
-  ["libffi-devel"] {os-distribution = "fedora"}
+  ["libffi-devel"] {os-family = "fedora"}
   ["libffi-devel"] {os-distribution = "mageia"}
   ["libffi-devel"] {os-distribution = "ol"}
   ["libffi-devel"] {os-family = "suse" | os-family = "opensuse"}
diff --git a/packages/conf-libnl3/conf-libnl3.1/opam b/packages/conf-libnl3/conf-libnl3.1/opam
index 917118ef6..4772b1261 100644
--- a/packages/conf-libnl3/conf-libnl3.1/opam
+++ b/packages/conf-libnl3/conf-libnl3.1/opam
@@ -20,7 +20,7 @@ depexts: [
   ["libnl-3-dev" "libnl-route-3-dev"] {os-family = "debian"}
   ["libnl-3-dev" "libnl-route-3-dev"] {os-family = "ubuntu"}
   ["libnl3" "libnl3-devel"]
-    {os-distribution = "centos" | os-distribution = "fedora"}
+    {os-distribution = "centos" | os-family = "fedora"}
   ["libnl3" "libnl3-devel"] {os-distribution = "ol" & os-version >= "8"}
   ["libnl3-devel"] {os-family = "suse" | os-family = "opensuse"}
   ["libnl"] {os-family = "arch"}
diff --git a/packages/conf-libssl/conf-libssl.4/opam b/packages/conf-libssl/conf-libssl.4/opam
index e047ce58c..7a777311a 100644
--- a/packages/conf-libssl/conf-libssl.4/opam
+++ b/packages/conf-libssl/conf-libssl.4/opam
@@ -21,12 +21,14 @@ depends: [
 flags: conf
 build: [
   [
-    "pkgconf" {os = "win32" & os-distribution = "cygwin"}
+    "pkgconf" {os = "win32" & os-distribution != "cygwinports"}
     "--personality=i686-w64-mingw32"
-      {os = "win32" & os-distribution = "cygwin" & host-arch-x86_32:installed}
+      {os = "win32" & os-distribution != "cygwinports" &
+       host-arch-x86_32:installed}
     "--personality=x86_64-w64-mingw32"
-      {os = "win32" & os-distribution = "cygwin" & host-arch-x86_64:installed}
-    "pkg-config" {os != "win32" | os-distribution != "cygwin"}
+      {os = "win32" & os-distribution != "cygwinports" &
+       host-arch-x86_64:installed}
+    "pkg-config" {os != "win32" | os-distribution = "cygwinports"}
     "--print-errors"
     "--exists"
     "openssl"
@@ -43,7 +45,7 @@ depexts: [
   ["libssl-dev"] {os-family = "ubuntu"}
   ["openssl-devel"] {os-distribution = "centos"}
   ["openssl-devel"] {os-distribution = "ol"}
-  ["openssl-devel"] {os-distribution = "fedora" | os-family = "fedora"}
+  ["openssl-devel"] {os-family = "fedora" | os-family = "fedora"}
   ["libopenssl-devel"] {os-family = "suse" | os-family = "opensuse"}
   ["openssl-dev"] {os-family = "alpine"}
   ["openssl"] {os-family = "arch"}
diff --git a/packages/conf-linux-libc-dev/conf-linux-libc-dev.0/opam b/packages/conf-linux-libc-dev/conf-linux-libc-dev.0/opam
index 6ea239d6f..3591b2cad 100644
--- a/packages/conf-linux-libc-dev/conf-linux-libc-dev.0/opam
+++ b/packages/conf-linux-libc-dev/conf-linux-libc-dev.0/opam
@@ -21,7 +21,7 @@ depexts: [
   ["linux-libc-dev"] {os-family = "ubuntu"}
   ["linux-glibc-devel"] {os-family = "suse" | os-family = "opensuse"}
   ["kernel-headers"]
-    {os-distribution = "fedora" | os-distribution = "rhel" |
+    {os-family = "fedora" | os-distribution = "rhel" |
      os-distribution = "centos" |
      os-distribution = "ol"}
   ["linux-headers"] {os-family = "alpine"}
diff --git a/packages/conf-pam/conf-pam.1/opam b/packages/conf-pam/conf-pam.1/opam
index d006e2251..f3f415a6f 100644
--- a/packages/conf-pam/conf-pam.1/opam
+++ b/packages/conf-pam/conf-pam.1/opam
@@ -13,7 +13,7 @@ build: ["cc" "-lpam" "main.c"]
 depexts: [
   ["libpam0g-dev"] {os-family = "debian" | os-family = "ubuntu"}
   ["pam-devel"] {os-distribution = "centos"}
-  ["pam-devel"] {os-distribution = "fedora"}
+  ["pam-devel"] {os-family = "fedora"}
   ["pam-devel"] {os-family = "suse" | os-family = "opensuse"}
   ["pam-devel"] {os-distribution = "ol"}
   ["pam"] {os-distribution = "arch"}
@@ -27,3 +27,4 @@ extra-source "main.c" {
     "md5=f4bf9f8ac17a811ede3f472e58653b8e"
   ]
 }
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/conf-pkg-config/conf-pkg-config.4/opam b/packages/conf-pkg-config/conf-pkg-config.4/opam
index 458c4374b..c8a0cf839 100644
--- a/packages/conf-pkg-config/conf-pkg-config.4/opam
+++ b/packages/conf-pkg-config/conf-pkg-config.4/opam
@@ -29,7 +29,7 @@ build: [
 depexts: [
   ["pkg-config"] {os-family = "debian" | os-family = "ubuntu"}
   ["pkgconf"] {os-distribution = "arch"}
-  ["pkgconf-pkg-config"] {os-distribution = "fedora"}
+  ["pkgconf-pkg-config"] {os-family = "fedora"}
   ["pkgconfig"] {os-distribution = "centos" & os-version <= "7"}
   ["pkgconf-pkg-config"] {os-distribution = "mageia"}
   ["pkgconfig"] {os-distribution = "rhel" & os-version <= "7"}
diff --git a/packages/conf-python-3/conf-python-3.9.0.0/opam b/packages/conf-python-3/conf-python-3.9.0.0/opam
index 830aeefef..0dafc298e 100644
--- a/packages/conf-python-3/conf-python-3.9.0.0/opam
+++ b/packages/conf-python-3/conf-python-3.9.0.0/opam
@@ -18,8 +18,9 @@ depexts: [
   ["python3"] {os-family = "debian" | os-family = "ubuntu"}
   ["python3"] {os-distribution = "nixos"}
   ["python3"] {os-distribution = "alpine"}
-  ["python3"] {os-distribution = "centos"}
-  ["python3"] {os-distribution = "fedora"}
+  ["python3"] {os-distribution = "centos" & os-version >= "9"}
+  ["epel-release" "python39"] {os-distribution = "centos" & os-version < "9"}
+  ["python3"] {os-family = "fedora"}
   ["python3"] {os-distribution = "ol"}
   ["python"] {os-distribution = "arch"}
   ["python3"] {os-family = "suse" | os-family = "opensuse"}
diff --git a/packages/conf-xen/conf-xen.1/opam b/packages/conf-xen/conf-xen.1/opam
index 8fc478ce9..e5d4aaf0f 100644
--- a/packages/conf-xen/conf-xen.1/opam
+++ b/packages/conf-xen/conf-xen.1/opam
@@ -17,7 +17,7 @@ depexts: [
   ["libxen-dev"] {os-family = "debian"}
   ["libxen-dev"] {os-family = "ubuntu"}
   ["xen-devel"] {os-distribution = "centos"}
-  ["xen-devel"] {os-distribution = "fedora"}
+  ["xen-devel"] {os-family = "fedora"}
   ["xen-devel"] {os-distribution = "rhel"}
   ["xen-devel"] {os-distribution = "ol"}
   ["xen-devel"] {os-family = "suse" | os-family = "opensuse"}
diff --git a/packages/cstruct-lwt/cstruct-lwt.6.2.0/opam b/packages/cstruct-lwt/cstruct-lwt.6.2.0/opam
index 6946f17dc..9b1cd321a 100644
--- a/packages/cstruct-lwt/cstruct-lwt.6.2.0/opam
+++ b/packages/cstruct-lwt/cstruct-lwt.6.2.0/opam
@@ -45,3 +45,4 @@ url {
   ]
 }
 x-commit-hash: "8c7c94a038aae72dc89c994551c9d2c690895607"
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/cstruct-unix/cstruct-unix.6.2.0/opam b/packages/cstruct-unix/cstruct-unix.6.2.0/opam
index 9a6e21205..28826c6f5 100644
--- a/packages/cstruct-unix/cstruct-unix.6.2.0/opam
+++ b/packages/cstruct-unix/cstruct-unix.6.2.0/opam
@@ -44,3 +44,4 @@ url {
   ]
 }
 x-commit-hash: "8c7c94a038aae72dc89c994551c9d2c690895607"
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/cstruct/cstruct.6.2.0/opam b/packages/cstruct/cstruct.6.2.0/opam
index 99de36e39..b031d260b 100644
--- a/packages/cstruct/cstruct.6.2.0/opam
+++ b/packages/cstruct/cstruct.6.2.0/opam
@@ -50,3 +50,4 @@ url {
   ]
 }
 x-commit-hash: "8c7c94a038aae72dc89c994551c9d2c690895607"
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/ctypes/ctypes.0.23.0/opam b/packages/ctypes/ctypes.0.23.0/opam
index e10af4aba..48a5efd7f 100644
--- a/packages/ctypes/ctypes.0.23.0/opam
+++ b/packages/ctypes/ctypes.0.23.0/opam
@@ -62,3 +62,4 @@ url {
     "md5=b1af973ec9cf7867a63714e92df82f2a"
   ]
 }
+x-maintenance-intent: ["(any).(any).(latest)"]
diff --git a/packages/diet/diet.0.4/opam b/packages/diet/diet.0.4/opam
index 0625a19c7..5f63399ef 100644
--- a/packages/diet/diet.0.4/opam
+++ b/packages/diet/diet.0.4/opam
@@ -1,4 +1,11 @@
 opam-version: "2.0"
+name: "diet"
+version: "0.4"
+synopsis: "Discrete Interval Encoding Trees"
+description: """\
+This data structure is based on the
+[Functional Pearls: Diets for Fat Sets](https://web.engr.oregonstate.edu/~erwig/papers/Diet_JFP98.pdf)
+by Martin Erwig."""
 maintainer: "dave@recoil.org"
 authors: "David Scott"
 license: "ISC"
@@ -17,11 +24,6 @@ build: [
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
 dev-repo: "git+https://github.com/mirage/ocaml-diet.git"
-synopsis: "Discrete Interval Encoding Trees"
-description: """
-This data structure is based on the
-[Functional Pearls: Diets for Fat Sets](https://web.engr.oregonstate.edu/~erwig/papers/Diet_JFP98.pdf)
-by Martin Erwig."""
 url {
   src:
     "https://github.com/mirage/ocaml-diet/releases/download/v0.4/diet-v0.4.tbz"
diff --git a/packages/dot-merlin-reader/dot-merlin-reader.5.5-503/opam b/packages/dot-merlin-reader/dot-merlin-reader.5.6-504/opam
similarity index 63%
rename from packages/dot-merlin-reader/dot-merlin-reader.5.5-503/opam
rename to packages/dot-merlin-reader/dot-merlin-reader.5.6-504/opam
index cbfcd501c..c8a144666 100644
--- a/packages/dot-merlin-reader/dot-merlin-reader.5.5-503/opam
+++ b/packages/dot-merlin-reader/dot-merlin-reader.5.6-504/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "dot-merlin-reader"
-version: "5.5-503"
+version: "5.6-504"
 synopsis: "Reads config files for merlin"
 description: """\
 Helper process: reads .merlin files and outputs the normalized content to
@@ -23,11 +23,11 @@ build: [
 dev-repo: "git+https://github.com/ocaml/merlin.git"
 url {
   src:
-    "https://github.com/ocaml/merlin/releases/download/v5.5-503/merlin-5.5-503.tbz"
+    "https://github.com/ocaml/merlin/releases/download/v5.6-504/merlin-5.6-504.tbz"
   checksum: [
-    "sha256=67da3b34f2fea07678267309f61da4a2c6f08298de0dc59655b8d30fd8269af1"
-    "sha512=1fb3b5180d36aa82b82a319e15b743b802b6888f0dc67645baafdb4e18dfc23a7b90064ec9bc42f7424061cf8cde7f8839178d8a8537bf4596759f3ff4891873"
+    "sha256=82d648a4180d6d5aa3a083218e28bf197f4e9f147884de9302bb6811ad98b77f"
+    "sha512=e21c96db754a289462677e6985181902ddd90bab9e9cebbbb739d92d94b5aee7ef7a134da70ae384291d9bfaccfecd26d37b48f8d75c5d36b9eda18f6e5afd3d"
   ]
 }
-x-commit-hash: "8b88b89ee7431a23eaf95e4e02e45dc65595aa74"
+x-commit-hash: "885a314581571e358e039d2b1956c9513cd129d6"
 x-maintenance-intent: ["(latest)"]
diff --git a/packages/duration/duration.0.2.1/opam b/packages/duration/duration.0.2.1/opam
index c71026a9b..23b165429 100644
--- a/packages/duration/duration.0.2.1/opam
+++ b/packages/duration/duration.0.2.1/opam
@@ -32,3 +32,4 @@ url {
   ]
 }
 x-commit-hash: "6abe42ebe585a96f79eb91045911b9a73c1db19e"
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/fd-send-recv/fd-send-recv.2.0.3/opam b/packages/fd-send-recv/fd-send-recv.2.0.3/opam
index a5e8a6beb..45937eeab 100644
--- a/packages/fd-send-recv/fd-send-recv.2.0.3/opam
+++ b/packages/fd-send-recv/fd-send-recv.2.0.3/opam
@@ -1,33 +1,27 @@
 opam-version: "2.0"
+name: "fd-send-recv"
+version: "2.0.3"
+synopsis:
+  "Bindings for sendmsg/recvmsg that allow Unix.file_descrs to be sent and received over Unix domain sockets"
 maintainer: "xen-api@lists.xensource.com"
-authors: [
-  "David Scott"
-  "David Sheets"
-  "Euan Harris"
-  "Vincent Bernardoff"
-]
+authors: ["David Scott" "David Sheets" "Euan Harris" "Vincent Bernardoff"]
 license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception"
+tags: ["org:mirage" "org:xapi-project"]
 homepage: "https://github.com/xapi-project/ocaml-fd-send-recv"
+doc:
+  "https://github.com/xapi-project/ocaml-fd-send-recv/blob/master/lib/fd_send_recv.mli"
 bug-reports: "https://github.com/xapi-project/ocaml-fd-send-recv/issues"
-dev-repo: "git+https://github.com/xapi-project/ocaml-fd-send-recv.git"
-doc: "https://github.com/xapi-project/ocaml-fd-send-recv/blob/master/lib/fd_send_recv.mli"
-x-maintenance-intent: ["(latest)"]
-tags: [
-  "org:mirage"
-  "org:xapi-project"
+depends: [
+  "ocaml" {>= "4.14"}
+  "dune" {>= "1.4"}
+  "odoc" {with-doc}
 ]
 build: [
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
   ["dune" "build" "@doc" "-p" name] {with-doc}
 ]
-depends: [
-  "ocaml" {>= "4.14"}
-  "dune" {build}
-  "odoc" {with-doc}
-]
-synopsis:
-  "Bindings for sendmsg/recvmsg that allow Unix.file_descrs to be sent and received over Unix domain sockets"
+dev-repo: "git+https://github.com/xapi-project/ocaml-fd-send-recv.git"
 url {
   src:
     "https://github.com/xapi-project/ocaml-fd-send-recv/releases/download/v2.0.3/fd-send-recv-2.0.3.tbz"
@@ -37,3 +31,4 @@ url {
   ]
 }
 x-commit-hash: "7ae08696ef551829e6a5554c4b36f77e929f44f9"
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/fpath/fpath.0.7.3/opam b/packages/fpath/fpath.0.7.3/opam
index 2c365363a..db8dd21d0 100644
--- a/packages/fpath/fpath.0.7.3/opam
+++ b/packages/fpath/fpath.0.7.3/opam
@@ -39,3 +39,4 @@ url {
     "md5=0740b530e8fed5b0adc5eee8463cfc2f"
   ]
 }
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/gmap/gmap.0.3.0/opam b/packages/gmap/gmap.0.3.0/opam
index d026f5e15..0105dd5f1 100644
--- a/packages/gmap/gmap.0.3.0/opam
+++ b/packages/gmap/gmap.0.3.0/opam
@@ -17,7 +17,7 @@ doc: "https://hannesm.github.io/gmap/doc"
 bug-reports: "https://github.com/hannesm/gmap/issues"
 depends: [
   "ocaml" {>= "4.04.2"}
-  "dune"
+  "dune" {>= "1.0"}
   "alcotest" {with-test}
   "fmt" {with-test}
 ]
@@ -35,3 +35,4 @@ url {
     "sha512=71616981f5a15d6b2a47e18702083e52e81f6547076085b1489f676f50b0cc47c7c2c4fa19cb581e2878dc3d4f7133d0c50d8b51a8390be0e6e30318907d81d3"
   ]
 }
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/hex/hex.1.5.0/opam b/packages/hex/hex.1.5.0/opam
index a1f12e04e..5c3b48257 100644
--- a/packages/hex/hex.1.5.0/opam
+++ b/packages/hex/hex.1.5.0/opam
@@ -40,3 +40,4 @@ url {
   ]
 }
 x-commit-hash: "036cdf98cd20109f3f1408b816e59b21e9da294b"
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/hmap/hmap.0.8.1/opam b/packages/hmap/hmap.0.8.1/opam
index b9c71eb33..0d2f3c9d2 100644
--- a/packages/hmap/hmap.0.8.1/opam
+++ b/packages/hmap/hmap.0.8.1/opam
@@ -31,3 +31,4 @@ url {
     "md5=04169252265a11d852e1547445177196"
   ]
 }
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/host-arch-x86_64/host-arch-x86_64.1/opam b/packages/host-arch-x86_64/host-arch-x86_64.1/opam
index a053a40ef..4d97796f6 100644
--- a/packages/host-arch-x86_64/host-arch-x86_64.1/opam
+++ b/packages/host-arch-x86_64/host-arch-x86_64.1/opam
@@ -17,3 +17,4 @@ license: "CC0-1.0+"
 homepage: "https://opam.ocaml.org"
 bug-reports: "https://github.com/ocaml/opam-repository/issues"
 conflict-class: "ocaml-host-arch"
+available: os = "win32" | arch = "x86_64"
diff --git a/packages/host-system-other/host-system-other.1/opam b/packages/host-system-other/host-system-other.1/opam
index ec43ffd69..473e4cf7a 100644
--- a/packages/host-system-other/host-system-other.1/opam
+++ b/packages/host-system-other/host-system-other.1/opam
@@ -15,3 +15,4 @@ license: "CC0-1.0+"
 homepage: "https://opam.ocaml.org"
 bug-reports: "https://github.com/ocaml/opam-repository/issues"
 conflict-class: "ocaml-host-system"
+available: os != "win32"
diff --git a/packages/io-page/io-page.3.0.0/opam b/packages/io-page/io-page.3.0.0/opam
index 73308fdc1..e11cc9281 100644
--- a/packages/io-page/io-page.3.0.0/opam
+++ b/packages/io-page/io-page.3.0.0/opam
@@ -39,3 +39,4 @@ url {
   ]
 }
 x-commit-hash: "cc82c9cbd1e1caf7c40e12891b9e668d94b06b88"
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/ipaddr-sexp/ipaddr-sexp.5.6.0/opam b/packages/ipaddr-sexp/ipaddr-sexp.5.6.0/opam
index fb5c97930..64bb263d8 100644
--- a/packages/ipaddr-sexp/ipaddr-sexp.5.6.0/opam
+++ b/packages/ipaddr-sexp/ipaddr-sexp.5.6.0/opam
@@ -35,3 +35,4 @@ url {
   ]
 }
 x-commit-hash: "a3852099627a9f9c56d75efe1c1adf4941c6c3d4"
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/ipaddr/ipaddr.5.6.0/opam b/packages/ipaddr/ipaddr.5.6.0/opam
index 1f6be92f4..983cf2f81 100644
--- a/packages/ipaddr/ipaddr.5.6.0/opam
+++ b/packages/ipaddr/ipaddr.5.6.0/opam
@@ -50,3 +50,4 @@ url {
   ]
 }
 x-commit-hash: "a3852099627a9f9c56d75efe1c1adf4941c6c3d4"
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/jsonm/jsonm.1.0.2/opam b/packages/jsonm/jsonm.1.0.2/opam
index 3e50f8e17..d7c06649f 100644
--- a/packages/jsonm/jsonm.1.0.2/opam
+++ b/packages/jsonm/jsonm.1.0.2/opam
@@ -38,3 +38,4 @@ url {
   checksum:
     "sha512=0072f5c31080202ed1cb996a8530d72c882723f26b597f784441033f59338ba8c0cbabf901794d5b1ae749a54af4d7ebf7b47987db43488c7f6ac7fe191a042f"
 }
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/jsonrpc/jsonrpc.1.23.0/opam b/packages/jsonrpc/jsonrpc.1.24.0/opam
similarity index 67%
rename from packages/jsonrpc/jsonrpc.1.23.0/opam
rename to packages/jsonrpc/jsonrpc.1.24.0/opam
index d8be9a770..315273887 100644
--- a/packages/jsonrpc/jsonrpc.1.23.0/opam
+++ b/packages/jsonrpc/jsonrpc.1.24.0/opam
@@ -1,7 +1,7 @@
 opam-version: "2.0"
 name: "jsonrpc"
-version: "1.23.0"
-synopsis: "Jsonrpc protocol implemenation"
+version: "1.24.0"
+synopsis: "Jsonrpc protocol implementation"
 description: "See https://www.jsonrpc.org/specification"
 maintainer: "Rudi Grinberg <me@rgrinberg.com>"
 authors: [
@@ -21,12 +21,10 @@ homepage: "https://github.com/ocaml/ocaml-lsp"
 bug-reports: "https://github.com/ocaml/ocaml-lsp/issues"
 depends: [
   "dune" {>= "3.0"}
+  "yojson" {>= "2.0"}
   "ocaml" {>= "4.08"}
   "odoc" {with-doc}
 ]
-conflicts: [
-  "yojson" {>= "3.0.0"}
-]
 build: [
   ["dune" "subst"] {dev}
   ["dune" "build" "-p" name "-j" jobs "@install" "@doc" {with-doc}]
@@ -34,11 +32,11 @@ build: [
 dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git"
 url {
   src:
-    "https://github.com/ocaml/ocaml-lsp/releases/download/1.23.0/lsp-1.23.0.tbz"
+    "https://github.com/ocaml/ocaml-lsp/releases/download/1.24.0/lsp-1.24.0.tbz"
   checksum: [
-    "sha256=7f2bd023b54a80eace16286d28891c1360768946052c939918a8a9cd95340e7d"
-    "sha512=f5d62f19646923b0e54a23516539b949dd434178b98cf3a6f1fdaf6bba3c277aa4b93c57a2d8f9a6d9d75d7c514b4a2616a8593e01cd17331986d4e3392ef96e"
+    "sha256=4d5a1a2157f612f6c02d8f838d97deaca5f81b23add3c5cea5cb6ceceb7b3757"
+    "sha512=bf89c8542c45394a42c43de998b93ba93be89aaf940731d23c055865415293fd7615f7c746b7e350a97f65f8d7312b858450d3a1d3120ca5a348e766fbce0d90"
   ]
 }
-x-commit-hash: "4483b5b9cb3c58d09cfd113394f3ced8fea11f50"
+x-commit-hash: "adf029c85807527198b17aad6d586a2e56bc065c"
 x-maintenance-intent: ["(latest)"]
diff --git a/packages/lambda-term/lambda-term.3.3.2/opam b/packages/lambda-term/lambda-term.3.3.2/opam
index 4367ee3cb..23558c04e 100644
--- a/packages/lambda-term/lambda-term.3.3.2/opam
+++ b/packages/lambda-term/lambda-term.3.3.2/opam
@@ -19,7 +19,7 @@ depends: [
   "dune" {>= "3.0"}
   "ocaml" {>= "4.08.0"}
   "logs"
-  "lwt" {>= "4.2.0"}
+  "lwt" {>= "4.2.0" & < "6~"}
   "lwt_react"
   "mew_vi" {>= "0.5.0" & < "0.6.0"}
   "react"
diff --git a/packages/lsp/lsp.1.23.0/opam b/packages/lsp/lsp.1.24.0/opam
similarity index 76%
rename from packages/lsp/lsp.1.23.0/opam
rename to packages/lsp/lsp.1.24.0/opam
index c7eea7d40..0f653fc52 100644
--- a/packages/lsp/lsp.1.23.0/opam
+++ b/packages/lsp/lsp.1.24.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "lsp"
-version: "1.23.0"
+version: "1.24.0"
 synopsis: "LSP protocol implementation in OCaml"
 description: """\
 Implementation of the LSP protocol in OCaml. It is designed to be as portable as
@@ -24,7 +24,7 @@ bug-reports: "https://github.com/ocaml/ocaml-lsp/issues"
 depends: [
   "dune" {>= "3.0"}
   "jsonrpc" {= version}
-  "yojson" {< "3.0.0"}
+  "yojson"
   "ppx_yojson_conv_lib" {>= "v0.14"}
   "cinaps" {with-test}
   "ppx_expect" {>= "v0.17.0" & with-test}
@@ -40,11 +40,11 @@ build: [
 dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git"
 url {
   src:
-    "https://github.com/ocaml/ocaml-lsp/releases/download/1.23.0/lsp-1.23.0.tbz"
+    "https://github.com/ocaml/ocaml-lsp/releases/download/1.24.0/lsp-1.24.0.tbz"
   checksum: [
-    "sha256=7f2bd023b54a80eace16286d28891c1360768946052c939918a8a9cd95340e7d"
-    "sha512=f5d62f19646923b0e54a23516539b949dd434178b98cf3a6f1fdaf6bba3c277aa4b93c57a2d8f9a6d9d75d7c514b4a2616a8593e01cd17331986d4e3392ef96e"
+    "sha256=4d5a1a2157f612f6c02d8f838d97deaca5f81b23add3c5cea5cb6ceceb7b3757"
+    "sha512=bf89c8542c45394a42c43de998b93ba93be89aaf940731d23c055865415293fd7615f7c746b7e350a97f65f8d7312b858450d3a1d3120ca5a348e766fbce0d90"
   ]
 }
-x-commit-hash: "4483b5b9cb3c58d09cfd113394f3ced8fea11f50"
+x-commit-hash: "adf029c85807527198b17aad6d586a2e56bc065c"
 x-maintenance-intent: ["(latest)"]
diff --git a/packages/lwt_log/lwt_log.1.1.2/opam b/packages/lwt_log/lwt_log.1.1.2/opam
index 8555ec67f..1e925cb93 100644
--- a/packages/lwt_log/lwt_log.1.1.2/opam
+++ b/packages/lwt_log/lwt_log.1.1.2/opam
@@ -13,7 +13,7 @@ doc:
 bug-reports: "https://github.com/ocsigen/lwt_log/issues"
 depends: [
   "dune" {>= "1.0"}
-  "lwt" {>= "4.0.0"}
+  "lwt" {>= "4.0.0" & < "6~"}
   "ocaml" {>= "4.03"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
diff --git a/packages/macaddr/macaddr.5.6.0/opam b/packages/macaddr/macaddr.5.6.0/opam
index 4e6cb19c3..168af2522 100644
--- a/packages/macaddr/macaddr.5.6.0/opam
+++ b/packages/macaddr/macaddr.5.6.0/opam
@@ -42,3 +42,4 @@ url {
   ]
 }
 x-commit-hash: "a3852099627a9f9c56d75efe1c1adf4941c6c3d4"
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/merge-fmt/merge-fmt.0.3/opam b/packages/merge-fmt/merge-fmt.0.4/opam
similarity index 51%
rename from packages/merge-fmt/merge-fmt.0.3/opam
rename to packages/merge-fmt/merge-fmt.0.4/opam
index 45bfef331..b50ba2be4 100644
--- a/packages/merge-fmt/merge-fmt.0.3/opam
+++ b/packages/merge-fmt/merge-fmt.0.4/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "merge-fmt"
-version: "0.3"
+version: "0.4"
 synopsis: "Git mergetool leveraging code formatters"
 description:
   "`merge-fmt` is a small wrapper on top git commands to help resolve conflicts by leveraging code formatters."
@@ -11,23 +11,27 @@ homepage: "https://github.com/hhugo/merge-fmt"
 doc: "https://hhugo.github.io/merge-fmt/"
 bug-reports: "https://github.com/hhugo/merge-fmt/issues"
 depends: [
-  "ocaml" {>= "4.06.1"}
-  "dune" {>= "1.6"}
+  "dune" {>= "3.0"}
+  "ocaml" {>= "4.8"}
   "cmdliner" {>= "1.1.0"}
-  "base" {< "v0.17"}
+  "base"
   "stdio"
   "ppx_expect" {with-test}
   "core_unix" {with-test}
-  "ocamlformat" {= "0.24.1" & with-test}
+  "ocamlformat" {= "0.27.0" & with-test}
+  "odoc" {with-doc}
+]
+build: [
+  ["dune" "subst"] {dev}
+  ["dune" "build" "-p" name "-j" jobs "@install" "@doc" {with-doc}]
 ]
-build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/hhugo/merge-fmt.git"
 url {
   src:
-    "https://github.com/hhugo/merge-fmt/releases/download/0.3/merge-fmt-0.3.tbz"
+    "https://github.com/hhugo/merge-fmt/releases/download/0.4/merge-fmt-0.4.tbz"
   checksum: [
-    "sha256=17e76cd13a1670a0f8349537c984955b80779b62c19e147ee105530ceefdab5e"
-    "sha512=66f56ae2d888fa6997754bbcee71a19d65fb51abf4b5b6240a252795cc0866487ad87199c79b699ff84f7150ee5dcc76dad3f427e94d25172fd4a5967c9c23aa"
+    "sha256=48f104bf49166e055a6221d8875107e3b3de60a9a1f7bed96363830a99a3ac58"
+    "sha512=cfd5bca5bd0813085e0cd4443907086079f4d5c165b582ea0cc88adbf60a8f3237b31a72141f3c72d557f7215af6b5cba9b9f04298e62a76b56936432c975106"
   ]
 }
-x-commit-hash: "ddcddd85cbf1a596ad1759163ae2eb75673924f5"
+x-commit-hash: "75fe62161292f8ce41d186e99d696957abdc7760"
diff --git a/packages/merlin-lib/merlin-lib.5.5-503/opam b/packages/merlin-lib/merlin-lib.5.6-504/opam
similarity index 68%
rename from packages/merlin-lib/merlin-lib.5.5-503/opam
rename to packages/merlin-lib/merlin-lib.5.6-504/opam
index ffba15eb4..a11f06d91 100644
--- a/packages/merlin-lib/merlin-lib.5.5-503/opam
+++ b/packages/merlin-lib/merlin-lib.5.6-504/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "merlin-lib"
-version: "5.5-503"
+version: "5.6-504"
 synopsis: "Merlin's libraries"
 description: """\
 These libraries provides access to low-level compiler interfaces and the
@@ -12,7 +12,7 @@ license: "MIT"
 homepage: "https://github.com/ocaml/merlin"
 bug-reports: "https://github.com/ocaml/merlin/issues"
 depends: [
-  "ocaml" {>= "5.3" & < "5.4"}
+  "ocaml" {>= "5.4" & < "5.5"}
   "dune" {>= "3.0.0"}
   "csexp" {>= "1.5.1"}
   "alcotest" {with-test & >= "1.3.0"}
@@ -27,11 +27,11 @@ build: [
 dev-repo: "git+https://github.com/ocaml/merlin.git"
 url {
   src:
-    "https://github.com/ocaml/merlin/releases/download/v5.5-503/merlin-5.5-503.tbz"
+    "https://github.com/ocaml/merlin/releases/download/v5.6-504/merlin-5.6-504.tbz"
   checksum: [
-    "sha256=67da3b34f2fea07678267309f61da4a2c6f08298de0dc59655b8d30fd8269af1"
-    "sha512=1fb3b5180d36aa82b82a319e15b743b802b6888f0dc67645baafdb4e18dfc23a7b90064ec9bc42f7424061cf8cde7f8839178d8a8537bf4596759f3ff4891873"
+    "sha256=82d648a4180d6d5aa3a083218e28bf197f4e9f147884de9302bb6811ad98b77f"
+    "sha512=e21c96db754a289462677e6985181902ddd90bab9e9cebbbb739d92d94b5aee7ef7a134da70ae384291d9bfaccfecd26d37b48f8d75c5d36b9eda18f6e5afd3d"
   ]
 }
-x-commit-hash: "8b88b89ee7431a23eaf95e4e02e45dc65595aa74"
+x-commit-hash: "885a314581571e358e039d2b1956c9513cd129d6"
 x-maintenance-intent: ["(latest)"]
diff --git a/packages/merlin/merlin.5.5-503/opam b/packages/merlin/merlin.5.6-504/opam
similarity index 85%
rename from packages/merlin/merlin.5.5-503/opam
rename to packages/merlin/merlin.5.6-504/opam
index 19bf1438d..1e657144d 100644
--- a/packages/merlin/merlin.5.5-503/opam
+++ b/packages/merlin/merlin.5.6-504/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "merlin"
-version: "5.5-503"
+version: "5.6-504"
 synopsis:
   "Editor helper, provides completion, typing and source browsing in Vim and Emacs"
 description:
@@ -14,7 +14,7 @@ depends: [
   "dune" {>= "3.0.0"}
   "merlin-lib" {= version}
   "dot-merlin-reader" {= version}
-  "ocaml-index" {>= "1.0" & post}
+  "ocaml-index" {= version & post}
   "yojson" {>= "2.0.0"}
   "conf-jq" {with-test}
   "ppxlib" {with-test}
@@ -72,11 +72,11 @@ 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/v5.5-503/merlin-5.5-503.tbz"
+    "https://github.com/ocaml/merlin/releases/download/v5.6-504/merlin-5.6-504.tbz"
   checksum: [
-    "sha256=67da3b34f2fea07678267309f61da4a2c6f08298de0dc59655b8d30fd8269af1"
-    "sha512=1fb3b5180d36aa82b82a319e15b743b802b6888f0dc67645baafdb4e18dfc23a7b90064ec9bc42f7424061cf8cde7f8839178d8a8537bf4596759f3ff4891873"
+    "sha256=82d648a4180d6d5aa3a083218e28bf197f4e9f147884de9302bb6811ad98b77f"
+    "sha512=e21c96db754a289462677e6985181902ddd90bab9e9cebbbb739d92d94b5aee7ef7a134da70ae384291d9bfaccfecd26d37b48f8d75c5d36b9eda18f6e5afd3d"
   ]
 }
-x-commit-hash: "8b88b89ee7431a23eaf95e4e02e45dc65595aa74"
+x-commit-hash: "885a314581571e358e039d2b1956c9513cd129d6"
 x-maintenance-intent: ["(latest)"]
diff --git a/packages/mirage-block-unix/mirage-block-unix.2.14.2/opam b/packages/mirage-block-unix/mirage-block-unix.2.14.2/opam
index 341bf57c7..7b394d263 100644
--- a/packages/mirage-block-unix/mirage-block-unix.2.14.2/opam
+++ b/packages/mirage-block-unix/mirage-block-unix.2.14.2/opam
@@ -44,3 +44,4 @@ url {
   ]
 }
 x-commit-hash: "98efe7ad179994cbae5eba4549dd92c486731bcf"
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/mirage-block/mirage-block.3.0.2/opam b/packages/mirage-block/mirage-block.3.0.2/opam
index eeeff9379..253a60d15 100644
--- a/packages/mirage-block/mirage-block.3.0.2/opam
+++ b/packages/mirage-block/mirage-block.3.0.2/opam
@@ -32,3 +32,4 @@ url {
   ]
 }
 x-commit-hash: "20e3794e5452b8d37b951cf60ec907e8d96507c7"
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/mirage-clock/mirage-clock.4.2.0/opam b/packages/mirage-clock/mirage-clock.4.2.0/opam
index f1682c510..1c162f05a 100644
--- a/packages/mirage-clock/mirage-clock.4.2.0/opam
+++ b/packages/mirage-clock/mirage-clock.4.2.0/opam
@@ -35,3 +35,4 @@ url {
   ]
 }
 x-commit-hash: "f457572bfedb9586c8bf9eaa9ece7e53677856e3"
+x-maintenance-intent: ["(none)"]
diff --git a/packages/mirage-time-unix/mirage-time-unix.3.0.0/opam b/packages/mirage-time-unix/mirage-time-unix.3.0.0/opam
index 5fa719a6f..eb0c2355c 100644
--- a/packages/mirage-time-unix/mirage-time-unix.3.0.0/opam
+++ b/packages/mirage-time-unix/mirage-time-unix.3.0.0/opam
@@ -43,3 +43,4 @@ url {
   ]
 }
 x-commit-hash: "c68f199b1952f0656526a3212f82afd2a49c1f00"
+x-maintenance-intent: ["(none)"]
diff --git a/packages/mirage-time/mirage-time.3.0.0/opam b/packages/mirage-time/mirage-time.3.0.0/opam
index 8eec64771..361fdb280 100644
--- a/packages/mirage-time/mirage-time.3.0.0/opam
+++ b/packages/mirage-time/mirage-time.3.0.0/opam
@@ -41,3 +41,4 @@ url {
   ]
 }
 x-commit-hash: "c68f199b1952f0656526a3212f82afd2a49c1f00"
+x-maintenance-intent: ["(none)"]
diff --git a/packages/mtime/mtime.2.1.0/opam b/packages/mtime/mtime.2.1.0/opam
index b261ef64f..c2b66c84b 100644
--- a/packages/mtime/mtime.2.1.0/opam
+++ b/packages/mtime/mtime.2.1.0/opam
@@ -36,3 +36,4 @@ url {
   checksum:
     "sha512=a6619f1a3f1a5b32b7a9a067b939f94e6c66244eb90762d41f2cb1c9af852dd7d270fedb20e2b9b61875d52ba46e24af6ebf5950d1284b0b75b2fd2c380d9af3"
 }
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/nbd-tool/nbd-tool.6.0.1/opam b/packages/nbd-tool/nbd-tool.6.0.1/opam
index 432223804..adfec241f 100644
--- a/packages/nbd-tool/nbd-tool.6.0.1/opam
+++ b/packages/nbd-tool/nbd-tool.6.0.1/opam
@@ -16,7 +16,7 @@ depends: [
   "dune" {>= "2.7.0"}
   "alcotest" {with-test}
   "alcotest-lwt" {with-test}
-  "cmdliner" {>= "1.1.0"}
+  "cmdliner" {>= "1.1.0" & < "2.0.0"}
   "lwt" {>= "2.7.0"}
   "lwt_log"
   "mirage-block-unix"
diff --git a/packages/netlink/netlink.0.3.4/opam b/packages/netlink/netlink.0.3.4/opam
index 783735cd8..3049865c3 100644
--- a/packages/netlink/netlink.0.3.4/opam
+++ b/packages/netlink/netlink.0.3.4/opam
@@ -6,9 +6,9 @@ description: """\
 The Netlink Protocol Library Suite (libnl, see
 http://www.infradead.org/~tgr/libnl/) provides APIs to the netlink
 protocol, allowing you to interact with network devices in the Linux kernel."""
-license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 maintainer: "rob.hoes@citrix.com"
 authors: "rob.hoes@citrix.com"
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 homepage: "https://github.com/xapi-project/ocaml-netlink"
 bug-reports: "https://github.com/xapi-project/ocaml-netlink/issues"
 depends: [
diff --git a/packages/notty/notty.0.2.3/opam b/packages/notty/notty.0.2.3+1/opam
similarity index 81%
rename from packages/notty/notty.0.2.3/opam
rename to packages/notty/notty.0.2.3+1/opam
index b69e7e87c..6658005f9 100644
--- a/packages/notty/notty.0.2.3/opam
+++ b/packages/notty/notty.0.2.3+1/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "notty"
-version: "0.2.3"
+version: "0.2.3+1"
 synopsis: "Declaring terminals"
 description: """\
 Notty is a declarative terminal library for OCaml structured around a notion
@@ -13,7 +13,7 @@ homepage: "https://github.com/pqwy/notty"
 doc: "https://pqwy.github.io/notty/doc"
 bug-reports: "https://github.com/pqwy/notty/issues"
 depends: [
-  "ocaml" {>= "4.08.0"}
+  "ocaml" {>= "4.08.0" & < "5.5"}
   "dune" {>= "1.7"}
   "cppo" {build & >= "1.1.0"}
   "uutf" {>= "1.0.0"}
@@ -26,6 +26,7 @@ build: [
   ["dune" "subst"] {dev}
   ["dune" "build" "-p" name "-j" jobs]
 ]
+patches: "58.patch"
 dev-repo: "git+https://github.com/pqwy/notty.git"
 url {
   src:
@@ -35,4 +36,10 @@ url {
     "sha512=6e21d44fe39f3d80884b87635bebae55cb2b931ef74f9184ba4d74cc3e51cb0b3e976c3b6dc61d377288504e8bfabe21acdc1069eacb30df1fbf6686b80f7c6b"
   ]
 }
+extra-source "58.patch" {
+  src:
+    "https://patch-diff.githubusercontent.com/raw/pqwy/notty/pull/58.patch"
+  checksum:
+    "sha256=6a873d22e0a708b7e1edd1d7a0533a3a2129dc5ba3e2578923a32aa162fff72e"
+}
 x-commit-hash: "e035d069370da436f1fc53525c1e16bff3ed687e"
diff --git a/packages/num/num.1.5-1/opam b/packages/num/num.1.6/opam
similarity index 58%
rename from packages/num/num.1.5-1/opam
rename to packages/num/num.1.6/opam
index 614a927c5..411abcdef 100644
--- a/packages/num/num.1.5-1/opam
+++ b/packages/num/num.1.6/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "num"
-version: "1.5-1"
+version: "1.6"
 synopsis:
   "The legacy Num library for arbitrary-precision integer and rational arithmetic"
 maintainer: "Xavier Leroy <xavier.leroy@inria.fr>"
@@ -21,18 +21,12 @@ build: [
   ]
   [make "test"] {with-test}
 ]
-patches: "num-in-findlib-dir.patch"
 dev-repo: "git+https://github.com/ocaml/num.git"
 url {
-  src: "https://github.com/ocaml/num/archive/v1.5.tar.gz"
+  src: "https://github.com/ocaml/num/archive/refs/tags/v1.6.tar.gz"
   checksum: [
-    "md5=b1f9405dfe5f573ea187f122f789ae57"
-    "sha512=110dd01140c1c96f5f067aa824bb63f74a26411dcaa65aaf04cb6c44b116ca02aaab9505f431c66964388ce4a31d86da5928b4c0e5557800e834de80bed46495"
+    "sha256=b5cce325449aac746d5ca963d84688a627cca5b38d41e636cf71c68b60495b3e"
+    "sha512=5cb32dfa9a9f0ad375bfd89079e9b1422979f3c089f61ef2300ad9cc64fb1fc25ed1f86b0267eb017f12ae41a574a959df5bfa39ab22c2be2f1ac84c3c671bdf"
   ]
 }
-extra-source "num-in-findlib-dir.patch" {
-  src:
-    "https://github.com/ocaml/num/commit/f6e31b1653f32c7c425b69c2b123ab2f924a4d61.patch?full_index=1"
-  checksum:
-    "sha256=f93880031ed823249f4aac860e0d9e5cdc2878550db13914db25b1585803cf05"
-}
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/ocaml-base-compiler/ocaml-base-compiler.4.14.2/opam b/packages/ocaml-base-compiler/ocaml-base-compiler.4.14.2/opam
index 527cfe31f..4d4c053cd 100644
--- a/packages/ocaml-base-compiler/ocaml-base-compiler.4.14.2/opam
+++ b/packages/ocaml-base-compiler/ocaml-base-compiler.4.14.2/opam
@@ -15,27 +15,13 @@ depends: [
   "base-unix" {post}
   "base-bigarray" {post}
   "base-threads" {post}
-  "host-arch-arm32" {arch = "arm32" & post}
-  "host-arch-arm64" {arch = "arm64" & post}
-  "host-arch-ppc64" {arch = "ppc64" & post}
-  "host-arch-riscv64" {arch = "riscv64" & post}
-  "host-arch-s390x" {arch = "s390x" & post}
-  "host-arch-x86_32" {os != "win32" & arch = "x86_32" & post}
-  "host-arch-x86_64" {os != "win32" & arch = "x86_64" & post}
-  "host-arch-unknown"
-    {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" &
-     arch != "riscv64" &
-     arch != "s390x" &
-     arch != "x86_32" &
-     arch != "x86_64" &
-     post}
   (("arch-x86_64" {os = "win32" & arch = "x86_64"} &
     (("system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & post}) |
      "system-msvc")) |
    ("arch-x86_32" {os = "win32"} &
     (("system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & post}) |
      "system-msvc")) |
-   "host-system-other" {os != "win32" & post})
+   "base-unix" {os != "win32" & post})
   "ocaml-options-vanilla" {post}
   "flexdll" {>= "0.36" & os = "win32"}
 ]
diff --git a/packages/ocaml-base-compiler/ocaml-base-compiler.5.3.0/opam b/packages/ocaml-base-compiler/ocaml-base-compiler.5.4.0/opam
similarity index 76%
rename from packages/ocaml-base-compiler/ocaml-base-compiler.5.3.0/opam
rename to packages/ocaml-base-compiler/ocaml-base-compiler.5.4.0/opam
index 5e63dfbad..8a7473b65 100644
--- a/packages/ocaml-base-compiler/ocaml-base-compiler.5.3.0/opam
+++ b/packages/ocaml-base-compiler/ocaml-base-compiler.5.4.0/opam
@@ -1,7 +1,7 @@
 opam-version: "2.0"
 name: "ocaml-base-compiler"
-version: "5.3.0"
-synopsis: "Official release of OCaml 5.3.0"
+version: "5.4.0"
+synopsis: "Official release of OCaml 5.4.0"
 maintainer: [
   "David Allsopp <david@tarides.com>"
   "Florian Angeletti <florian.angeletti@inria.fr>"
@@ -11,9 +11,9 @@ license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception"
 homepage: "https://ocaml.org"
 bug-reports: "https://github.com/ocaml/opam-repository/issues"
 depends: [
-  "ocaml-compiler" {= "5.3.0"}
+  "ocaml-compiler" {= "5.4.0"}
   "ocaml-options-vanilla" {post}
 ]
 conflict-class: "ocaml-core-compiler"
 flags: compiler
-dev-repo: "git+https://github.com/ocaml/ocaml#5.3"
+dev-repo: "git+https://github.com/ocaml/ocaml#5.4"
diff --git a/packages/ocaml-compiler/ocaml-compiler.5.3.0/opam b/packages/ocaml-compiler/ocaml-compiler.5.4.0/opam
similarity index 94%
rename from packages/ocaml-compiler/ocaml-compiler.5.3.0/opam
rename to packages/ocaml-compiler/ocaml-compiler.5.4.0/opam
index 73d5911be..af0e38785 100644
--- a/packages/ocaml-compiler/ocaml-compiler.5.3.0/opam
+++ b/packages/ocaml-compiler/ocaml-compiler.5.4.0/opam
@@ -1,7 +1,7 @@
 opam-version: "2.0"
 name: "ocaml-compiler"
-version: "5.3.0"
-synopsis: "Official release of OCaml 5.3.0"
+version: "5.4.0"
+synopsis: "Official release of OCaml 5.4.0"
 maintainer: [
   "David Allsopp <david@tarides.com>"
   "Florian Angeletti <florian.angeletti@inria.fr>"
@@ -19,7 +19,7 @@ license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception"
 homepage: "https://ocaml.org"
 bug-reports: "https://github.com/ocaml/opam-repository/issues"
 depends: [
-  "ocaml" {= "5.3.0" & post}
+  "ocaml" {= "5.4.0" & post}
   "base-unix" {post}
   "base-bigarray" {post}
   "base-threads" {post}
@@ -116,12 +116,12 @@ build-env: [
   [LSAN_OPTIONS = "detect_leaks=0,exitcode=0"]
   [ASAN_OPTIONS = "detect_leaks=0,exitcode=0"]
 ]
-dev-repo: "git+https://github.com/ocaml/ocaml.git#5.3"
+dev-repo: "git+https://github.com/ocaml/ocaml.git#5.4"
 url {
   src:
-    "https://github.com/ocaml/ocaml/releases/download/5.3.0/ocaml-5.3.0.tar.gz"
+    "https://github.com/ocaml/ocaml/releases/download/5.4.0/ocaml-5.4.0.tar.gz"
   checksum:
-    "sha256=22c1dd9de21bf43b62d1909041fb5fad648905227bf69550a6a6bef31e654f38"
+    "sha256=6fcf1b192e389e54c4f5cb51306ab2baee2a54a25b1770366de5a8b42695996e"
 }
 extra-source "ocaml-compiler.install" {
   src:
diff --git a/packages/ocaml-index/ocaml-index.5.5-503/opam b/packages/ocaml-index/ocaml-index.5.6-504/opam
similarity index 69%
rename from packages/ocaml-index/ocaml-index.5.5-503/opam
rename to packages/ocaml-index/ocaml-index.5.6-504/opam
index 24b7e78f8..61945ae68 100644
--- a/packages/ocaml-index/ocaml-index.5.5-503/opam
+++ b/packages/ocaml-index/ocaml-index.5.6-504/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ocaml-index"
-version: "5.5-503"
+version: "5.6-504"
 synopsis: "A tool that indexes value usages from cmt files"
 description:
   "ocaml-index should integrate with the build system to index codebase and allow tools such as Merlin to perform project-wide occurrences queries."
@@ -11,7 +11,7 @@ homepage: "https://github.com/ocaml/merlin/ocaml-index"
 bug-reports: "https://github.com/ocaml/merlin/issues"
 depends: [
   "dune" {>= "3.0.0"}
-  "ocaml" {>= "5.3"}
+  "ocaml" {>= "5.4"}
   "merlin-lib" {= version}
   "odoc" {with-doc}
 ]
@@ -34,11 +34,11 @@ build: [
 dev-repo: "git+https://github.com/ocaml/merlin.git"
 url {
   src:
-    "https://github.com/ocaml/merlin/releases/download/v5.5-503/merlin-5.5-503.tbz"
+    "https://github.com/ocaml/merlin/releases/download/v5.6-504/merlin-5.6-504.tbz"
   checksum: [
-    "sha256=67da3b34f2fea07678267309f61da4a2c6f08298de0dc59655b8d30fd8269af1"
-    "sha512=1fb3b5180d36aa82b82a319e15b743b802b6888f0dc67645baafdb4e18dfc23a7b90064ec9bc42f7424061cf8cde7f8839178d8a8537bf4596759f3ff4891873"
+    "sha256=82d648a4180d6d5aa3a083218e28bf197f4e9f147884de9302bb6811ad98b77f"
+    "sha512=e21c96db754a289462677e6985181902ddd90bab9e9cebbbb739d92d94b5aee7ef7a134da70ae384291d9bfaccfecd26d37b48f8d75c5d36b9eda18f6e5afd3d"
   ]
 }
-x-commit-hash: "8b88b89ee7431a23eaf95e4e02e45dc65595aa74"
+x-commit-hash: "885a314581571e358e039d2b1956c9513cd129d6"
 x-maintenance-intent: ["(latest)"]
diff --git a/packages/ocaml-lsp-server/ocaml-lsp-server.1.23.0/opam b/packages/ocaml-lsp-server/ocaml-lsp-server.1.24.0/opam
similarity index 75%
rename from packages/ocaml-lsp-server/ocaml-lsp-server.1.23.0/opam
rename to packages/ocaml-lsp-server/ocaml-lsp-server.1.24.0/opam
index 2750a03c0..ceeda0e23 100644
--- a/packages/ocaml-lsp-server/ocaml-lsp-server.1.23.0/opam
+++ b/packages/ocaml-lsp-server/ocaml-lsp-server.1.24.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ocaml-lsp-server"
-version: "1.23.0"
+version: "1.24.0"
 synopsis: "LSP Server for OCaml"
 description: "An LSP server for OCaml."
 maintainer: "Rudi Grinberg <me@rgrinberg.com>"
@@ -21,7 +21,7 @@ homepage: "https://github.com/ocaml/ocaml-lsp"
 bug-reports: "https://github.com/ocaml/ocaml-lsp/issues"
 depends: [
   "dune" {>= "3.0"}
-  "yojson" {< "3.0.0"}
+  "yojson"
   "base" {>= "v0.16.0"}
   "lsp" {= version}
   "jsonrpc" {= version}
@@ -32,7 +32,7 @@ depends: [
   "dyn"
   "stdune"
   "fiber" {>= "3.1.1" & < "4.0.0"}
-  "ocaml" {>= "5.3" & < "5.4"}
+  "ocaml" {>= "5.4" & < "5.5"}
   "xdg"
   "ordering"
   "dune-build-info"
@@ -46,7 +46,8 @@ depends: [
   "csexp" {>= "1.5"}
   "ocamlformat-rpc-lib" {>= "0.21.0"}
   "odoc" {with-doc}
-  "merlin-lib" {>= "5.5" & < "6.0"}
+  "merlin-lib" {>= "5.6" & < "5.7"}
+  "ocaml-index" {post}
   "ppx_yojson_conv" {with-dev-setup}
 ]
 build: [
@@ -56,11 +57,11 @@ build: [
 dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git"
 url {
   src:
-    "https://github.com/ocaml/ocaml-lsp/releases/download/1.23.0/lsp-1.23.0.tbz"
+    "https://github.com/ocaml/ocaml-lsp/releases/download/1.24.0/lsp-1.24.0.tbz"
   checksum: [
-    "sha256=7f2bd023b54a80eace16286d28891c1360768946052c939918a8a9cd95340e7d"
-    "sha512=f5d62f19646923b0e54a23516539b949dd434178b98cf3a6f1fdaf6bba3c277aa4b93c57a2d8f9a6d9d75d7c514b4a2616a8593e01cd17331986d4e3392ef96e"
+    "sha256=4d5a1a2157f612f6c02d8f838d97deaca5f81b23add3c5cea5cb6ceceb7b3757"
+    "sha512=bf89c8542c45394a42c43de998b93ba93be89aaf940731d23c055865415293fd7615f7c746b7e350a97f65f8d7312b858450d3a1d3120ca5a348e766fbce0d90"
   ]
 }
-x-commit-hash: "4483b5b9cb3c58d09cfd113394f3ced8fea11f50"
+x-commit-hash: "adf029c85807527198b17aad6d586a2e56bc065c"
 x-maintenance-intent: ["(latest)"]
diff --git a/packages/ocaml-options-vanilla/ocaml-options-vanilla.1/opam b/packages/ocaml-options-vanilla/ocaml-options-vanilla.1/opam
index 9927e5cb0..6c68513b2 100644
--- a/packages/ocaml-options-vanilla/ocaml-options-vanilla.1/opam
+++ b/packages/ocaml-options-vanilla/ocaml-options-vanilla.1/opam
@@ -21,7 +21,7 @@ conflicts: [
   "ocaml-option-fp"
   "ocaml-option-musl"
   "ocaml-option-no-flat-float-array"
-  "ocaml-option-no-compression"
+  "ocaml-option-no-compression" {os != "win32"}
   "ocaml-option-spacetime"
   "ocaml-option-static"
   "ocaml-option-nnp"
diff --git a/packages/ocaml-system/ocaml-system.4.14.2/opam b/packages/ocaml-system/ocaml-system.4.14.2/opam
index 977867895..f0a09bd5f 100644
--- a/packages/ocaml-system/ocaml-system.4.14.2/opam
+++ b/packages/ocaml-system/ocaml-system.4.14.2/opam
@@ -15,26 +15,23 @@ depends: [
   "base-unix" {post}
   "base-threads" {post}
   "base-bigarray" {post}
-  "host-arch-arm32" {?sys-ocaml-arch & sys-ocaml-arch = "arm" & post}
-  "host-arch-arm64" {?sys-ocaml-arch & sys-ocaml-arch = "arm64" & post}
-  "host-arch-ppc64" {?sys-ocaml-arch & sys-ocaml-arch = "power" & post}
-  "host-arch-riscv64" {?sys-ocaml-arch & sys-ocaml-arch = "riscv" & post}
-  "host-arch-s390x" {?sys-ocaml-arch & sys-ocaml-arch = "s390x" & post}
-  "host-arch-x86_32" {?sys-ocaml-arch & sys-ocaml-arch = "i686" & post}
-  "host-arch-x86_64" {?sys-ocaml-arch & sys-ocaml-arch = "x86_64" & post}
+  "host-arch-x86_32"
+    {os = "win32" & ?sys-ocaml-arch & sys-ocaml-arch = "i686" & post}
+  "host-arch-x86_64"
+    {os = "win32" & ?sys-ocaml-arch & sys-ocaml-arch = "x86_64" & post}
   "host-arch-unknown"
-    {(!?sys-ocaml-arch) |
-     sys-ocaml-arch != "arm" & sys-ocaml-arch != "arm64" &
-     sys-ocaml-arch != "power" &
-     sys-ocaml-arch != "riscv" &
-     sys-ocaml-arch != "s390x" &
-     sys-ocaml-arch != "i686" &
-     sys-ocaml-arch != "x86_64" &
+    {os = "win32" &
+     ((!?sys-ocaml-arch) |
+      sys-ocaml-arch != "i686" & sys-ocaml-arch != "x86_64") &
      post}
   "host-system-mingw"
-    {?sys-ocaml-arch & sys-ocaml-libc = "msvc" & sys-ocaml-cc = "cc" & post}
-  "host-system-msvc" {?sys-ocaml-arch & sys-ocaml-cc = "msvc" & post}
-  "host-system-other" {?sys-ocaml-arch & sys-ocaml-libc != "msvc" & post}
+    {os = "win32" & ?sys-ocaml-arch & sys-ocaml-libc = "msvc" &
+     sys-ocaml-cc = "cc" &
+     post}
+  "host-system-msvc"
+    {os = "win32" & ?sys-ocaml-arch & sys-ocaml-cc = "msvc" & post}
+  "host-system-other"
+    {os = "win32" & ?sys-ocaml-arch & sys-ocaml-libc != "msvc" & post}
   "conf-mingw-w64-gcc-x86_64"
     {?sys-ocaml-arch & sys-ocaml-arch = "x86_64" & sys-ocaml-libc = "msvc" &
      sys-ocaml-cc = "cc" &
@@ -56,7 +53,7 @@ depends: [
 conflict-class: "ocaml-core-compiler"
 available:
   sys-ocaml-version = "4.14.2" & (os != "win32" | sys-ocaml-libc = "msvc")
-flags: compiler
+flags: [compiler avoid-version]
 build: ["ocaml" "gen_ocaml_config.ml"]
 substs: "gen_ocaml_config.ml"
 dev-repo: "git+https://github.com/ocaml/ocaml"
diff --git a/packages/ocaml-system/ocaml-system.5.3.0/opam b/packages/ocaml-system/ocaml-system.5.4.0/opam
similarity index 95%
rename from packages/ocaml-system/ocaml-system.5.3.0/opam
rename to packages/ocaml-system/ocaml-system.5.4.0/opam
index 633434162..23fc8ffd9 100644
--- a/packages/ocaml-system/ocaml-system.5.3.0/opam
+++ b/packages/ocaml-system/ocaml-system.5.4.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ocaml-system"
-version: "5.3.0"
+version: "5.4.0"
 synopsis: "The OCaml compiler (system version, from outside of opam)"
 maintainer: [
   "David Allsopp <david@tarides.com>"
@@ -11,7 +11,7 @@ license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception"
 homepage: "https://ocaml.org"
 bug-reports: "https://github.com/ocaml/opam-repository/issues"
 depends: [
-  "ocaml" {= "5.3.0" & post}
+  "ocaml" {= "5.4.0" & post}
   "base-unix" {post}
   "base-bigarray" {post}
   "base-threads" {post}
@@ -63,7 +63,7 @@ depends: [
 ]
 conflict-class: "ocaml-core-compiler"
 available:
-  sys-ocaml-version = "5.3.0" & (os != "win32" | sys-ocaml-libc = "msvc")
+  sys-ocaml-version = "5.4.0" & (os != "win32" | sys-ocaml-libc = "msvc")
 flags: [compiler avoid-version]
 build: ["ocaml" "gen_ocaml_config.ml"]
 substs: "gen_ocaml_config.ml"
diff --git a/packages/ocaml/ocaml.4.14.2/opam b/packages/ocaml/ocaml.4.14.2/opam
index 836fead8b..e04ed7d7e 100644
--- a/packages/ocaml/ocaml.4.14.2/opam
+++ b/packages/ocaml/ocaml.4.14.2/opam
@@ -26,6 +26,7 @@ depends: [
 ]
 flags: conf
 setenv: [
+  [OCAMLTOP_INCLUDE_PATH += "%{toplevel}%"]
   [CAML_LD_LIBRARY_PATH = "%{_:stubsdir}%"]
   [CAML_LD_LIBRARY_PATH += "%{lib}%/stublibs"]
   [OCAML_TOPLEVEL_PATH = "%{toplevel}%"]
@@ -36,4 +37,5 @@ build: [
 build-env: CAML_LD_LIBRARY_PATH = ""
 x-env-path-rewrite: [
   [CAML_LD_LIBRARY_PATH (";" {os = "win32"} ":" {os != "win32"}) "target"]
+  [OCAMLTOP_INCLUDE_PATH (";" {os = "win32"} ":" {os != "win32"}) "target"]
 ]
diff --git a/packages/ocaml/ocaml.5.3.0/opam b/packages/ocaml/ocaml.5.4.0/opam
similarity index 85%
rename from packages/ocaml/ocaml.5.3.0/opam
rename to packages/ocaml/ocaml.5.4.0/opam
index ab2e6e203..9323ee766 100644
--- a/packages/ocaml/ocaml.5.3.0/opam
+++ b/packages/ocaml/ocaml.5.4.0/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ocaml"
-version: "5.3.0"
+version: "5.4.0"
 synopsis: "The OCaml compiler (virtual package)"
 description: """\
 This package requires a matching implementation of OCaml,
@@ -20,10 +20,10 @@ homepage: "https://ocaml.org"
 bug-reports: "https://github.com/ocaml/opam-repository/issues"
 depends: [
   "ocaml-config" {>= "3"}
-  "ocaml-base-compiler" {>= "5.3.0~" & < "5.3.1~"} |
-  "ocaml-variants" {>= "5.3.0~" & < "5.3.1~"} |
-  "ocaml-system" {>= "5.3.0~" & < "5.3.1~"} |
-  "dkml-base-compiler" {>= "5.3.0~" & < "5.3.1~"}
+  "ocaml-base-compiler" {>= "5.4.0~" & < "5.4.1~"} |
+  "ocaml-variants" {>= "5.4.0~" & < "5.4.1~"} |
+  "ocaml-system" {>= "5.4.0~" & < "5.4.1~"} |
+  "dkml-base-compiler" {>= "5.4.0~" & < "5.4.1~"}
 ]
 flags: conf
 setenv: [
diff --git a/packages/ocaml_intrinsics_kernel/ocaml_intrinsics_kernel.v0.17.1/opam b/packages/ocaml_intrinsics_kernel/ocaml_intrinsics_kernel.v0.17.1/opam
new file mode 100644
index 000000000..6123ed64e
--- /dev/null
+++ b/packages/ocaml_intrinsics_kernel/ocaml_intrinsics_kernel.v0.17.1/opam
@@ -0,0 +1,31 @@
+opam-version: "2.0"
+name: "ocaml_intrinsics_kernel"
+version: "v0.17.1"
+synopsis: "Intrinsics"
+description: """\
+Provides functions to invoke amd64 instructions (such as cmov, min/maxsd, popcnt)
+     when available, or compatible software implementation on other targets.
+     See also ocaml_intrinsics library."""
+maintainer: "Jane Street developers"
+authors: "Jane Street Group, LLC"
+license: "MIT"
+homepage: "https://github.com/janestreet/ocaml_intrinsics_kernel"
+doc:
+  "https://ocaml.janestreet.com/ocaml-core/latest/doc/ocaml_intrinsics_kernel/index.html"
+bug-reports: "https://github.com/janestreet/ocaml_intrinsics_kernel/issues"
+depends: [
+  "ocaml" {>= "5.1.0"}
+  "dune" {>= "3.11.0"}
+]
+available: arch != "x86_32"
+build: ["dune" "build" "-p" name "-j" jobs]
+dev-repo: "git+https://github.com/janestreet/ocaml_intrinsics_kernel.git"
+url {
+  src:
+    "https://github.com/janestreet/ocaml_intrinsics_kernel/archive/refs/tags/v0.17.1.tar.gz"
+  checksum: [
+    "md5=56ed7d0b0331e5bcfa4e016515c0267d"
+    "sha512=21e596d6407a620866cee7cab47ef1a9446d6a733b4994e809ea5566d5fa956682a5c6a6190ffb0ed48458abd658301944ed10c4389d91ecb8df677a5f87f2ab"
+  ]
+}
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/ocamlfind/ocamlfind.1.9.8/opam b/packages/ocamlfind/ocamlfind.1.9.8/opam
index 2854a278e..d12392ee1 100644
--- a/packages/ocamlfind/ocamlfind.1.9.8/opam
+++ b/packages/ocamlfind/ocamlfind.1.9.8/opam
@@ -14,7 +14,8 @@ license: "MIT"
 homepage: "http://projects.camlcity.org/projects/findlib.html"
 bug-reports: "https://github.com/ocaml/ocamlfind/issues"
 depends: [
-  "ocaml" {>= "3.08.0"}
+  "ocaml"
+    {>= "3.08.0" & (os != "cygwin" & os-distribution != "msys2" | < "5.0")}
 ]
 depopts: ["graphics"]
 build: [
diff --git a/packages/ocamlformat-lib/ocamlformat-lib.0.26.2/opam b/packages/ocamlformat-lib/ocamlformat-lib.0.26.2/opam
index 886fe65ad..12e3827d1 100644
--- a/packages/ocamlformat-lib/ocamlformat-lib.0.26.2/opam
+++ b/packages/ocamlformat-lib/ocamlformat-lib.0.26.2/opam
@@ -22,6 +22,7 @@ bug-reports: "https://github.com/ocaml-ppx/ocamlformat/issues"
 depends: [
   "ocaml" {>= "4.08" & < "5.3"}
   "alcotest" {with-test & >= "1.3.0"}
+  "cmdliner" {>= "1.1.0" & < "2.0"}
   "base" {>= "v0.12.0"}
   "dune" {>= "2.8"}
   "dune-build-info"
diff --git a/packages/ocamlformat-lib/ocamlformat-lib.0.27.0/opam b/packages/ocamlformat-lib/ocamlformat-lib.0.28.1/opam
similarity index 81%
rename from packages/ocamlformat-lib/ocamlformat-lib.0.27.0/opam
rename to packages/ocamlformat-lib/ocamlformat-lib.0.28.1/opam
index 183a40e03..0865f1b8d 100644
--- a/packages/ocamlformat-lib/ocamlformat-lib.0.27.0/opam
+++ b/packages/ocamlformat-lib/ocamlformat-lib.0.28.1/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ocamlformat-lib"
-version: "0.27.0"
+version: "0.28.1"
 synopsis: "OCaml Code Formatter"
 description:
   "OCamlFormat is a tool to automatically format OCaml code in a uniform style."
@@ -23,7 +23,7 @@ depends: [
   "ocaml" {>= "4.08"}
   "alcotest" {with-test & >= "1.3.0"}
   "base" {>= "v0.12.0"}
-  "cmdliner" {>= "1.1.0" & < "2.0.0"}
+  "cmdliner" {>= "1.1.0"}
   "dune" {>= "2.8"}
   "dune-build-info"
   "either"
@@ -60,10 +60,10 @@ build: [
 dev-repo: "git+https://github.com/ocaml-ppx/ocamlformat.git"
 url {
   src:
-    "https://github.com/ocaml-ppx/ocamlformat/releases/download/0.27.0/ocamlformat-0.27.0.tbz"
+    "https://github.com/ocaml-ppx/ocamlformat/releases/download/0.28.1/ocamlformat-0.28.1.tbz"
   checksum: [
-    "sha256=ddbf484c076d08f99400ee84b790ec231f5c8fcbd5d3324a6400d5388e846d15"
-    "sha512=4d2a8965a7b7ad45f8f4e76c01cf38bfa68462b07dfa7bdb2db23bd3e3017b214e6780f036679fa8595dde4167a01d957e3af8837274320449014e306773f917"
+    "sha256=70bda037d0bed961ed91bdb5198b2eeef542444750a8b015d80ccb94b3ff41fb"
+    "sha512=8de0517165c6f0cadcedcce66e57cb723956768a8068abd062243abb08fabf292283d0d284be230aa5647d0883a4dc7f28fcf1b70338a2b0c9b17a5bed1bbb71"
   ]
 }
-x-commit-hash: "5bac2e7f71d9b0a06bd1908dda9b13da1649eee1"
+x-commit-hash: "809492a6044557239ed1e1c2f78eec602f068ea4"
diff --git a/packages/ocamlformat-rpc-lib/ocamlformat-rpc-lib.0.27.0/opam b/packages/ocamlformat-rpc-lib/ocamlformat-rpc-lib.0.28.1/opam
similarity index 77%
rename from packages/ocamlformat-rpc-lib/ocamlformat-rpc-lib.0.27.0/opam
rename to packages/ocamlformat-rpc-lib/ocamlformat-rpc-lib.0.28.1/opam
index 82b832108..05b164dbe 100644
--- a/packages/ocamlformat-rpc-lib/ocamlformat-rpc-lib.0.27.0/opam
+++ b/packages/ocamlformat-rpc-lib/ocamlformat-rpc-lib.0.28.1/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ocamlformat-rpc-lib"
-version: "0.27.0"
+version: "0.28.1"
 synopsis: "Auto-formatter for OCaml code (RPC mode)"
 description:
   "OCamlFormat is a tool to automatically format OCaml code in a uniform style. This package defines a RPC interface to OCamlFormat"
@@ -42,10 +42,10 @@ build: [
 dev-repo: "git+https://github.com/ocaml-ppx/ocamlformat.git"
 url {
   src:
-    "https://github.com/ocaml-ppx/ocamlformat/releases/download/0.27.0/ocamlformat-0.27.0.tbz"
+    "https://github.com/ocaml-ppx/ocamlformat/releases/download/0.28.1/ocamlformat-0.28.1.tbz"
   checksum: [
-    "sha256=ddbf484c076d08f99400ee84b790ec231f5c8fcbd5d3324a6400d5388e846d15"
-    "sha512=4d2a8965a7b7ad45f8f4e76c01cf38bfa68462b07dfa7bdb2db23bd3e3017b214e6780f036679fa8595dde4167a01d957e3af8837274320449014e306773f917"
+    "sha256=70bda037d0bed961ed91bdb5198b2eeef542444750a8b015d80ccb94b3ff41fb"
+    "sha512=8de0517165c6f0cadcedcce66e57cb723956768a8068abd062243abb08fabf292283d0d284be230aa5647d0883a4dc7f28fcf1b70338a2b0c9b17a5bed1bbb71"
   ]
 }
-x-commit-hash: "5bac2e7f71d9b0a06bd1908dda9b13da1649eee1"
+x-commit-hash: "809492a6044557239ed1e1c2f78eec602f068ea4"
diff --git a/packages/ocamlformat/ocamlformat.0.27.0/opam b/packages/ocamlformat/ocamlformat.0.28.1/opam
similarity index 83%
rename from packages/ocamlformat/ocamlformat.0.27.0/opam
rename to packages/ocamlformat/ocamlformat.0.28.1/opam
index 0d74a6403..e617c8d3b 100644
--- a/packages/ocamlformat/ocamlformat.0.27.0/opam
+++ b/packages/ocamlformat/ocamlformat.0.28.1/opam
@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ocamlformat"
-version: "0.27.0"
+version: "0.28.1"
 synopsis: "Auto-formatter for OCaml code"
 description: """\
 **ocamlformat** is a code formatter for OCaml. It comes with opinionated default settings but is also fully customizable to suit your coding style.
@@ -25,7 +25,7 @@ license: ["MIT" "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"]
 homepage: "https://github.com/ocaml-ppx/ocamlformat"
 bug-reports: "https://github.com/ocaml-ppx/ocamlformat/issues"
 depends: [
-  "ocaml" {>= "5.0" & < "5.4"}
+  "ocaml" {>= "5.0"}
   "cmdliner" {with-test = "false" & >= "1.1.0" | with-test & >= "1.2.0"}
   "csexp" {>= "1.4.0"}
   "dune" {>= "2.8"}
@@ -51,10 +51,10 @@ build: [
 dev-repo: "git+https://github.com/ocaml-ppx/ocamlformat.git"
 url {
   src:
-    "https://github.com/ocaml-ppx/ocamlformat/releases/download/0.27.0/ocamlformat-0.27.0.tbz"
+    "https://github.com/ocaml-ppx/ocamlformat/releases/download/0.28.1/ocamlformat-0.28.1.tbz"
   checksum: [
-    "sha256=ddbf484c076d08f99400ee84b790ec231f5c8fcbd5d3324a6400d5388e846d15"
-    "sha512=4d2a8965a7b7ad45f8f4e76c01cf38bfa68462b07dfa7bdb2db23bd3e3017b214e6780f036679fa8595dde4167a01d957e3af8837274320449014e306773f917"
+    "sha256=70bda037d0bed961ed91bdb5198b2eeef542444750a8b015d80ccb94b3ff41fb"
+    "sha512=8de0517165c6f0cadcedcce66e57cb723956768a8068abd062243abb08fabf292283d0d284be230aa5647d0883a4dc7f28fcf1b70338a2b0c9b17a5bed1bbb71"
   ]
 }
-x-commit-hash: "5bac2e7f71d9b0a06bd1908dda9b13da1649eee1"
+x-commit-hash: "809492a6044557239ed1e1c2f78eec602f068ea4"
diff --git a/packages/ocp-indent/ocp-indent.1.8.1/opam b/packages/ocp-indent/ocp-indent.1.8.1/opam
index e0566f568..a1aae41d4 100644
--- a/packages/ocp-indent/ocp-indent.1.8.1/opam
+++ b/packages/ocp-indent/ocp-indent.1.8.1/opam
@@ -26,7 +26,7 @@ bug-reports: "https://github.com/OCamlPro/ocp-indent/issues"
 depends: [
   "ocaml"
   "dune" {>= "1.0"}
-  "cmdliner" {>= "1.0.0"}
+  "cmdliner" {>= "1.0.0" & < "2.0.0"}
   "ocamlfind"
   "base-bytes"
 ]
diff --git a/packages/ocurl/ocurl.0.9.2/opam b/packages/ocurl/ocurl.0.9.2/opam
index de6c42efb..07c88eee2 100644
--- a/packages/ocurl/ocurl.0.9.2/opam
+++ b/packages/ocurl/ocurl.0.9.2/opam
@@ -18,7 +18,10 @@ depends: [
   "conf-libcurl"
 ]
 depopts: ["lwt" "lwt_ppx"]
-conflicts: ["ocaml-option-bytecode-only"]
+conflicts: [
+  "ocaml-option-bytecode-only"
+  "lwt" {>= "6~"}
+]
 build: [
   ["./configure"]
   [make]
diff --git a/packages/odig/odig.0.0.9/opam b/packages/odig/odig.0.0.9/opam
index 31cf7540f..f48db55c3 100644
--- a/packages/odig/odig.0.0.9/opam
+++ b/packages/odig/odig.0.0.9/opam
@@ -27,7 +27,7 @@ depends: [
   "ocamlfind" {build}
   "ocamlbuild" {build}
   "topkg" {build & >= "1.0.3"}
-  "cmdliner" {>= "1.1.0"}
+  "cmdliner" {>= "1.1.0" & < "2.0.0"}
   "odoc" {>= "2.0.0"}
   "b0" {= "0.0.5"}
 ]
@@ -38,3 +38,4 @@ url {
   checksum:
     "sha512=1658390e48b7698522bf539ee038476968c27b75cd90277dfeffb21258940fc2a1e24a12403aba24f7ad2ce33dc920d3149c7d3cfb74c5c3e961b1e96639e9de"
 }
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/opam-depext/opam-depext.1.2.1/opam b/packages/opam-depext/opam-depext.1.2.1/opam
index a4c098fdc..906c150f1 100644
--- a/packages/opam-depext/opam-depext.1.2.1/opam
+++ b/packages/opam-depext/opam-depext.1.2.1/opam
@@ -21,7 +21,7 @@ bug-reports: "https://github.com/ocaml/opam-depext/issues"
 depends: [
   "ocaml" {>= "4.00"}
   "base-unix"
-  "cmdliner" {>= "0.9.8" & dev}
+  "cmdliner" {dev & >= "0.9.8" & < "2.0.0"}
   "ocamlfind" {dev}
 ]
 available: opam-version >= "2.0.0~beta5" & os != "win32"
diff --git a/packages/opentelemetry/opentelemetry.0.10/opam b/packages/opentelemetry/opentelemetry.0.10/opam
index e03723918..ce791813c 100644
--- a/packages/opentelemetry/opentelemetry.0.10/opam
+++ b/packages/opentelemetry/opentelemetry.0.10/opam
@@ -26,7 +26,7 @@ depends: [
 ]
 depopts: ["trace"]
 conflicts: [
-  "trace" {< "0.7"}
+  "trace" {< "0.7" | > "0.8"}
 ]
 build: [
   ["dune" "subst"] {dev}
diff --git a/packages/optint/optint.0.3.0/opam b/packages/optint/optint.0.3.0/opam
index 8caa3b534..b40315c16 100644
--- a/packages/optint/optint.0.3.0/opam
+++ b/packages/optint/optint.0.3.0/opam
@@ -33,3 +33,4 @@ url {
   ]
 }
 x-commit-hash: "66d321700e7c8c6cbcd3cd7c391e35d4943eac4b"
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/parsexp/parsexp.v0.17.0/opam b/packages/parsexp/parsexp.v0.17.0/opam
new file mode 100644
index 000000000..886002443
--- /dev/null
+++ b/packages/parsexp/parsexp.v0.17.0/opam
@@ -0,0 +1,45 @@
+opam-version: "2.0"
+name: "parsexp"
+version: "v0.17.0"
+synopsis: "S-expression parsing library"
+description: """\
+This library provides generic parsers for parsing S-expressions from
+strings or other medium.
+
+The library is focused on performances but still provide full generic
+parsers that can be used with strings, bigstrings, lexing buffers,
+character streams or any other sources effortlessly.
+
+It provides three different class of parsers:
+- the normal parsers, producing [Sexp.t] or [Sexp.t list] values
+- the parsers with positions, building compact position sequences so
+  that one can recover original positions in order to report properly
+  located errors at little cost
+- the Concrete Syntax Tree parsers, produce values of type
+  [Parsexp.Cst.t] which record the concrete layout of the s-expression
+  syntax, including comments
+
+This library is portable and doesn't provide IO functions. To read
+s-expressions from files or other external sources, you should use
+parsexp_io."""
+maintainer: "Jane Street developers"
+authors: "Jane Street Group, LLC"
+license: "MIT"
+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" {>= "5.1.0"}
+  "sexplib0" {>= "v0.17" & < "v0.18~"}
+  "dune" {>= "3.11.0"}
+]
+available: arch != "x86_32"
+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.17.0.tar.gz"
+  checksum:
+    "sha256=a3d10edbc4f98d16357b644d550fd1c06f4d9aa4990ab8ee6da01276c24d55b5"
+}
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/ppx_cstruct/ppx_cstruct.6.2.0/opam b/packages/ppx_cstruct/ppx_cstruct.6.2.0/opam
index e9173a209..a1df4e830 100644
--- a/packages/ppx_cstruct/ppx_cstruct.6.2.0/opam
+++ b/packages/ppx_cstruct/ppx_cstruct.6.2.0/opam
@@ -53,3 +53,4 @@ url {
   ]
 }
 x-commit-hash: "8c7c94a038aae72dc89c994551c9d2c690895607"
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/ppx_deriving/ppx_deriving.6.0.3/opam b/packages/ppx_deriving/ppx_deriving.6.0.3/opam
index 2f1ffc759..45ba2e4f4 100644
--- a/packages/ppx_deriving/ppx_deriving.6.0.3/opam
+++ b/packages/ppx_deriving/ppx_deriving.6.0.3/opam
@@ -14,12 +14,12 @@ homepage: "https://github.com/ocaml-ppx/ppx_deriving"
 doc: "https://ocaml-ppx.github.io/ppx_deriving/"
 bug-reports: "https://github.com/ocaml-ppx/ppx_deriving/issues"
 depends: [
-  "ocaml" {>= "4.05.0"}
+  "ocaml" {>= "4.05.0" & < "5.4"}
   "dune" {>= "1.6.3"}
   "cppo" {>= "1.1.0" & build}
   "ocamlfind"
   "ppx_derivers"
-  "ppxlib" {>= "0.32.0"}
+  "ppxlib" {>= "0.32.0" & < "0.36.0"}
   "ounit2" {with-test}
 ]
 build: [
diff --git a/packages/ppx_deriving/ppx_deriving.6.1.1/opam b/packages/ppx_deriving/ppx_deriving.6.1.1/opam
new file mode 100644
index 000000000..83b211a49
--- /dev/null
+++ b/packages/ppx_deriving/ppx_deriving.6.1.1/opam
@@ -0,0 +1,39 @@
+opam-version: "2.0"
+name: "ppx_deriving"
+version: "6.1.1"
+synopsis: "Type-driven code generation for OCaml"
+description: """\
+ppx_deriving provides common infrastructure for generating
+code based on type definitions, and a set of useful plugins
+for common tasks."""
+maintainer: "whitequark <whitequark@whitequark.org>"
+authors: "whitequark <whitequark@whitequark.org>"
+license: "MIT"
+tags: "syntax"
+homepage: "https://github.com/ocaml-ppx/ppx_deriving"
+doc: "https://ocaml-ppx.github.io/ppx_deriving/"
+bug-reports: "https://github.com/ocaml-ppx/ppx_deriving/issues"
+depends: [
+  "ocaml" {>= "4.05.0"}
+  "dune" {>= "1.6.3"}
+  "cppo" {>= "1.1.0" & build}
+  "ocamlfind"
+  "ppx_derivers"
+  "ppxlib" {>= "0.36.0"}
+  "ounit2" {with-test}
+]
+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}
+]
+dev-repo: "git+https://github.com/ocaml-ppx/ppx_deriving.git"
+url {
+  src:
+    "https://github.com/ocaml-ppx/ppx_deriving/releases/download/v6.1.1/ppx_deriving-6.1.1.tar.gz"
+  checksum: [
+    "md5=3208e6028fbb5a417f751d3529eae031"
+    "sha512=9d64fd1a7c908e70ac11164db6732d69e74eac28c29ba6d76d40711554615c0af5a8c491eb6f05181b99294b50fc2c50b454b6d75d022db9d33133188d071102"
+  ]
+}
diff --git a/packages/ppx_deriving_rpc/ppx_deriving_rpc.10.0.0/opam b/packages/ppx_deriving_rpc/ppx_deriving_rpc.10.0.0/opam
new file mode 100644
index 000000000..74e407013
--- /dev/null
+++ b/packages/ppx_deriving_rpc/ppx_deriving_rpc.10.0.0/opam
@@ -0,0 +1,43 @@
+opam-version: "2.0"
+name: "ppx_deriving_rpc"
+version: "10.0.0"
+synopsis: "Ppx deriver for ocaml-rpc, a library to deal with RPCs in OCaml"
+description: """\
+`ocaml-rpc` is a library that provides remote procedure calls (RPC)
+using XML or JSON as transport encodings, and multiple generators
+for documentations, clients, servers, javascript bindings, python
+bindings, ...
+
+The transport mechanism itself is outside the scope of this library
+as all conversions are from and to strings."""
+maintainer: "Marcello Seri"
+authors: ["Thomas Gazagnaire" "Jon Ludlam"]
+license: "ISC"
+tags: ["org:mirage" "org:xapi-project"]
+homepage: "https://github.com/mirage/ocaml-rpc"
+doc: "https://mirage.github.io/ocaml-rpc/ppx_deriving_rpc"
+bug-reports: "https://github.com/mirage/ocaml-rpc/issues"
+depends: [
+  "ocaml" {>= "4.08"}
+  "dune" {>= "2.0.0"}
+  "rpclib" {= version}
+  "rresult" {>= "0.3.0"}
+  "ppxlib" {>= "0.36.0"}
+  "lwt" {with-test & >= "3.0.0"}
+  "alcotest" {with-test}
+]
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+]
+dev-repo: "git+https://github.com/mirage/ocaml-rpc.git"
+url {
+  src:
+    "https://github.com/mirage/ocaml-rpc/releases/download/10.0.0/rpclib-10.0.0.tbz"
+  checksum: [
+    "sha256=1d62cf36ff3f599286ff6c77a3266b04d9e14df73d3fce078d51ab9c4c7bad3a"
+    "sha512=9fe0bc38363c35e5ec185eadc096565f7f76e219bfde62756dee2cbc818e7663e1ce2e730a235f2bf2230a24ff52b29bcc8e1082e0a43d7e6c23f56ad74add43"
+  ]
+}
+x-commit-hash: "060740cf19fca2279921cc4629c51a523823431f"
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/ppx_deriving_yojson/ppx_deriving_yojson.3.10.0/opam b/packages/ppx_deriving_yojson/ppx_deriving_yojson.3.10.0/opam
new file mode 100644
index 000000000..8c1ddca20
--- /dev/null
+++ b/packages/ppx_deriving_yojson/ppx_deriving_yojson.3.10.0/opam
@@ -0,0 +1,37 @@
+opam-version: "2.0"
+name: "ppx_deriving_yojson"
+version: "3.10.0"
+synopsis: "JSON codec generator for OCaml"
+description: """\
+ppx_deriving_yojson is a ppx_deriving plugin that provides
+a JSON codec generator."""
+maintainer: "whitequark <whitequark@whitequark.org>"
+authors: "whitequark <whitequark@whitequark.org>"
+license: "MIT"
+tags: ["syntax" "json"]
+homepage: "https://github.com/ocaml-ppx/ppx_deriving_yojson"
+bug-reports: "https://github.com/ocaml-ppx/ppx_deriving_yojson/issues"
+depends: [
+  "ocaml" {>= "4.05.0"}
+  "dune" {>= "1.0"}
+  "yojson" {>= "1.6.0"}
+  "yojson" {with-test & < "3"}
+  "ppx_deriving" {>= "6.1"}
+  "ppxlib" {>= "0.36.0"}
+  "ounit2" {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/ocaml-ppx/ppx_deriving_yojson.git"
+url {
+  src:
+    "https://github.com/ocaml-ppx/ppx_deriving_yojson/releases/download/v3.10.0/ppx_deriving_yojson-3.10.0.tbz"
+  checksum: [
+    "sha256=ced3d265e4287f1f18b09df6446a24444fad52b2a3054cbcbe0c9494d0e89b3f"
+    "sha512=038752a73690dc1b55031c119f57ee27fbee0d51a4a541d2f31ad1baf8b05637396c0b97a7dbfd77db600b689e90a62bfff7ca3fcf74545bd5b32dc3dabff511"
+  ]
+}
+x-commit-hash: "89f6c1deb9e2daa4370e70bae11ba76b9ca19e98"
diff --git a/packages/ppx_deriving_yojson/ppx_deriving_yojson.3.9.1/opam b/packages/ppx_deriving_yojson/ppx_deriving_yojson.3.9.1/opam
index fddefbed0..dfc8f975e 100644
--- a/packages/ppx_deriving_yojson/ppx_deriving_yojson.3.9.1/opam
+++ b/packages/ppx_deriving_yojson/ppx_deriving_yojson.3.9.1/opam
@@ -15,8 +15,9 @@ depends: [
   "ocaml" {>= "4.05.0"}
   "dune" {>= "1.0"}
   "yojson" {>= "1.6.0"}
+  "yojson" {with-test & < "3"}
   "ppx_deriving" {>= "5.1"}
-  "ppxlib" {>= "0.30.0"}
+  "ppxlib" {>= "0.30.0" & < "0.36.0"}
   "ounit2" {with-test}
 ]
 build: [
diff --git a/packages/ppx_sexp_conv/ppx_sexp_conv.v0.16.0/opam b/packages/ppx_sexp_conv/ppx_sexp_conv.v0.16.0/opam
index a081f7668..e1a6a439c 100644
--- a/packages/ppx_sexp_conv/ppx_sexp_conv.v0.16.0/opam
+++ b/packages/ppx_sexp_conv/ppx_sexp_conv.v0.16.0/opam
@@ -15,7 +15,7 @@ depends: [
   "base" {>= "v0.16" & < "v0.17"}
   "sexplib0" {>= "v0.16" & < "v0.17"}
   "dune" {>= "2.0.0"}
-  "ppxlib" {>= "0.28.0"}
+  "ppxlib" {>= "0.28.0" & < "0.36.0"}
 ]
 build: ["dune" "build" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/janestreet/ppx_sexp_conv.git"
diff --git a/packages/ppx_sexp_conv/ppx_sexp_conv.v0.17.1/opam b/packages/ppx_sexp_conv/ppx_sexp_conv.v0.17.1/opam
new file mode 100644
index 000000000..785955581
--- /dev/null
+++ b/packages/ppx_sexp_conv/ppx_sexp_conv.v0.17.1/opam
@@ -0,0 +1,32 @@
+opam-version: "2.0"
+name: "ppx_sexp_conv"
+version: "v0.17.1"
+synopsis: "[@@deriving] plugin to generate S-expression conversion functions"
+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_sexp_conv"
+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" {>= "5.1.0"}
+  "base" {>= "v0.17" & < "v0.18~"}
+  "ppxlib_jane" {>= "v0.17" & < "v0.18~"}
+  "sexplib0" {>= "v0.17" & < "v0.18~"}
+  "dune" {>= "3.11.0"}
+  "ppxlib" {>= "0.36.0"}
+]
+available: arch != "arm32" & arch != "x86_32"
+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/refs/tags/v0.17.1.tar.gz"
+  checksum: [
+    "md5=acbe8a2727a29c8f2fa8da42046f5861"
+    "sha512=036582cbcd49aad0737bbbdf5f680192e55a9f3051c8dece439a6c6ea989b59077c88130d833b01a38d990e563f7dde9f5be7e1cd0ffaaf59bd913d6fbd63bb3"
+  ]
+}
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/ppxlib/ppxlib.0.37.0/opam b/packages/ppxlib/ppxlib.0.37.0/opam
new file mode 100644
index 000000000..b32181bfd
--- /dev/null
+++ b/packages/ppxlib/ppxlib.0.37.0/opam
@@ -0,0 +1,65 @@
+opam-version: "2.0"
+name: "ppxlib"
+version: "0.37.0"
+synopsis: "Standard infrastructure for ppx rewriters"
+description: """\
+Ppxlib is the standard infrastructure for ppx rewriters
+and other programs that manipulate the in-memory representation of
+OCaml programs, a.k.a the "Parsetree".
+
+It also comes bundled with two ppx rewriters that are commonly used to
+write tools that manipulate and/or generate Parsetree values;
+`ppxlib.metaquot` which allows to construct Parsetree values using the
+OCaml syntax directly and `ppxlib.traverse` which provides various
+ways of automatically traversing values of a given type, in particular
+allowing to inject a complex structured value into generated code."""
+maintainer: "opensource@janestreet.com"
+authors: "Jane Street Group, LLC <opensource@janestreet.com>"
+license: "MIT"
+homepage: "https://github.com/ocaml-ppx/ppxlib"
+doc: "https://ocaml-ppx.github.io/ppxlib/"
+bug-reports: "https://github.com/ocaml-ppx/ppxlib/issues"
+depends: [
+  "dune" {>= "3.8"}
+  "ocaml" {>= "4.08.0" & < "5.5.0"}
+  "ocaml-compiler-libs" {>= "v0.11.0"}
+  "ppx_derivers" {>= "1.0"}
+  "sexplib0" {>= "v0.12"}
+  "sexplib0" {with-test & >= "v0.15"}
+  "stdlib-shims"
+  "ocamlfind" {with-test}
+  "re" {with-test & >= "1.9.0"}
+  "cinaps" {with-test & >= "v0.12.1"}
+  "ocamlformat" {with-dev-setup & = "0.26.2"}
+  "odoc" {with-doc}
+]
+conflicts: [
+  "ocaml-migrate-parsetree" {< "2.0.0"}
+  "ocaml-base-compiler" {= "5.1.0~alpha1"}
+  "ocaml-variants" {= "5.1.0~alpha1+options"}
+]
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+]
+dev-repo: "git+https://github.com/ocaml-ppx/ppxlib.git"
+url {
+  src:
+    "https://github.com/ocaml-ppx/ppxlib/releases/download/0.37.0/ppxlib-0.37.0.tbz"
+  checksum: [
+    "sha256=2e223837e7cecc3bc84a432432c0a72f4e1d5be9165c9c33772f156db85db0b3"
+    "sha512=78c62c6de7a641b950de9b4b744841c8823918c545046693e291077adfcd069a812094c11d8d51f792c0b5f340307d38f452ff0a92520df63ed17a3ca9922e2e"
+  ]
+}
+x-commit-hash: "df39675d8ff0c3490ece8157c681691cfb67fdaf"
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/ppxlib_jane/ppxlib_jane.v0.17.4/opam b/packages/ppxlib_jane/ppxlib_jane.v0.17.4/opam
new file mode 100644
index 000000000..b7adf3186
--- /dev/null
+++ b/packages/ppxlib_jane/ppxlib_jane.v0.17.4/opam
@@ -0,0 +1,29 @@
+opam-version: "2.0"
+name: "ppxlib_jane"
+version: "v0.17.4"
+synopsis: "Utilities for working with Jane Street AST constructs"
+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/ppxlib_jane"
+doc:
+  "https://ocaml.janestreet.com/ocaml-core/latest/doc/ppxlib_jane/index.html"
+bug-reports: "https://github.com/janestreet/ppxlib_jane/issues"
+depends: [
+  "ocaml" {>= "5.3.0"}
+  "dune" {>= "3.11.0"}
+  "ppxlib" {>= "0.36.0"}
+]
+available: arch != "arm32" & arch != "x86_32"
+build: ["dune" "build" "-p" name "-j" jobs]
+dev-repo: "git+https://github.com/janestreet/ppxlib_jane.git"
+url {
+  src:
+    "https://github.com/janestreet/ppxlib_jane/archive/refs/tags/v0.17.4.tar.gz"
+  checksum: [
+    "md5=d572c6d6c3b4da9e480c65ba85d3c50a"
+    "sha512=e2931de633d9dcce2ca121e1cf117e159af4ccc52a7e420c328021da0145b6b90194e4545f97afe9cd032c04c6bc2563faa2d852ad45b041b014c688153799d6"
+  ]
+}
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/prometheus/prometheus.1.2/opam b/packages/prometheus/prometheus.1.2/opam
index 0ca79ebc6..484e7172a 100644
--- a/packages/prometheus/prometheus.1.2/opam
+++ b/packages/prometheus/prometheus.1.2/opam
@@ -1,5 +1,15 @@
 opam-version: "2.0"
+name: "prometheus"
+version: "1.2"
 synopsis: "Client library for Prometheus monitoring"
+description: """\
+To run services reliably, it is useful if they can report various metrics
+(for example, heap size, queue lengths, number of warnings logged, etc).
+
+A monitoring service can be configured to collect this data regularly.
+The data can be graphed to help understand the performance of the service over time,
+or to help debug problems quickly.
+It can also be used to send alerts if a service is down or behaving poorly."""
 maintainer: "talex5@gmail.com"
 authors: ["Thomas Leonard" "David Scott"]
 license: "Apache-2.0"
@@ -19,15 +29,6 @@ build: [
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
 dev-repo: "git+https://github.com/mirage/prometheus.git"
-description: """
-To run services reliably, it is useful if they can report various metrics
-(for example, heap size, queue lengths, number of warnings logged, etc).
-
-A monitoring service can be configured to collect this data regularly.
-The data can be graphed to help understand the performance of the service over time,
-or to help debug problems quickly.
-It can also be used to send alerts if a service is down or behaving poorly.
-"""
 url {
   src:
     "https://github.com/mirage/prometheus/releases/download/v1.2/prometheus-1.2.tbz"
diff --git a/packages/ptime/ptime.1.2.0/opam b/packages/ptime/ptime.1.2.0/opam
index 72c4dc3df..0ca54c42f 100644
--- a/packages/ptime/ptime.1.2.0/opam
+++ b/packages/ptime/ptime.1.2.0/opam
@@ -41,3 +41,4 @@ url {
   checksum:
     "sha512=b0c3240dd9e777a5e60b5269eb2e312fc644d29ef55e257d2f2538c03bf62274173ed36e13858c44d2dbee8fe375c9c483e705706e4aa5b3b5c4609ca6324a5c"
 }
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/qcow-stream/qcow-stream.0.12.2/opam b/packages/qcow-stream/qcow-stream.0.12.2/opam
index b7be48ae8..67a6f92c7 100644
--- a/packages/qcow-stream/qcow-stream.0.12.2/opam
+++ b/packages/qcow-stream/qcow-stream.0.12.2/opam
@@ -1,11 +1,13 @@
 opam-version: "2.0"
+name: "qcow-stream"
+version: "0.12.2"
 synopsis: "Library offering QCOW streaming capabilities"
 maintainer: [
   "Dave Scott <dave@recoil.org>" "Pau Ruiz Safont" "Edwin Török "
 ]
-authors: ["David Scott"]
+authors: "David Scott"
 license: "ISC"
-tags: ["org:mirage"]
+tags: "org:mirage"
 homepage: "https://github.com/mirage/ocaml-qcow"
 bug-reports: "https://github.com/mirage/ocaml-qcow/issues"
 depends: [
@@ -17,20 +19,17 @@ depends: [
   "odoc" {with-doc}
 ]
 build: [
-  [
-    "dune"
-    "build"
-    "-p"
-    name
-    "-j"
-    jobs
-    "@install"
-    "@runtest" {with-test}
-    "@doc" {with-doc}
-  ]
+  "dune"
+  "build"
+  "-p"
+  name
+  "-j"
+  jobs
+  "@install"
+  "@runtest" {with-test}
+  "@doc" {with-doc}
 ]
 dev-repo: "git+https://github.com/mirage/ocaml-qcow.git"
-x-maintenance-intent: ["latest"]
 url {
   src:
     "https://github.com/mirage/ocaml-qcow/releases/download/0.12.2/qcow-0.12.2.tbz"
@@ -40,3 +39,4 @@ url {
   ]
 }
 x-commit-hash: "b7fc9dfd4b071b49eebbfdf7401551eb305bda01"
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/qcow-types/qcow-types.0.12.2/opam b/packages/qcow-types/qcow-types.0.12.2/opam
index 46e18bf47..5eaab3653 100644
--- a/packages/qcow-types/qcow-types.0.12.2/opam
+++ b/packages/qcow-types/qcow-types.0.12.2/opam
@@ -1,11 +1,13 @@
 opam-version: "2.0"
+name: "qcow-types"
+version: "0.12.2"
 synopsis: "Minimal set of dependencies for qcow-stream, shared with qcow"
 maintainer: [
   "Dave Scott <dave@recoil.org>" "Pau Ruiz Safont" "Edwin Török "
 ]
-authors: ["David Scott"]
+authors: "David Scott"
 license: "ISC"
-tags: ["org:mirage"]
+tags: "org:mirage"
 homepage: "https://github.com/mirage/ocaml-qcow"
 bug-reports: "https://github.com/mirage/ocaml-qcow/issues"
 depends: [
@@ -23,20 +25,17 @@ depends: [
   "odoc" {with-doc}
 ]
 build: [
-  [
-    "dune"
-    "build"
-    "-p"
-    name
-    "-j"
-    jobs
-    "@install"
-    "@runtest" {with-test}
-    "@doc" {with-doc}
-  ]
+  "dune"
+  "build"
+  "-p"
+  name
+  "-j"
+  jobs
+  "@install"
+  "@runtest" {with-test}
+  "@doc" {with-doc}
 ]
 dev-repo: "git+https://github.com/mirage/ocaml-qcow.git"
-x-maintenance-intent: ["latest"]
 url {
   src:
     "https://github.com/mirage/ocaml-qcow/releases/download/0.12.2/qcow-0.12.2.tbz"
@@ -46,3 +45,4 @@ url {
   ]
 }
 x-commit-hash: "b7fc9dfd4b071b49eebbfdf7401551eb305bda01"
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/react/react.1.2.2/opam b/packages/react/react.1.2.2/opam
index 219233c40..15b719b07 100644
--- a/packages/react/react.1.2.2/opam
+++ b/packages/react/react.1.2.2/opam
@@ -34,3 +34,4 @@ url {
   checksum:
     "sha512=18cdd544d484222ba02db6bd9351571516532e7a1c107b59bbe39193837298f5c745eab6754f8bc6ff125b387be7018c6d6e6ac99f91925a5e4f53af688522b1"
 }
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/result/result.1.5/opam b/packages/result/result.1.5/opam
index c6b256a40..6bc9b9da3 100644
--- a/packages/result/result.1.5/opam
+++ b/packages/result/result.1.5/opam
@@ -25,3 +25,4 @@ url {
     "md5=1b82dec78849680b49ae9a8a365b831b"
   ]
 }
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/rpclib-lwt/rpclib-lwt.10.0.0/opam b/packages/rpclib-lwt/rpclib-lwt.10.0.0/opam
new file mode 100644
index 000000000..ec3d3bfa5
--- /dev/null
+++ b/packages/rpclib-lwt/rpclib-lwt.10.0.0/opam
@@ -0,0 +1,43 @@
+opam-version: "2.0"
+name: "rpclib-lwt"
+version: "10.0.0"
+synopsis: "A library to deal with RPCs in OCaml - Lwt interface"
+description: """\
+`ocaml-rpc` is a library that provides remote procedure calls (RPC)
+using XML or JSON as transport encodings, and multiple generators
+for documentations, clients, servers, javascript bindings, python
+bindings, ...
+
+The transport mechanism itself is outside the scope of this library
+as all conversions are from and to strings."""
+maintainer: "Marcello Seri"
+authors: ["Thomas Gazagnaire" "Jon Ludlam"]
+license: "ISC"
+tags: ["org:mirage" "org:xapi-project"]
+homepage: "https://github.com/mirage/ocaml-rpc"
+doc: "https://mirage.github.io/ocaml-rpc/rpclib-lwt"
+bug-reports: "https://github.com/mirage/ocaml-rpc/issues"
+depends: [
+  "ocaml"
+  "alcotest" {with-test}
+  "dune" {>= "2.0.0"}
+  "rpclib" {= version}
+  "lwt" {>= "3.0.0"}
+  "alcotest-lwt" {with-test}
+  "ppx_deriving_rpc" {with-test & = version}
+]
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+]
+dev-repo: "git+https://github.com/mirage/ocaml-rpc.git"
+url {
+  src:
+    "https://github.com/mirage/ocaml-rpc/releases/download/10.0.0/rpclib-10.0.0.tbz"
+  checksum: [
+    "sha256=1d62cf36ff3f599286ff6c77a3266b04d9e14df73d3fce078d51ab9c4c7bad3a"
+    "sha512=9fe0bc38363c35e5ec185eadc096565f7f76e219bfde62756dee2cbc818e7663e1ce2e730a235f2bf2230a24ff52b29bcc8e1082e0a43d7e6c23f56ad74add43"
+  ]
+}
+x-commit-hash: "060740cf19fca2279921cc4629c51a523823431f"
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/rpclib/rpclib.10.0.0/opam b/packages/rpclib/rpclib.10.0.0/opam
new file mode 100644
index 000000000..c645d35ed
--- /dev/null
+++ b/packages/rpclib/rpclib.10.0.0/opam
@@ -0,0 +1,48 @@
+opam-version: "2.0"
+name: "rpclib"
+version: "10.0.0"
+synopsis: "A library to deal with RPCs in OCaml"
+description: """\
+`ocaml-rpc` is a library that provides remote procedure calls (RPC)
+using XML or JSON as transport encodings, and multiple generators
+for documentations, clients, servers, javascript bindings, python
+bindings, ...
+
+The transport mechanism itself is outside the scope of this library
+as all conversions are from and to strings."""
+maintainer: "Marcello Seri"
+authors: ["Thomas Gazagnaire" "Jon Ludlam"]
+license: "ISC"
+tags: ["org:mirage" "org:xapi-project"]
+homepage: "https://github.com/mirage/ocaml-rpc"
+doc: "https://mirage.github.io/ocaml-rpc/rpclib"
+bug-reports: "https://github.com/mirage/ocaml-rpc/issues"
+depends: [
+  "ocaml" {>= "4.08.0"}
+  "alcotest" {with-test}
+  "dune" {>= "2.0.0"}
+  "base64" {>= "3.4.0"}
+  "cmdliner" {>= "1.1.0"}
+  "rresult" {>= "0.3.0"}
+  "result" {>= "1.5"}
+  "xmlm"
+  "yojson" {>= "1.7.0"}
+]
+conflicts: [
+  "result" {< "1.5"}
+]
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+]
+dev-repo: "git+https://github.com/mirage/ocaml-rpc.git"
+url {
+  src:
+    "https://github.com/mirage/ocaml-rpc/releases/download/10.0.0/rpclib-10.0.0.tbz"
+  checksum: [
+    "sha256=1d62cf36ff3f599286ff6c77a3266b04d9e14df73d3fce078d51ab9c4c7bad3a"
+    "sha512=9fe0bc38363c35e5ec185eadc096565f7f76e219bfde62756dee2cbc818e7663e1ce2e730a235f2bf2230a24ff52b29bcc8e1082e0a43d7e6c23f56ad74add43"
+  ]
+}
+x-commit-hash: "060740cf19fca2279921cc4629c51a523823431f"
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/rresult/rresult.0.7.0/opam b/packages/rresult/rresult.0.7.0/opam
index 811f884a5..5f31c6164 100644
--- a/packages/rresult/rresult.0.7.0/opam
+++ b/packages/rresult/rresult.0.7.0/opam
@@ -35,3 +35,4 @@ url {
   checksum:
     "sha512=f1bb631c986996388e9686d49d5ae4d8aaf14034f6865c62a88fb58c48ce19ad2eb785327d69ca27c032f835984e0bd2efd969b415438628a31f3e84ec4551d3"
 }
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/sexplib/sexplib.v0.17.0/opam b/packages/sexplib/sexplib.v0.17.0/opam
new file mode 100644
index 000000000..588e705d7
--- /dev/null
+++ b/packages/sexplib/sexplib.v0.17.0/opam
@@ -0,0 +1,31 @@
+opam-version: "2.0"
+name: "sexplib"
+version: "v0.17.0"
+synopsis: "Library for serializing OCaml values to and from S-expressions"
+description: """\
+Part of Jane Street's Core library
+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/sexplib"
+doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/sexplib/index.html"
+bug-reports: "https://github.com/janestreet/sexplib/issues"
+depends: [
+  "ocaml" {>= "5.1.0"}
+  "parsexp" {>= "v0.17" & < "v0.18~"}
+  "sexplib0" {>= "v0.17" & < "v0.18~"}
+  "dune" {>= "3.11.0"}
+  "num"
+]
+available: arch != "x86_32"
+build: ["dune" "build" "-p" name "-j" jobs]
+dev-repo: "git+https://github.com/janestreet/sexplib.git"
+url {
+  src:
+    "https://github.com/janestreet/sexplib/archive/refs/tags/v0.17.0.tar.gz"
+  checksum:
+    "sha256=da863b42b81235fdcf45eb32c04fb8bde22ff446a779cfb6f989730a35103160"
+}
diff --git a/packages/sexplib0/sexplib0.v0.17.0/opam b/packages/sexplib0/sexplib0.v0.17.0/opam
new file mode 100644
index 000000000..ed8d50de0
--- /dev/null
+++ b/packages/sexplib0/sexplib0.v0.17.0/opam
@@ -0,0 +1,32 @@
+opam-version: "2.0"
+name: "sexplib0"
+version: "v0.17.0"
+synopsis:
+  "Library containing the definition of S-expressions and some base converters"
+description: """\
+Part of Jane Street's Core library
+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/sexplib0"
+doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/sexplib0/index.html"
+bug-reports: "https://github.com/janestreet/sexplib0/issues"
+depends: [
+  "ocaml" {>= "4.14.0"}
+  "dune" {>= "3.11.0"}
+]
+available: arch != "x86_32"
+build: ["dune" "build" "-p" name "-j" jobs]
+dev-repo: "git+https://github.com/janestreet/sexplib0.git"
+url {
+  src:
+    "https://github.com/janestreet/sexplib0/archive/refs/tags/v0.17.0.tar.gz"
+  checksum: [
+    "md5=abafe8fd1d6302e55a315f4d78960d2a"
+    "sha512=ad387e40789fe70a11473db7e85fe017b801592624414e9030730b2e92ea08f98095fb6e9236430f33c801605ebee0a2a6284e0f618a26a7da4599d4fd9d395d"
+  ]
+}
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/shared-block-ring/shared-block-ring.3.0.1/opam b/packages/shared-block-ring/shared-block-ring.3.0.1/opam
index 16ff25d37..182e4775f 100644
--- a/packages/shared-block-ring/shared-block-ring.3.0.1/opam
+++ b/packages/shared-block-ring/shared-block-ring.3.0.1/opam
@@ -50,3 +50,4 @@ url {
   ]
 }
 x-commit-hash: "e780fd9ed2186c14dd49f9e8d00211be648aa762"
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/stdio/stdio.v0.17.0/opam b/packages/stdio/stdio.v0.17.0/opam
new file mode 100644
index 000000000..93f5a3c9c
--- /dev/null
+++ b/packages/stdio/stdio.v0.17.0/opam
@@ -0,0 +1,29 @@
+opam-version: "2.0"
+name: "stdio"
+version: "v0.17.0"
+synopsis: "Standard IO library for OCaml"
+description: """\
+Stdio implements simple input/output functionalities for OCaml.
+
+It re-exports the input/output functions of the OCaml standard
+libraries using a more consistent API."""
+maintainer: "Jane Street developers"
+authors: "Jane Street Group, LLC"
+license: "MIT"
+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" {>= "5.1.0"}
+  "base" {>= "v0.17" & < "v0.18~"}
+  "dune" {>= "3.11.0"}
+]
+available: arch != "x86_32"
+build: ["dune" "build" "-p" name "-j" jobs]
+dev-repo: "git+https://github.com/janestreet/stdio.git"
+url {
+  src: "https://github.com/janestreet/stdio/archive/refs/tags/v0.17.0.tar.gz"
+  checksum:
+    "sha256=e7cb473d4bffcf419f307c658cf2599fab03a2b4fe655bfd0be699f8f7af176e"
+}
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/tyxml/tyxml.4.6.0/opam b/packages/tyxml/tyxml.4.6.0/opam
index cdf4ec3cc..3b68dfc0d 100644
--- a/packages/tyxml/tyxml.4.6.0/opam
+++ b/packages/tyxml/tyxml.4.6.0/opam
@@ -43,3 +43,4 @@ url {
   ]
 }
 x-commit-hash: "d2916535536f2134bad7793a598ba5b7327cae41"
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/uucp/uucp.16.0.0/opam b/packages/uucp/uucp.16.0.0/opam
index b5ef07932..fadf1e15d 100644
--- a/packages/uucp/uucp.16.0.0/opam
+++ b/packages/uucp/uucp.16.0.0/opam
@@ -51,3 +51,4 @@ url {
   checksum:
     "sha512=5c06d8cadb2b011b1e4ac52e14732044f6ab8e9c11e1184950ff8629b26bd173f1264247623a635b8aa4033e287bfe42d709994f19a3d79f7cbfd20158aa4992"
 }
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/uuseg/uuseg.16.0.0/opam b/packages/uuseg/uuseg.16.0.0/opam
index 1b13c064d..d66f06fcc 100644
--- a/packages/uuseg/uuseg.16.0.0/opam
+++ b/packages/uuseg/uuseg.16.0.0/opam
@@ -55,3 +55,4 @@ url {
   checksum:
     "sha512=355139aee2a72baddf3d811e522948456147546ee946b6eca20f57711865770d4b8d32ea01a7338b8e6cdedb4423ee65cee387704bb9c0c057bcbd65012679b8"
 }
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/xapi-backtrace/xapi-backtrace.0.7/opam b/packages/xapi-backtrace/xapi-backtrace.0.7/opam
index 625728241..e6101dd27 100644
--- a/packages/xapi-backtrace/xapi-backtrace.0.7/opam
+++ b/packages/xapi-backtrace/xapi-backtrace.0.7/opam
@@ -7,8 +7,8 @@ This allows backtraces from multiple processes to be combined together
 and pretty-printed."""
 maintainer: "xen-api@lists.xen.org"
 authors: "xen-api@lists.xen.org"
-tags: "org:xapi-project"
 license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
+tags: "org:xapi-project"
 homepage: "https://github.com/xapi-project/backtrace"
 bug-reports: "https://github.com/xapi-project/backtrace/issues"
 depends: [
diff --git a/packages/xapi-stdext-unix/xapi-stdext-unix.master/opam b/packages/xapi-stdext-unix/xapi-stdext-unix.master/opam
index f2d52793c..6172b26f8 100644
--- a/packages/xapi-stdext-unix/xapi-stdext-unix.master/opam
+++ b/packages/xapi-stdext-unix/xapi-stdext-unix.master/opam
@@ -12,7 +12,6 @@ depends: [
   "alcotest" {with-test}
   "astring"
   "base-unix"
-  "bisect_ppx" {with-test}
   "clock" {= version & with-test}
   "fd-send-recv" {>= "2.0.0"}
   "fmt"
diff --git a/packages/xenstore/xenstore.2.4.0/opam b/packages/xenstore/xenstore.2.4.0/opam
index f9025a34d..fc17268d9 100644
--- a/packages/xenstore/xenstore.2.4.0/opam
+++ b/packages/xenstore/xenstore.2.4.0/opam
@@ -1,6 +1,8 @@
 opam-version: "2.0"
+name: "xenstore"
+version: "2.4.0"
 synopsis: "Xenstore protocol in pure OCam"
-description: """
+description: """\
 This repo contains:
 
   1. a xenstore client library, a merge of the Mirage and XCP ones
@@ -12,9 +14,8 @@ This repo contains:
   4. a xenstore server instance which runs on mirage.
 
 
-  The client and the server libraries have sets of unit-tests.
-"""
-maintainer: ["Hannes Mehnert <hannes@mehnert.org>"]
+  The client and the server libraries have sets of unit-tests."""
+maintainer: "Hannes Mehnert <hannes@mehnert.org>"
 authors: [
   "Vincent Hanquez"
   "Thomas Gazagnaire"
@@ -46,7 +47,6 @@ build: [
   ]
 ]
 dev-repo: "git+https://github.com/mirage/ocaml-xenstore.git"
-x-maintenance-intent: [ "(latest)" ]
 url {
   src:
     "https://github.com/mirage/ocaml-xenstore/releases/download/2.4.0/xenstore-2.4.0.tbz"
@@ -56,3 +56,4 @@ url {
   ]
 }
 x-commit-hash: "0dc6db269b6176160f945376bb91c342ba39f00d"
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/xmlm/xmlm.1.4.0/opam b/packages/xmlm/xmlm.1.4.0/opam
index 984d2db0a..a3e413561 100644
--- a/packages/xmlm/xmlm.1.4.0/opam
+++ b/packages/xmlm/xmlm.1.4.0/opam
@@ -31,3 +31,4 @@ url {
   checksum:
     "sha512=69f6112e6466952256d670fe1751fe4ae79e20d50f018ece1709eb2240cb1b00968ac7cee110771e0617a38ebc1cdb43e9d146471ce66ac1b176e4a1660531eb"
 }
+x-maintenance-intent: ["(latest)"]
diff --git a/packages/zarith/zarith.1.14/opam b/packages/zarith/zarith.1.14/opam
index a7c7b473e..4e190b321 100644
--- a/packages/zarith/zarith.1.14/opam
+++ b/packages/zarith/zarith.1.14/opam
@@ -32,3 +32,4 @@ url {
     "sha512=8a7f3e82dfa5699c8dda54dd5398c712f3ac4fe04f5208d43d8ba198fb8152de5f91cbb59c15c0a4ba010d4dfcc79f52e405bdd0abbf2798167e9e4216bcb3dd"
   ]
 }
+x-maintenance-intent: ["(latest)"]