diff --git a/packages/abstract_algebra/abstract_algebra.v0.18~preview.130.55+197/opam b/packages/abstract_algebra/abstract_algebra.v0.18~preview.130.74+175/opam
similarity index 91%
rename from packages/abstract_algebra/abstract_algebra.v0.18~preview.130.55+197/opam
rename to packages/abstract_algebra/abstract_algebra.v0.18~preview.130.74+175/opam
index 948a5e7c0c..9b2647b5a8 100644
--- a/packages/abstract_algebra/abstract_algebra.v0.18~preview.130.55+197/opam
+++ b/packages/abstract_algebra/abstract_algebra.v0.18~preview.130.74+175/opam
@@ -12,8 +12,8 @@ build: [
 ]
 depends: [
   "ocaml"    {>= "5.1.0"}
-  "base"     {= "v0.18~preview.130.55+197"}
-  "ppx_jane" {= "v0.18~preview.130.55+197"}
+  "base"     {= "v0.18~preview.130.74+175"}
+  "ppx_jane" {= "v0.18~preview.130.74+175"}
   "dune"     {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/accessor/accessor.v0.18~preview.130.55+197/opam b/packages/accessor/accessor.v0.18~preview.130.74+175/opam
similarity index 76%
rename from packages/accessor/accessor.v0.18~preview.130.55+197/opam
rename to packages/accessor/accessor.v0.18~preview.130.74+175/opam
index 80105e74d7..569a637a4a 100644
--- a/packages/accessor/accessor.v0.18~preview.130.55+197/opam
+++ b/packages/accessor/accessor.v0.18~preview.130.74+175/opam
@@ -11,9 +11,9 @@ build: [
 ]
 depends: [
   "ocaml"         {>= "5.1.0"}
-  "base"          {= "v0.18~preview.130.55+197"}
-  "higher_kinded" {= "v0.18~preview.130.55+197"}
-  "ppx_jane"      {= "v0.18~preview.130.55+197"}
+  "base"          {= "v0.18~preview.130.74+175"}
+  "higher_kinded" {= "v0.18~preview.130.74+175"}
+  "ppx_jane"      {= "v0.18~preview.130.74+175"}
   "dune"          {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -29,7 +29,7 @@ In case you have ever heard of "lenses", this is an OCaml implementation of that
 """
 url {
   src:
-    "https://github.com/janestreet/accessor/archive/19dbd873b28eea69c4644b8e4ab65f837d2ff18a.tar.gz"
+    "https://github.com/janestreet/accessor/archive/8a2b892f5cc339a68fbd0bcd30ab1c18c48ab0d5.tar.gz"
   checksum:
-    "sha256=2fe9eefbcec6225f38ce3d242c994d0e7288700ff49c2228ba7d3856b1a9c9fb"
+    "sha256=51af93651bb6e26ee9fdbb60377c292d1e659c54938184d38fe90fe7b4ec7c98"
 }
diff --git a/packages/accessor_async/accessor_async.v0.18~preview.130.55+197/opam b/packages/accessor_async/accessor_async.v0.18~preview.130.74+175/opam
similarity index 79%
rename from packages/accessor_async/accessor_async.v0.18~preview.130.55+197/opam
rename to packages/accessor_async/accessor_async.v0.18~preview.130.74+175/opam
index 7f07ea3d17..b15c9369ea 100644
--- a/packages/accessor_async/accessor_async.v0.18~preview.130.55+197/opam
+++ b/packages/accessor_async/accessor_async.v0.18~preview.130.74+175/opam
@@ -12,11 +12,11 @@ build: [
 ]
 depends: [
   "ocaml"         {>= "5.1.0"}
-  "accessor_core" {= "v0.18~preview.130.55+197"}
-  "async_kernel"  {= "v0.18~preview.130.55+197"}
-  "core"          {= "v0.18~preview.130.55+197"}
-  "ppx_accessor"  {= "v0.18~preview.130.55+197"}
-  "ppx_jane"      {= "v0.18~preview.130.55+197"}
+  "accessor_core" {= "v0.18~preview.130.74+175"}
+  "async_kernel"  {= "v0.18~preview.130.74+175"}
+  "core"          {= "v0.18~preview.130.74+175"}
+  "ppx_accessor"  {= "v0.18~preview.130.74+175"}
+  "ppx_jane"      {= "v0.18~preview.130.74+175"}
   "dune"          {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/accessor_base/accessor_base.v0.18~preview.130.55+197/opam b/packages/accessor_base/accessor_base.v0.18~preview.130.74+175/opam
similarity index 78%
rename from packages/accessor_base/accessor_base.v0.18~preview.130.55+197/opam
rename to packages/accessor_base/accessor_base.v0.18~preview.130.74+175/opam
index 75f18df451..12a5a65b72 100644
--- a/packages/accessor_base/accessor_base.v0.18~preview.130.55+197/opam
+++ b/packages/accessor_base/accessor_base.v0.18~preview.130.74+175/opam
@@ -12,11 +12,11 @@ build: [
 ]
 depends: [
   "ocaml"         {>= "5.1.0"}
-  "accessor"      {= "v0.18~preview.130.55+197"}
-  "base"          {= "v0.18~preview.130.55+197"}
-  "higher_kinded" {= "v0.18~preview.130.55+197"}
-  "ppx_accessor"  {= "v0.18~preview.130.55+197"}
-  "ppx_jane"      {= "v0.18~preview.130.55+197"}
+  "accessor"      {= "v0.18~preview.130.74+175"}
+  "base"          {= "v0.18~preview.130.74+175"}
+  "higher_kinded" {= "v0.18~preview.130.74+175"}
+  "ppx_accessor"  {= "v0.18~preview.130.74+175"}
+  "ppx_jane"      {= "v0.18~preview.130.74+175"}
   "dune"          {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/accessor_core/accessor_core.v0.18~preview.130.55+197/opam b/packages/accessor_core/accessor_core.v0.18~preview.130.74+175/opam
similarity index 78%
rename from packages/accessor_core/accessor_core.v0.18~preview.130.55+197/opam
rename to packages/accessor_core/accessor_core.v0.18~preview.130.74+175/opam
index 8e642fb773..35d9c4f25c 100644
--- a/packages/accessor_core/accessor_core.v0.18~preview.130.55+197/opam
+++ b/packages/accessor_core/accessor_core.v0.18~preview.130.74+175/opam
@@ -12,11 +12,11 @@ build: [
 ]
 depends: [
   "ocaml"         {>= "5.1.0"}
-  "accessor_base" {= "v0.18~preview.130.55+197"}
-  "core"          {= "v0.18~preview.130.55+197"}
-  "ppx_accessor"  {= "v0.18~preview.130.55+197"}
-  "ppx_jane"      {= "v0.18~preview.130.55+197"}
-  "ppx_optcomp"   {= "v0.18~preview.130.55+197"}
+  "accessor_base" {= "v0.18~preview.130.74+175"}
+  "core"          {= "v0.18~preview.130.74+175"}
+  "ppx_accessor"  {= "v0.18~preview.130.74+175"}
+  "ppx_jane"      {= "v0.18~preview.130.74+175"}
+  "ppx_optcomp"   {= "v0.18~preview.130.74+175"}
   "dune"          {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/am_running_how_js/am_running_how_js.v0.18~preview.130.55+197/opam b/packages/am_running_how_js/am_running_how_js.v0.18~preview.130.74+175/opam
similarity index 91%
rename from packages/am_running_how_js/am_running_how_js.v0.18~preview.130.55+197/opam
rename to packages/am_running_how_js/am_running_how_js.v0.18~preview.130.74+175/opam
index 1418987809..3090fd3a1f 100644
--- a/packages/am_running_how_js/am_running_how_js.v0.18~preview.130.55+197/opam
+++ b/packages/am_running_how_js/am_running_how_js.v0.18~preview.130.74+175/opam
@@ -12,8 +12,8 @@ build: [
 ]
 depends: [
   "ocaml"           {>= "5.1.0"}
-  "core"            {= "v0.18~preview.130.55+197"}
-  "ppx_jane"        {= "v0.18~preview.130.55+197"}
+  "core"            {= "v0.18~preview.130.74+175"}
+  "ppx_jane"        {= "v0.18~preview.130.74+175"}
   "dune"            {>= "3.17.0"}
   "js_of_ocaml"     {= "6.0.1+ox"}
   "js_of_ocaml-ppx" {= "6.0.1+ox"}
diff --git a/packages/async/async.v0.18~preview.130.55+197/opam b/packages/async/async.v0.18~preview.130.74+175/opam
similarity index 53%
rename from packages/async/async.v0.18~preview.130.55+197/opam
rename to packages/async/async.v0.18~preview.130.74+175/opam
index 1261076075..edea9f2999 100644
--- a/packages/async/async.v0.18~preview.130.55+197/opam
+++ b/packages/async/async.v0.18~preview.130.74+175/opam
@@ -11,16 +11,16 @@ build: [
 ]
 depends: [
   "ocaml"            {>= "5.1.0"}
-  "async_kernel"     {= "v0.18~preview.130.55+197"}
-  "async_log"        {= "v0.18~preview.130.55+197"}
-  "async_rpc_kernel" {= "v0.18~preview.130.55+197"}
-  "async_unix"       {= "v0.18~preview.130.55+197"}
-  "core"             {= "v0.18~preview.130.55+197"}
-  "core_kernel"      {= "v0.18~preview.130.55+197"}
-  "core_unix"        {= "v0.18~preview.130.55+197"}
-  "ppx_expect"       {= "v0.18~preview.130.55+197"}
-  "ppx_jane"         {= "v0.18~preview.130.55+197"}
-  "textutils"        {= "v0.18~preview.130.55+197"}
+  "async_kernel"     {= "v0.18~preview.130.74+175"}
+  "async_log"        {= "v0.18~preview.130.74+175"}
+  "async_rpc_kernel" {= "v0.18~preview.130.74+175"}
+  "async_unix"       {= "v0.18~preview.130.74+175"}
+  "core"             {= "v0.18~preview.130.74+175"}
+  "core_kernel"      {= "v0.18~preview.130.74+175"}
+  "core_unix"        {= "v0.18~preview.130.74+175"}
+  "ppx_expect"       {= "v0.18~preview.130.74+175"}
+  "ppx_jane"         {= "v0.18~preview.130.74+175"}
+  "textutils"        {= "v0.18~preview.130.74+175"}
   "dune"             {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -33,7 +33,7 @@ largest industrial user of OCaml.
 """
 url {
   src:
-    "https://github.com/janestreet/async/archive/ce409f0f6f7011b64e672c8b6f9bb8b9b7397667.tar.gz"
+    "https://github.com/janestreet/async/archive/23f9e0aa8848d827741f0e338ccaee4add35520a.tar.gz"
   checksum:
-    "sha256=0e7d59c4cc034bd15df788af8fb7723149e589dda911d15bf4ac2cc76f22eef6"
+    "sha256=a378028a73a1efedb856ee8f9016346d33026817cfc08fa407c7bfc205d53fd9"
 }
diff --git a/packages/async_durable/async_durable.v0.18~preview.130.55+197/opam b/packages/async_durable/async_durable.v0.18~preview.130.74+175/opam
similarity index 78%
rename from packages/async_durable/async_durable.v0.18~preview.130.55+197/opam
rename to packages/async_durable/async_durable.v0.18~preview.130.74+175/opam
index ec387ba36e..3e7813686b 100644
--- a/packages/async_durable/async_durable.v0.18~preview.130.55+197/opam
+++ b/packages/async_durable/async_durable.v0.18~preview.130.74+175/opam
@@ -12,11 +12,11 @@ build: [
 ]
 depends: [
   "ocaml"            {>= "5.1.0"}
-  "async_kernel"     {= "v0.18~preview.130.55+197"}
-  "async_rpc_kernel" {= "v0.18~preview.130.55+197"}
-  "core"             {= "v0.18~preview.130.55+197"}
-  "core_kernel"      {= "v0.18~preview.130.55+197"}
-  "ppx_jane"         {= "v0.18~preview.130.55+197"}
+  "async_kernel"     {= "v0.18~preview.130.74+175"}
+  "async_rpc_kernel" {= "v0.18~preview.130.74+175"}
+  "core"             {= "v0.18~preview.130.74+175"}
+  "core_kernel"      {= "v0.18~preview.130.74+175"}
+  "ppx_jane"         {= "v0.18~preview.130.74+175"}
   "dune"             {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/async_extra/async_extra.v0.18~preview.130.55+197/opam b/packages/async_extra/async_extra.v0.18~preview.130.74+175/opam
similarity index 84%
rename from packages/async_extra/async_extra.v0.18~preview.130.55+197/opam
rename to packages/async_extra/async_extra.v0.18~preview.130.74+175/opam
index 982c819a3b..f551abffe5 100644
--- a/packages/async_extra/async_extra.v0.18~preview.130.55+197/opam
+++ b/packages/async_extra/async_extra.v0.18~preview.130.74+175/opam
@@ -12,10 +12,10 @@ build: [
 ]
 depends: [
   "ocaml"        {>= "5.1.0"}
-  "async_kernel" {= "v0.18~preview.130.55+197"}
-  "core"         {= "v0.18~preview.130.55+197"}
-  "core_kernel"  {= "v0.18~preview.130.55+197"}
-  "ppx_jane"     {= "v0.18~preview.130.55+197"}
+  "async_kernel" {= "v0.18~preview.130.74+175"}
+  "core"         {= "v0.18~preview.130.74+175"}
+  "core_kernel"  {= "v0.18~preview.130.74+175"}
+  "ppx_jane"     {= "v0.18~preview.130.74+175"}
   "dune"         {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/async_find/async_find.v0.18~preview.130.55+197/opam b/packages/async_find/async_find.v0.18~preview.130.74+175/opam
similarity index 85%
rename from packages/async_find/async_find.v0.18~preview.130.55+197/opam
rename to packages/async_find/async_find.v0.18~preview.130.74+175/opam
index 9f53ca4813..3923a4ba2d 100644
--- a/packages/async_find/async_find.v0.18~preview.130.55+197/opam
+++ b/packages/async_find/async_find.v0.18~preview.130.74+175/opam
@@ -12,9 +12,9 @@ build: [
 ]
 depends: [
   "ocaml"    {>= "5.1.0"}
-  "async"    {= "v0.18~preview.130.55+197"}
-  "core"     {= "v0.18~preview.130.55+197"}
-  "ppx_jane" {= "v0.18~preview.130.55+197"}
+  "async"    {= "v0.18~preview.130.74+175"}
+  "core"     {= "v0.18~preview.130.74+175"}
+  "ppx_jane" {= "v0.18~preview.130.74+175"}
   "dune"     {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/async_inotify/async_inotify.v0.18~preview.130.55+197/opam b/packages/async_inotify/async_inotify.v0.18~preview.130.74+175/opam
similarity index 61%
rename from packages/async_inotify/async_inotify.v0.18~preview.130.55+197/opam
rename to packages/async_inotify/async_inotify.v0.18~preview.130.74+175/opam
index 78aace28e6..f72ff03c55 100644
--- a/packages/async_inotify/async_inotify.v0.18~preview.130.55+197/opam
+++ b/packages/async_inotify/async_inotify.v0.18~preview.130.74+175/opam
@@ -12,11 +12,11 @@ build: [
 ]
 depends: [
   "ocaml"      {>= "5.1.0"}
-  "async"      {= "v0.18~preview.130.55+197"}
-  "async_find" {= "v0.18~preview.130.55+197"}
-  "core"       {= "v0.18~preview.130.55+197"}
-  "core_unix"  {= "v0.18~preview.130.55+197"}
-  "ppx_jane"   {= "v0.18~preview.130.55+197"}
+  "async"      {= "v0.18~preview.130.74+175"}
+  "async_find" {= "v0.18~preview.130.74+175"}
+  "core"       {= "v0.18~preview.130.74+175"}
+  "core_unix"  {= "v0.18~preview.130.74+175"}
+  "ppx_jane"   {= "v0.18~preview.130.74+175"}
   "dune"       {>= "3.17.0"}
   "inotify"    {>= "2.4.0"}
 ]
@@ -26,7 +26,7 @@ description: """
 """
 url {
   src:
-    "https://github.com/janestreet/async_inotify/archive/eed277c51f061f17fd4a6a62e241ce9c3b878ec5.tar.gz"
+    "https://github.com/janestreet/async_inotify/archive/eec458186f45333f7ee892051bb6862c66489a0c.tar.gz"
   checksum:
-    "sha256=3f1ff51ea6f346364fbf580b6c56a3729bd571b3c2f6969a9b4d07a48e3f7fb1"
+    "sha256=f3ac2cf05a01d8e0878d67c0f9469be9b4186819bcc428a11f63b8a6dc6fc87f"
 }
diff --git a/packages/async_interactive/async_interactive.v0.18~preview.130.55+197/opam b/packages/async_interactive/async_interactive.v0.18~preview.130.74+175/opam
similarity index 83%
rename from packages/async_interactive/async_interactive.v0.18~preview.130.55+197/opam
rename to packages/async_interactive/async_interactive.v0.18~preview.130.74+175/opam
index 37f4fefd25..6085419277 100644
--- a/packages/async_interactive/async_interactive.v0.18~preview.130.55+197/opam
+++ b/packages/async_interactive/async_interactive.v0.18~preview.130.74+175/opam
@@ -12,10 +12,10 @@ build: [
 ]
 depends: [
   "ocaml"     {>= "5.1.0"}
-  "async"     {= "v0.18~preview.130.55+197"}
-  "core"      {= "v0.18~preview.130.55+197"}
-  "core_unix" {= "v0.18~preview.130.55+197"}
-  "ppx_jane"  {= "v0.18~preview.130.55+197"}
+  "async"     {= "v0.18~preview.130.74+175"}
+  "core"      {= "v0.18~preview.130.74+175"}
+  "core_unix" {= "v0.18~preview.130.74+175"}
+  "ppx_jane"  {= "v0.18~preview.130.74+175"}
   "dune"      {>= "3.17.0"}
   "spawn"     {= "v0.15.1+ox"}
 ]
diff --git a/packages/async_iterator/async_iterator.v0.18~preview.130.55+197/opam b/packages/async_iterator/async_iterator.v0.18~preview.130.74+175/opam
similarity index 64%
rename from packages/async_iterator/async_iterator.v0.18~preview.130.55+197/opam
rename to packages/async_iterator/async_iterator.v0.18~preview.130.74+175/opam
index c6a2846b7d..f38df268f9 100644
--- a/packages/async_iterator/async_iterator.v0.18~preview.130.55+197/opam
+++ b/packages/async_iterator/async_iterator.v0.18~preview.130.74+175/opam
@@ -12,14 +12,13 @@ build: [
 ]
 depends: [
   "ocaml"            {>= "5.1.0"}
-  "async"            {= "v0.18~preview.130.55+197"}
-  "async_rpc_kernel" {= "v0.18~preview.130.55+197"}
-  "base"             {= "v0.18~preview.130.55+197"}
-  "core"             {= "v0.18~preview.130.55+197"}
-  "core_kernel"      {= "v0.18~preview.130.55+197"}
-  "maybe_pushback"   {= "v0.18~preview.130.55+197"}
-  "ppx_jane"         {= "v0.18~preview.130.55+197"}
-  "rpc_parallel"     {= "v0.18~preview.130.55+197"}
+  "async"            {= "v0.18~preview.130.74+175"}
+  "async_rpc_kernel" {= "v0.18~preview.130.74+175"}
+  "base"             {= "v0.18~preview.130.74+175"}
+  "core"             {= "v0.18~preview.130.74+175"}
+  "maybe_pushback"   {= "v0.18~preview.130.74+175"}
+  "ppx_jane"         {= "v0.18~preview.130.74+175"}
+  "rpc_parallel"     {= "v0.18~preview.130.74+175"}
   "dune"             {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -34,7 +33,7 @@ Async_iterator is relied upon by many of the most mission-critical systems at Ja
 """
 url {
   src:
-    "https://github.com/janestreet/async_iterator/archive/57987e3bb0bec07cf594fa7c79c22c10cd9ec682.tar.gz"
+    "https://github.com/janestreet/async_iterator/archive/7ee6a3589b7207ed7024b37c9a6a6830dcb5db68.tar.gz"
   checksum:
-    "sha256=cf5759a8596dfb609c5cbe4e23461ecbe0d063d37dcabf82208f0e96302829d9"
+    "sha256=352dd3aa671aa0cc99dffa17d678950a4f0a52f59927f92056028717818ace42"
 }
diff --git a/packages/async_js/async_js.v0.18~preview.130.55+197/opam b/packages/async_js/async_js.v0.18~preview.130.74+175/opam
similarity index 64%
rename from packages/async_js/async_js.v0.18~preview.130.55+197/opam
rename to packages/async_js/async_js.v0.18~preview.130.74+175/opam
index 89af24b598..f2aa51c4a4 100644
--- a/packages/async_js/async_js.v0.18~preview.130.55+197/opam
+++ b/packages/async_js/async_js.v0.18~preview.130.74+175/opam
@@ -11,11 +11,11 @@ build: [
 ]
 depends: [
   "ocaml"            {>= "5.1.0"}
-  "async_kernel"     {= "v0.18~preview.130.55+197"}
-  "async_rpc_kernel" {= "v0.18~preview.130.55+197"}
-  "core"             {= "v0.18~preview.130.55+197"}
-  "ppx_expect"       {= "v0.18~preview.130.55+197"}
-  "ppx_jane"         {= "v0.18~preview.130.55+197"}
+  "async_kernel"     {= "v0.18~preview.130.74+175"}
+  "async_rpc_kernel" {= "v0.18~preview.130.74+175"}
+  "core"             {= "v0.18~preview.130.74+175"}
+  "ppx_expect"       {= "v0.18~preview.130.74+175"}
+  "ppx_jane"         {= "v0.18~preview.130.74+175"}
   "dune"             {>= "3.17.0"}
   "js_of_ocaml"      {= "6.0.1+ox"}
   "js_of_ocaml-ppx"  {= "6.0.1+ox"}
@@ -29,7 +29,7 @@ description: """
 """
 url {
   src:
-    "https://github.com/janestreet/async_js/archive/bdf861b32fad41614cfe3ad8b70676ccbbffae39.tar.gz"
+    "https://github.com/janestreet/async_js/archive/9bbee8cb74ee2bc0b767c004b261342e4edb731a.tar.gz"
   checksum:
-    "sha256=54b2a8272f45f73c5e529bbeccb1a398d0910c5ff155e324cee81e1545b3602a"
+    "sha256=4f6de9dccbe24320365064c30c16b7c8000e22b8fd27853040f6136f19ed9a2f"
 }
diff --git a/packages/async_kernel/async_kernel.v0.18~preview.130.55+197/opam b/packages/async_kernel/async_kernel.v0.18~preview.130.74+175/opam
similarity index 61%
rename from packages/async_kernel/async_kernel.v0.18~preview.130.55+197/opam
rename to packages/async_kernel/async_kernel.v0.18~preview.130.74+175/opam
index 3754280a75..dca503ca90 100644
--- a/packages/async_kernel/async_kernel.v0.18~preview.130.55+197/opam
+++ b/packages/async_kernel/async_kernel.v0.18~preview.130.74+175/opam
@@ -12,13 +12,13 @@ build: [
 ]
 depends: [
   "ocaml"       {>= "5.1.0"}
-  "core"        {= "v0.18~preview.130.55+197"}
-  "core_kernel" {= "v0.18~preview.130.55+197"}
-  "core_unix"   {= "v0.18~preview.130.55+197"}
-  "parsexp"     {= "v0.18~preview.130.55+197"}
-  "ppx_jane"    {= "v0.18~preview.130.55+197"}
-  "sexplib"     {= "v0.18~preview.130.55+197"}
-  "unique"      {= "v0.18~preview.130.55+197"}
+  "core"        {= "v0.18~preview.130.74+175"}
+  "core_kernel" {= "v0.18~preview.130.74+175"}
+  "core_unix"   {= "v0.18~preview.130.74+175"}
+  "parsexp"     {= "v0.18~preview.130.74+175"}
+  "ppx_jane"    {= "v0.18~preview.130.74+175"}
+  "sexplib"     {= "v0.18~preview.130.74+175"}
+  "unique"      {= "v0.18~preview.130.74+175"}
   "dune"        {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -31,7 +31,7 @@ largest industrial user of OCaml.
 """
 url {
   src:
-    "https://github.com/janestreet/async_kernel/archive/377a8bb3da8c373e8634d59d53069f3f9d243ea3.tar.gz"
+    "https://github.com/janestreet/async_kernel/archive/0e4695cf75a0d33a764bb1c078daecc61d442c19.tar.gz"
   checksum:
-    "sha256=7b0d7eed1229f470bd39070e8ca92ad2e04f464fbd2ebd3b51d11a125025a7e7"
+    "sha256=bcfa30104be0f8015f0d381570aaa4a44ada20fff97f47f8320bbd44048e50ec"
 }
diff --git a/packages/async_log/async_log.v0.18~preview.130.55+197/opam b/packages/async_log/async_log.v0.18~preview.130.74+175/opam
similarity index 64%
rename from packages/async_log/async_log.v0.18~preview.130.55+197/opam
rename to packages/async_log/async_log.v0.18~preview.130.74+175/opam
index 8c149e98e8..359a154a91 100644
--- a/packages/async_log/async_log.v0.18~preview.130.55+197/opam
+++ b/packages/async_log/async_log.v0.18~preview.130.74+175/opam
@@ -12,12 +12,12 @@ build: [
 ]
 depends: [
   "ocaml"        {>= "5.1.0"}
-  "async_kernel" {= "v0.18~preview.130.55+197"}
-  "async_unix"   {= "v0.18~preview.130.55+197"}
-  "core"         {= "v0.18~preview.130.55+197"}
-  "core_kernel"  {= "v0.18~preview.130.55+197"}
-  "core_unix"    {= "v0.18~preview.130.55+197"}
-  "ppx_jane"     {= "v0.18~preview.130.55+197"}
+  "async_kernel" {= "v0.18~preview.130.74+175"}
+  "async_unix"   {= "v0.18~preview.130.74+175"}
+  "core"         {= "v0.18~preview.130.74+175"}
+  "core_kernel"  {= "v0.18~preview.130.74+175"}
+  "core_unix"    {= "v0.18~preview.130.74+175"}
+  "ppx_jane"     {= "v0.18~preview.130.74+175"}
   "dune"         {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -30,7 +30,7 @@ largest industrial user of OCaml.
 """
 url {
   src:
-    "https://github.com/janestreet/async_log/archive/aa73682cf438d2359513811f71057fc291a29a64.tar.gz"
+    "https://github.com/janestreet/async_log/archive/03c35e9f984565503486d6b68a4dbadedd4f2371.tar.gz"
   checksum:
-    "sha256=4657160fbaa70ea4cd671c992c5c4dd5c77a509edf6f484031f0da2bb5b1f527"
+    "sha256=43a5099d11c45beb5249486ba78d153ec6408f68a6bc5e1ff46d5ebc8c5667c3"
 }
diff --git a/packages/async_rpc_kernel/async_rpc_kernel.v0.18~preview.130.55+197/opam b/packages/async_rpc_kernel/async_rpc_kernel.v0.18~preview.130.74+175/opam
similarity index 51%
rename from packages/async_rpc_kernel/async_rpc_kernel.v0.18~preview.130.55+197/opam
rename to packages/async_rpc_kernel/async_rpc_kernel.v0.18~preview.130.74+175/opam
index b0e9b5c318..4343adcde0 100644
--- a/packages/async_rpc_kernel/async_rpc_kernel.v0.18~preview.130.55+197/opam
+++ b/packages/async_rpc_kernel/async_rpc_kernel.v0.18~preview.130.74+175/opam
@@ -12,17 +12,17 @@ build: [
 ]
 depends: [
   "ocaml"                   {>= "5.1.0"}
-  "async_kernel"            {= "v0.18~preview.130.55+197"}
-  "base"                    {= "v0.18~preview.130.55+197"}
-  "bin_prot"                {= "v0.18~preview.130.55+197"}
-  "core"                    {= "v0.18~preview.130.55+197"}
-  "core_extended"           {= "v0.18~preview.130.55+197"}
-  "core_kernel"             {= "v0.18~preview.130.55+197"}
-  "flexible_sexp"           {= "v0.18~preview.130.55+197"}
-  "pipe_with_writer_error"  {= "v0.18~preview.130.55+197"}
-  "ppx_jane"                {= "v0.18~preview.130.55+197"}
-  "protocol_version_header" {= "v0.18~preview.130.55+197"}
-  "sexplib"                 {= "v0.18~preview.130.55+197"}
+  "async_kernel"            {= "v0.18~preview.130.74+175"}
+  "base"                    {= "v0.18~preview.130.74+175"}
+  "bin_prot"                {= "v0.18~preview.130.74+175"}
+  "core"                    {= "v0.18~preview.130.74+175"}
+  "core_extended"           {= "v0.18~preview.130.74+175"}
+  "core_kernel"             {= "v0.18~preview.130.74+175"}
+  "flexible_sexp"           {= "v0.18~preview.130.74+175"}
+  "pipe_with_writer_error"  {= "v0.18~preview.130.74+175"}
+  "ppx_jane"                {= "v0.18~preview.130.74+175"}
+  "protocol_version_header" {= "v0.18~preview.130.74+175"}
+  "sexplib"                 {= "v0.18~preview.130.74+175"}
   "dune"                    {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -35,7 +35,7 @@ largest industrial user of OCaml.
 """
 url {
   src:
-    "https://github.com/janestreet/async_rpc_kernel/archive/1ddee9ecc8f0f11f2abfb65eb19fb3d4486579e2.tar.gz"
+    "https://github.com/janestreet/async_rpc_kernel/archive/d1cb40ad5f8256d1fc7415379cf7478e2ef86b0b.tar.gz"
   checksum:
-    "sha256=e1267e3788c18e634d802f2e0d691453d7db04bbd39cb3cd78f9922284631c16"
+    "sha256=f9a0dec8a2b51a05a2650c39e507a98164baf9b2f58c94385db9840a32d9295a"
 }
diff --git a/packages/async_rpc_websocket/async_rpc_websocket.v0.18~preview.130.55+197/opam b/packages/async_rpc_websocket/async_rpc_websocket.v0.18~preview.130.74+175/opam
similarity index 71%
rename from packages/async_rpc_websocket/async_rpc_websocket.v0.18~preview.130.55+197/opam
rename to packages/async_rpc_websocket/async_rpc_websocket.v0.18~preview.130.74+175/opam
index 7cc6fb4974..9a9eebbd53 100644
--- a/packages/async_rpc_websocket/async_rpc_websocket.v0.18~preview.130.55+197/opam
+++ b/packages/async_rpc_websocket/async_rpc_websocket.v0.18~preview.130.74+175/opam
@@ -12,12 +12,12 @@ build: [
 ]
 depends: [
   "ocaml"                  {>= "5.1.0"}
-  "async"                  {= "v0.18~preview.130.55+197"}
-  "async_rpc_kernel"       {= "v0.18~preview.130.55+197"}
-  "async_websocket"        {= "v0.18~preview.130.55+197"}
-  "cohttp_async_websocket" {= "v0.18~preview.130.55+197"}
-  "core"                   {= "v0.18~preview.130.55+197"}
-  "ppx_jane"               {= "v0.18~preview.130.55+197"}
+  "async"                  {= "v0.18~preview.130.74+175"}
+  "async_rpc_kernel"       {= "v0.18~preview.130.74+175"}
+  "async_websocket"        {= "v0.18~preview.130.74+175"}
+  "cohttp_async_websocket" {= "v0.18~preview.130.74+175"}
+  "core"                   {= "v0.18~preview.130.74+175"}
+  "ppx_jane"               {= "v0.18~preview.130.74+175"}
   "cohttp"                 {>= "2.5.6"}
   "cohttp-async"           {>= "2.5.7" & < "3.0.0" | >= "5.1.1" & < "6.0.0"}
   "conduit-async"
@@ -39,7 +39,7 @@ when non-websocket traffic occurs.
 """
 url {
   src:
-    "https://github.com/janestreet/async_rpc_websocket/archive/21dba9bd4f6dc3a91cfb7fd4fd390616ce112a9e.tar.gz"
+    "https://github.com/janestreet/async_rpc_websocket/archive/7480ad2eff404dcfb68d69981455e8f7edb42b56.tar.gz"
   checksum:
-    "sha256=e48fb4a9fdf0b2c11cbe75ee315f5bcad5f3b28624da1895c6a7a4176790afd9"
+    "sha256=6c7f7253ebf3d3656e641eb0ddfa9c2ef478fb5d02357511e80d881460ddb211"
 }
diff --git a/packages/async_sendfile/async_sendfile.v0.18~preview.130.55+197/opam b/packages/async_sendfile/async_sendfile.v0.18~preview.130.74+175/opam
similarity index 78%
rename from packages/async_sendfile/async_sendfile.v0.18~preview.130.55+197/opam
rename to packages/async_sendfile/async_sendfile.v0.18~preview.130.74+175/opam
index be608910fb..e598b0fdef 100644
--- a/packages/async_sendfile/async_sendfile.v0.18~preview.130.55+197/opam
+++ b/packages/async_sendfile/async_sendfile.v0.18~preview.130.74+175/opam
@@ -12,11 +12,11 @@ build: [
 ]
 depends: [
   "ocaml"        {>= "5.1.0"}
-  "async_kernel" {= "v0.18~preview.130.55+197"}
-  "async_unix"   {= "v0.18~preview.130.55+197"}
-  "core"         {= "v0.18~preview.130.55+197"}
-  "core_unix"    {= "v0.18~preview.130.55+197"}
-  "ppx_jane"     {= "v0.18~preview.130.55+197"}
+  "async_kernel" {= "v0.18~preview.130.74+175"}
+  "async_unix"   {= "v0.18~preview.130.74+175"}
+  "core"         {= "v0.18~preview.130.74+175"}
+  "core_unix"    {= "v0.18~preview.130.74+175"}
+  "ppx_jane"     {= "v0.18~preview.130.74+175"}
   "dune"         {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/async_shell/async_shell.v0.18~preview.130.55+197/opam b/packages/async_shell/async_shell.v0.18~preview.130.74+175/opam
similarity index 63%
rename from packages/async_shell/async_shell.v0.18~preview.130.55+197/opam
rename to packages/async_shell/async_shell.v0.18~preview.130.74+175/opam
index 7e44217d8b..d4cf24ce9e 100644
--- a/packages/async_shell/async_shell.v0.18~preview.130.55+197/opam
+++ b/packages/async_shell/async_shell.v0.18~preview.130.74+175/opam
@@ -12,10 +12,10 @@ build: [
 ]
 depends: [
   "ocaml"    {>= "5.1.0"}
-  "async"    {= "v0.18~preview.130.55+197"}
-  "core"     {= "v0.18~preview.130.55+197"}
-  "ppx_jane" {= "v0.18~preview.130.55+197"}
-  "shell"    {= "v0.18~preview.130.55+197"}
+  "async"    {= "v0.18~preview.130.74+175"}
+  "core"     {= "v0.18~preview.130.74+175"}
+  "ppx_jane" {= "v0.18~preview.130.74+175"}
+  "shell"    {= "v0.18~preview.130.74+175"}
   "dune"     {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -24,7 +24,7 @@ description: """
 """
 url {
   src:
-    "https://github.com/janestreet/async_shell/archive/eade5c7ae0ab6adf9e5e33b3102694d2c357942b.tar.gz"
+    "https://github.com/janestreet/async_shell/archive/64c39f0a4117ebd422317ce38c263dca75eae39d.tar.gz"
   checksum:
-    "sha256=be219947e51c59308e5b33dd9621edc03db452b3c7f1990b8aa758e8662a38b3"
+    "sha256=85a067e7794d93fdc439e74f857c1dd8d4b2996b3d6fa2db600693caef4a80d4"
 }
diff --git a/packages/async_smtp/async_smtp.v0.18~preview.130.55+197/opam b/packages/async_smtp/async_smtp.v0.18~preview.130.55+197/opam
deleted file mode 100644
index 878156f8b1..0000000000
--- a/packages/async_smtp/async_smtp.v0.18~preview.130.55+197/opam
+++ /dev/null
@@ -1,48 +0,0 @@
-opam-version: "2.0"
-maintainer: "Jane Street developers"
-authors: ["Jane Street Group, LLC"]
-homepage: "https://github.com/janestreet/async_smtp"
-bug-reports: "https://github.com/janestreet/async_smtp/issues"
-dev-repo: "git+https://github.com/janestreet/async_smtp.git"
-doc:
-  "https://ocaml.janestreet.com/ocaml-core/latest/doc/async_smtp/index.html"
-license: "MIT"
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-]
-depends: [
-  "ocaml"          {>= "5.1.0"}
-  "async"          {= "v0.18~preview.130.55+197"}
-  "async_extra"    {= "v0.18~preview.130.55+197"}
-  "async_inotify"  {= "v0.18~preview.130.55+197"}
-  "async_log"      {= "v0.18~preview.130.55+197"}
-  "async_sendfile" {= "v0.18~preview.130.55+197"}
-  "async_shell"    {= "v0.18~preview.130.55+197"}
-  "async_ssl"      {= "v0.18~preview.130.55+197"}
-  "babel"          {= "v0.18~preview.130.55+197"}
-  "bin_prot"       {= "v0.18~preview.130.55+197"}
-  "core"           {= "v0.18~preview.130.55+197"}
-  "core_kernel"    {= "v0.18~preview.130.55+197"}
-  "core_unix"      {= "v0.18~preview.130.55+197"}
-  "email_message"  {= "v0.18~preview.130.55+197"}
-  "ppx_jane"       {= "v0.18~preview.130.55+197"}
-  "ppx_stable"     {= "v0.18~preview.130.55+197"}
-  "re2"            {= "v0.18~preview.130.55+197"}
-  "resource_cache" {= "v0.18~preview.130.55+197"}
-  "sexp_macro"     {= "v0.18~preview.130.55+197"}
-  "textutils"      {= "v0.18~preview.130.55+197"}
-  "angstrom"       {>= "0.15.0"}
-  "base64"         {>= "3.4.0"}
-  "cryptokit"      {>= "1.16" & < "1.17"}
-  "dune"           {>= "3.17.0"}
-]
-available: arch != "arm32" & arch != "x86_32"
-synopsis: "SMTP client and server"
-description: """
-"""
-url {
-  src:
-    "https://github.com/janestreet/async_smtp/archive/272001a4254c1712b8fbc78fab169efa9f8ef20c.tar.gz"
-  checksum:
-    "sha256=176c8176c3cb50265e7ae95eedb6ef9ec15d5aa73086cead9a49ee8ab84aea58"
-}
diff --git a/packages/async_smtp/async_smtp.v0.18~preview.130.74+175/opam b/packages/async_smtp/async_smtp.v0.18~preview.130.74+175/opam
new file mode 100644
index 0000000000..411d8a1f93
--- /dev/null
+++ b/packages/async_smtp/async_smtp.v0.18~preview.130.74+175/opam
@@ -0,0 +1,48 @@
+opam-version: "2.0"
+maintainer: "Jane Street developers"
+authors: ["Jane Street Group, LLC"]
+homepage: "https://github.com/janestreet/async_smtp"
+bug-reports: "https://github.com/janestreet/async_smtp/issues"
+dev-repo: "git+https://github.com/janestreet/async_smtp.git"
+doc:
+  "https://ocaml.janestreet.com/ocaml-core/latest/doc/async_smtp/index.html"
+license: "MIT"
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+]
+depends: [
+  "ocaml"          {>= "5.1.0"}
+  "async"          {= "v0.18~preview.130.74+175"}
+  "async_extra"    {= "v0.18~preview.130.74+175"}
+  "async_inotify"  {= "v0.18~preview.130.74+175"}
+  "async_log"      {= "v0.18~preview.130.74+175"}
+  "async_sendfile" {= "v0.18~preview.130.74+175"}
+  "async_shell"    {= "v0.18~preview.130.74+175"}
+  "async_ssl"      {= "v0.18~preview.130.74+175"}
+  "babel"          {= "v0.18~preview.130.74+175"}
+  "bin_prot"       {= "v0.18~preview.130.74+175"}
+  "core"           {= "v0.18~preview.130.74+175"}
+  "core_kernel"    {= "v0.18~preview.130.74+175"}
+  "core_unix"      {= "v0.18~preview.130.74+175"}
+  "email_message"  {= "v0.18~preview.130.74+175"}
+  "ppx_jane"       {= "v0.18~preview.130.74+175"}
+  "ppx_stable"     {= "v0.18~preview.130.74+175"}
+  "re2"            {= "v0.18~preview.130.74+175"}
+  "resource_cache" {= "v0.18~preview.130.74+175"}
+  "sexp_macro"     {= "v0.18~preview.130.74+175"}
+  "textutils"      {= "v0.18~preview.130.74+175"}
+  "angstrom"       {>= "0.15.0"}
+  "base64"         {>= "3.4.0"}
+  "cryptokit"      {>= "1.16" & < "1.17"}
+  "dune"           {>= "3.17.0"}
+]
+available: arch != "arm32" & arch != "x86_32"
+synopsis: "SMTP client and server"
+description: """
+"""
+url {
+  src:
+    "https://github.com/janestreet/async_smtp/archive/272001a4254c1712b8fbc78fab169efa9f8ef20c.tar.gz"
+  checksum:
+    "sha256=176c8176c3cb50265e7ae95eedb6ef9ec15d5aa73086cead9a49ee8ab84aea58"
+}
diff --git a/packages/async_ssl/async_ssl.v0.18~preview.130.55+197/opam b/packages/async_ssl/async_ssl.v0.18~preview.130.74+175/opam
similarity index 60%
rename from packages/async_ssl/async_ssl.v0.18~preview.130.55+197/opam
rename to packages/async_ssl/async_ssl.v0.18~preview.130.74+175/opam
index cc5e10d1b7..3d6a7d6806 100644
--- a/packages/async_ssl/async_ssl.v0.18~preview.130.55+197/opam
+++ b/packages/async_ssl/async_ssl.v0.18~preview.130.74+175/opam
@@ -12,15 +12,15 @@ build: [
 ]
 depends: [
   "ocaml"             {>= "5.1.0"}
-  "async"             {= "v0.18~preview.130.55+197"}
-  "base"              {= "v0.18~preview.130.55+197"}
-  "core"              {= "v0.18~preview.130.55+197"}
-  "ppx_jane"          {= "v0.18~preview.130.55+197"}
-  "ppx_optcomp"       {= "v0.18~preview.130.55+197"}
-  "stdio"             {= "v0.18~preview.130.55+197"}
+  "async"             {= "v0.18~preview.130.74+175"}
+  "base"              {= "v0.18~preview.130.74+175"}
+  "core"              {= "v0.18~preview.130.74+175"}
+  "ppx_jane"          {= "v0.18~preview.130.74+175"}
+  "ppx_optcomp"       {= "v0.18~preview.130.74+175"}
+  "stdio"             {= "v0.18~preview.130.74+175"}
   "conf-libssl"
   "ctypes"            {= "0.23.0+ox"}
-  "ctypes-foreign"
+  "ctypes-foreign"    {= "0.23.0+ox"}
   "dune"              {>= "3.17.0"}
   "dune-configurator"
   "integers"
@@ -33,7 +33,7 @@ encrypted communication between both.
 """
 url {
   src:
-    "https://github.com/janestreet/async_ssl/archive/8e6a16dc6c6c3544fe1216ea778c076609106b2b.tar.gz"
+    "https://github.com/janestreet/async_ssl/archive/3d5c5eea43e829f0a0509aa732bc5c69f93f019a.tar.gz"
   checksum:
-    "sha256=5f91ea08269e4492c5a910fd00b74f17c577658ae7bcfcdfa6714b1824e61196"
+    "sha256=fbc088e2b5b6529dfa0b735165304f30471287717db4d99e8400604d62b51e03"
 }
diff --git a/packages/async_udp/async_udp.v0.18~preview.130.55+197/opam b/packages/async_udp/async_udp.v0.18~preview.130.74+175/opam
similarity index 66%
rename from packages/async_udp/async_udp.v0.18~preview.130.55+197/opam
rename to packages/async_udp/async_udp.v0.18~preview.130.74+175/opam
index 058c685924..a13d050011 100644
--- a/packages/async_udp/async_udp.v0.18~preview.130.55+197/opam
+++ b/packages/async_udp/async_udp.v0.18~preview.130.74+175/opam
@@ -12,11 +12,11 @@ build: [
 ]
 depends: [
   "ocaml"       {>= "5.1.0"}
-  "async"       {= "v0.18~preview.130.55+197"}
-  "core"        {= "v0.18~preview.130.55+197"}
-  "core_kernel" {= "v0.18~preview.130.55+197"}
-  "core_unix"   {= "v0.18~preview.130.55+197"}
-  "ppx_jane"    {= "v0.18~preview.130.55+197"}
+  "async"       {= "v0.18~preview.130.74+175"}
+  "core"        {= "v0.18~preview.130.74+175"}
+  "core_kernel" {= "v0.18~preview.130.74+175"}
+  "core_unix"   {= "v0.18~preview.130.74+175"}
+  "ppx_jane"    {= "v0.18~preview.130.74+175"}
   "dune"        {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -29,7 +29,7 @@ largest industrial user of OCaml.
 """
 url {
   src:
-    "https://github.com/janestreet/async_udp/archive/da3c0ccd18c89dd64f769de22d62e1e5c76d48bb.tar.gz"
+    "https://github.com/janestreet/async_udp/archive/7f7bf99d417ad853a5729077d90316728a8ab96f.tar.gz"
   checksum:
-    "sha256=6a13e71adf68862bf29ed72cff5e4bd9dea7838e3021b5e3da50e49c5c3ea4e5"
+    "sha256=7a04d2fcc8be73617a904c143da1ab4754fdecbad7fea9d1085c3dafd6b8f3e4"
 }
diff --git a/packages/async_unix/async_unix.v0.18~preview.130.55+197/opam b/packages/async_unix/async_unix.v0.18~preview.130.74+175/opam
similarity index 62%
rename from packages/async_unix/async_unix.v0.18~preview.130.55+197/opam
rename to packages/async_unix/async_unix.v0.18~preview.130.74+175/opam
index 7ae55210dc..d8670fd051 100644
--- a/packages/async_unix/async_unix.v0.18~preview.130.55+197/opam
+++ b/packages/async_unix/async_unix.v0.18~preview.130.74+175/opam
@@ -12,13 +12,13 @@ build: [
 ]
 depends: [
   "ocaml"        {>= "5.1.0"}
-  "async_kernel" {= "v0.18~preview.130.55+197"}
-  "core"         {= "v0.18~preview.130.55+197"}
-  "core_kernel"  {= "v0.18~preview.130.55+197"}
-  "core_unix"    {= "v0.18~preview.130.55+197"}
-  "ppx_jane"     {= "v0.18~preview.130.55+197"}
-  "ppx_optcomp"  {= "v0.18~preview.130.55+197"}
-  "sexplib"      {= "v0.18~preview.130.55+197"}
+  "async_kernel" {= "v0.18~preview.130.74+175"}
+  "core"         {= "v0.18~preview.130.74+175"}
+  "core_kernel"  {= "v0.18~preview.130.74+175"}
+  "core_unix"    {= "v0.18~preview.130.74+175"}
+  "ppx_jane"     {= "v0.18~preview.130.74+175"}
+  "ppx_optcomp"  {= "v0.18~preview.130.74+175"}
+  "sexplib"      {= "v0.18~preview.130.74+175"}
   "cstruct"      {>= "6.0.0"}
   "dune"         {>= "3.17.0"}
 ]
@@ -32,7 +32,7 @@ largest industrial user of OCaml.
 """
 url {
   src:
-    "https://github.com/janestreet/async_unix/archive/7d9501ff8738905e1a5b52fcbda7291ada4f5d8b.tar.gz"
+    "https://github.com/janestreet/async_unix/archive/0d6d139b00326487a62e5d518cab3b7dd9974be3.tar.gz"
   checksum:
-    "sha256=157057224c35ebcecb0381ea2b8fe4b197b6579ee31cb4ea9db1a84942cb07fb"
+    "sha256=f3692e050f1c2eb6fe5b902db291ee4d230984a971cf0b7df7e649237e0d1780"
 }
diff --git a/packages/async_websocket/async_websocket.v0.18~preview.130.55+197/opam b/packages/async_websocket/async_websocket.v0.18~preview.130.74+175/opam
similarity index 65%
rename from packages/async_websocket/async_websocket.v0.18~preview.130.55+197/opam
rename to packages/async_websocket/async_websocket.v0.18~preview.130.74+175/opam
index 95e6e2b518..d0ccf087eb 100644
--- a/packages/async_websocket/async_websocket.v0.18~preview.130.55+197/opam
+++ b/packages/async_websocket/async_websocket.v0.18~preview.130.74+175/opam
@@ -12,11 +12,11 @@ build: [
 ]
 depends: [
   "ocaml"            {>= "5.1.0"}
-  "async"            {= "v0.18~preview.130.55+197"}
-  "async_rpc_kernel" {= "v0.18~preview.130.55+197"}
-  "core"             {= "v0.18~preview.130.55+197"}
-  "core_kernel"      {= "v0.18~preview.130.55+197"}
-  "ppx_jane"         {= "v0.18~preview.130.55+197"}
+  "async"            {= "v0.18~preview.130.74+175"}
+  "async_rpc_kernel" {= "v0.18~preview.130.74+175"}
+  "core"             {= "v0.18~preview.130.74+175"}
+  "core_kernel"      {= "v0.18~preview.130.74+175"}
+  "ppx_jane"         {= "v0.18~preview.130.74+175"}
   "cryptokit"        {>= "1.16" & < "1.17"}
   "dune"             {>= "3.17.0"}
 ]
@@ -28,7 +28,7 @@ This library implements both the server and client side of
 """
 url {
   src:
-    "https://github.com/janestreet/async_websocket/archive/3b33c6f5353912b5e7e0b76324a5061ca340d04f.tar.gz"
+    "https://github.com/janestreet/async_websocket/archive/4e7858af7bbe97aa72a837950842ffa1acab5895.tar.gz"
   checksum:
-    "sha256=6d818940b97f634e74da56f584c556aa455f6f1d8a5e7e8c740efc4a578892d8"
+    "sha256=18386b5a445b42ead59ffb450700ecfdf0dec4ef8d1d44e788d739e689e65d87"
 }
diff --git a/packages/await/await.v0.18~preview.130.55+197/opam b/packages/await/await.v0.18~preview.130.55+197/opam
deleted file mode 100644
index 34dd9fc0e6..0000000000
--- a/packages/await/await.v0.18~preview.130.55+197/opam
+++ /dev/null
@@ -1,40 +0,0 @@
-opam-version: "2.0"
-maintainer: "Jane Street developers"
-authors: ["Jane Street Group, LLC"]
-homepage: "https://github.com/janestreet/await"
-bug-reports: "https://github.com/janestreet/await/issues"
-dev-repo: "git+https://github.com/janestreet/await.git"
-doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/await/index.html"
-license: "MIT"
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-]
-depends: [
-  "ocaml"            {>= "5.2.0"}
-  "async"            {= "v0.18~preview.130.55+197"}
-  "base"             {= "v0.18~preview.130.55+197"}
-  "basement"         {= "v0.18~preview.130.55+197"}
-  "core"             {= "v0.18~preview.130.55+197"}
-  "oxcaml_effect"    {= "v0.18~preview.130.55+197"}
-  "portable"         {= "v0.18~preview.130.55+197"}
-  "ppx_debug_assert" {= "v0.18~preview.130.55+197"}
-  "ppx_fuelproof"    {= "v0.18~preview.130.55+197"}
-  "ppx_jane"         {= "v0.18~preview.130.55+197"}
-  "ppx_sexp_conv"    {= "v0.18~preview.130.55+197"}
-  "ppx_sexp_value"   {= "v0.18~preview.130.55+197"}
-  "ppx_shorthand"    {= "v0.18~preview.130.55+197"}
-  "ppx_template"     {= "v0.18~preview.130.55+197"}
-  "dune"             {>= "3.17.0"}
-]
-available: arch != "arm32" & arch != "x86_32"
-synopsis:
-  "Implementations of awaiting and synchronization primitives for OxCaml"
-description: """
-[Await] provides implementations of awaiting and synchronization primitives for OxCaml.
-"""
-url {
-  src:
-    "https://github.com/janestreet/await/archive/f096cb698f882342efd9d4baaa8638dabf8cdf49.tar.gz"
-  checksum:
-    "sha256=29fb955634cad22853964094b480a73561f6f55595f4d36625efec27fb3398c2"
-}
diff --git a/packages/await/await.v0.18~preview.130.74+175/opam b/packages/await/await.v0.18~preview.130.74+175/opam
new file mode 100644
index 0000000000..344a4a32b7
--- /dev/null
+++ b/packages/await/await.v0.18~preview.130.74+175/opam
@@ -0,0 +1,40 @@
+opam-version: "2.0"
+maintainer: "Jane Street developers"
+authors: ["Jane Street Group, LLC"]
+homepage: "https://github.com/janestreet/await"
+bug-reports: "https://github.com/janestreet/await/issues"
+dev-repo: "git+https://github.com/janestreet/await.git"
+doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/await/index.html"
+license: "MIT"
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+]
+depends: [
+  "ocaml"            {>= "5.2.0"}
+  "async"            {= "v0.18~preview.130.74+175"}
+  "base"             {= "v0.18~preview.130.74+175"}
+  "basement"         {= "v0.18~preview.130.74+175"}
+  "core"             {= "v0.18~preview.130.74+175"}
+  "oxcaml_effect"    {= "v0.18~preview.130.74+175"}
+  "portable"         {= "v0.18~preview.130.74+175"}
+  "ppx_debug_assert" {= "v0.18~preview.130.74+175"}
+  "ppx_fuelproof"    {= "v0.18~preview.130.74+175"}
+  "ppx_jane"         {= "v0.18~preview.130.74+175"}
+  "ppx_sexp_conv"    {= "v0.18~preview.130.74+175"}
+  "ppx_sexp_value"   {= "v0.18~preview.130.74+175"}
+  "ppx_shorthand"    {= "v0.18~preview.130.74+175"}
+  "ppx_template"     {= "v0.18~preview.130.74+175"}
+  "dune"             {>= "3.17.0"}
+]
+available: arch != "arm32" & arch != "x86_32"
+synopsis:
+  "Implementations of awaiting and synchronization primitives for OxCaml"
+description: """
+[Await] provides implementations of awaiting and synchronization primitives for OxCaml.
+"""
+url {
+  src:
+    "https://github.com/janestreet/await/archive/e7bd12cfd9ad2543f19c8b4ffe577c9859ab0d36.tar.gz"
+  checksum:
+    "sha256=7d0967bf6e107bd3fe28d5d33c3a563bc7a452121c9c72aa6aa7f65e1c07e267"
+}
diff --git a/packages/babel/babel.v0.18~preview.130.55+197/opam b/packages/babel/babel.v0.18~preview.130.74+175/opam
similarity index 55%
rename from packages/babel/babel.v0.18~preview.130.55+197/opam
rename to packages/babel/babel.v0.18~preview.130.74+175/opam
index 09a1b82d84..d96b5bbefa 100644
--- a/packages/babel/babel.v0.18~preview.130.55+197/opam
+++ b/packages/babel/babel.v0.18~preview.130.74+175/opam
@@ -11,14 +11,13 @@ build: [
 ]
 depends: [
   "ocaml"                  {>= "5.1.0"}
-  "async_kernel"           {= "v0.18~preview.130.55+197"}
-  "async_rpc_kernel"       {= "v0.18~preview.130.55+197"}
-  "core"                   {= "v0.18~preview.130.55+197"}
-  "core_kernel"            {= "v0.18~preview.130.55+197"}
-  "pipe_with_writer_error" {= "v0.18~preview.130.55+197"}
-  "ppx_jane"               {= "v0.18~preview.130.55+197"}
-  "streamable"             {= "v0.18~preview.130.55+197"}
-  "tilde_f"                {= "v0.18~preview.130.55+197"}
+  "async_kernel"           {= "v0.18~preview.130.74+175"}
+  "async_rpc_kernel"       {= "v0.18~preview.130.74+175"}
+  "core"                   {= "v0.18~preview.130.74+175"}
+  "pipe_with_writer_error" {= "v0.18~preview.130.74+175"}
+  "ppx_jane"               {= "v0.18~preview.130.74+175"}
+  "streamable"             {= "v0.18~preview.130.74+175"}
+  "tilde_f"                {= "v0.18~preview.130.74+175"}
   "dune"                   {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -29,7 +28,7 @@ A library for defining Rpcs that can evolve over time without breaking backward
 """
 url {
   src:
-    "https://github.com/janestreet/babel/archive/71b9bbc02c08cf46d0ae9c1471f351b2d87cd874.tar.gz"
+    "https://github.com/janestreet/babel/archive/f73e3846e22b6665192b3552d0186fba3b9a9596.tar.gz"
   checksum:
-    "sha256=1fb6111bad1084d159597edf77f78ed9a0a62db06a6ec9c97033a1e6e908528f"
+    "sha256=7692683c6319fad25e9a484501444d0a0a1f537dbc6c3b271f2be3185581a960"
 }
diff --git a/packages/base/base.v0.18~preview.130.55+197/opam b/packages/base/base.v0.18~preview.130.74+175/opam
similarity index 64%
rename from packages/base/base.v0.18~preview.130.55+197/opam
rename to packages/base/base.v0.18~preview.130.74+175/opam
index 32d13eaf2a..35999ca0ce 100644
--- a/packages/base/base.v0.18~preview.130.55+197/opam
+++ b/packages/base/base.v0.18~preview.130.74+175/opam
@@ -11,14 +11,14 @@ build: [
 ]
 depends: [
   "ocaml"                   {>= "5.1.0"}
-  "basement"                {= "v0.18~preview.130.55+197"}
-  "ocaml_intrinsics_kernel" {= "v0.18~preview.130.55+197"}
-  "ppx_array_base"          {= "v0.18~preview.130.55+197"}
-  "ppx_base"                {= "v0.18~preview.130.55+197"}
-  "ppx_cold"                {= "v0.18~preview.130.55+197"}
-  "ppx_hash"                {= "v0.18~preview.130.55+197"}
-  "ppxlib_jane"             {= "v0.18~preview.130.55+197"}
-  "sexplib0"                {= "v0.18~preview.130.55+197"}
+  "basement"                {= "v0.18~preview.130.74+175"}
+  "ocaml_intrinsics_kernel" {= "v0.18~preview.130.74+175"}
+  "ppx_array_base"          {= "v0.18~preview.130.74+175"}
+  "ppx_base"                {= "v0.18~preview.130.74+175"}
+  "ppx_cold"                {= "v0.18~preview.130.74+175"}
+  "ppx_hash"                {= "v0.18~preview.130.74+175"}
+  "ppxlib_jane"             {= "v0.18~preview.130.74+175"}
+  "sexplib0"                {= "v0.18~preview.130.74+175"}
   "dune"                    {>= "3.17.0"}
   "dune-configurator"
   "ppxlib"                  {= "0.33.0+ox"}
@@ -41,7 +41,7 @@ provided by companion libraries such as stdio:
 """
 url {
   src:
-    "https://github.com/janestreet/base/archive/6f78e19cbe8ad6214e5d52b516b993c2a812371c.tar.gz"
+    "https://github.com/janestreet/base/archive/35f62031ef49fa4618e8b997b6dddcb431665285.tar.gz"
   checksum:
-    "sha256=e42116dcc079ecd03ebd87b2bd0ccfb2a054e0c9972855cab567b379edc346ae"
+    "sha256=97eecf373c5cf33be6e5361e1f73be2e4f81327b1ce00996578efd41053f1747"
 }
diff --git a/packages/base_bigstring/base_bigstring.v0.18~preview.130.55+197/opam b/packages/base_bigstring/base_bigstring.v0.18~preview.130.74+175/opam
similarity index 66%
rename from packages/base_bigstring/base_bigstring.v0.18~preview.130.55+197/opam
rename to packages/base_bigstring/base_bigstring.v0.18~preview.130.74+175/opam
index 948726ca31..6c0833ece1 100644
--- a/packages/base_bigstring/base_bigstring.v0.18~preview.130.55+197/opam
+++ b/packages/base_bigstring/base_bigstring.v0.18~preview.130.74+175/opam
@@ -12,10 +12,10 @@ build: [
 ]
 depends: [
   "ocaml"    {>= "5.1.0"}
-  "base"     {= "v0.18~preview.130.55+197"}
-  "int_repr" {= "v0.18~preview.130.55+197"}
-  "ppx_jane" {= "v0.18~preview.130.55+197"}
-  "sexplib"  {= "v0.18~preview.130.55+197"}
+  "base"     {= "v0.18~preview.130.74+175"}
+  "int_repr" {= "v0.18~preview.130.74+175"}
+  "ppx_jane" {= "v0.18~preview.130.74+175"}
+  "sexplib"  {= "v0.18~preview.130.74+175"}
   "dune"     {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -25,7 +25,7 @@ String type based on [Bigarray], for use in I/O and C-bindings.
 """
 url {
   src:
-    "https://github.com/janestreet/base_bigstring/archive/b24fdb8084392d31652fec457e185251bab6ef28.tar.gz"
+    "https://github.com/janestreet/base_bigstring/archive/06797e9c29f9174fc97704bbbc1d516eb287e1e4.tar.gz"
   checksum:
-    "sha256=c8215a3a8265f5281dcc2c951d59c6983856bb76e362289f3650b3a00ed39309"
+    "sha256=b250dba6b4711b04154a59794379bd627268eb18fe312c185b17c70f641aa0be"
 }
diff --git a/packages/base_quickcheck/base_quickcheck.v0.18~preview.130.55+197/opam b/packages/base_quickcheck/base_quickcheck.v0.18~preview.130.74+175/opam
similarity index 54%
rename from packages/base_quickcheck/base_quickcheck.v0.18~preview.130.55+197/opam
rename to packages/base_quickcheck/base_quickcheck.v0.18~preview.130.74+175/opam
index 18c7ccc6ae..e9444bfdd7 100644
--- a/packages/base_quickcheck/base_quickcheck.v0.18~preview.130.55+197/opam
+++ b/packages/base_quickcheck/base_quickcheck.v0.18~preview.130.74+175/opam
@@ -12,17 +12,17 @@ build: [
 ]
 depends: [
   "ocaml"               {>= "5.1.0"}
-  "base"                {= "v0.18~preview.130.55+197"}
-  "ppx_base"            {= "v0.18~preview.130.55+197"}
-  "ppx_fields_conv"     {= "v0.18~preview.130.55+197"}
-  "ppx_let"             {= "v0.18~preview.130.55+197"}
-  "ppx_portable"        {= "v0.18~preview.130.55+197"}
-  "ppx_sexp_message"    {= "v0.18~preview.130.55+197"}
-  "ppx_sexp_value"      {= "v0.18~preview.130.55+197"}
-  "ppx_shorthand"       {= "v0.18~preview.130.55+197"}
-  "ppx_template"        {= "v0.18~preview.130.55+197"}
-  "ppxlib_jane"         {= "v0.18~preview.130.55+197"}
-  "splittable_random"   {= "v0.18~preview.130.55+197"}
+  "base"                {= "v0.18~preview.130.74+175"}
+  "ppx_base"            {= "v0.18~preview.130.74+175"}
+  "ppx_fields_conv"     {= "v0.18~preview.130.74+175"}
+  "ppx_let"             {= "v0.18~preview.130.74+175"}
+  "ppx_portable"        {= "v0.18~preview.130.74+175"}
+  "ppx_sexp_message"    {= "v0.18~preview.130.74+175"}
+  "ppx_sexp_value"      {= "v0.18~preview.130.74+175"}
+  "ppx_shorthand"       {= "v0.18~preview.130.74+175"}
+  "ppx_template"        {= "v0.18~preview.130.74+175"}
+  "ppxlib_jane"         {= "v0.18~preview.130.74+175"}
+  "splittable_random"   {= "v0.18~preview.130.74+175"}
   "dune"                {>= "3.17.0"}
   "ocaml-compiler-libs" {= "v0.17.0+ox"}
   "ppxlib"              {= "0.33.0+ox"}
@@ -36,7 +36,7 @@ with support for built-in types as well as types provided by Base.
 """
 url {
   src:
-    "https://github.com/janestreet/base_quickcheck/archive/d56d58d7eb4778d5d6205fa2d73654b63358e1b4.tar.gz"
+    "https://github.com/janestreet/base_quickcheck/archive/fd25f5e767b1dbe5107e554a223fb797d8eecd17.tar.gz"
   checksum:
-    "sha256=f547771cbcacd8c267d1b99121f39fd1ff4006007548abdb9d24ffd0b8622ca4"
+    "sha256=29c7c76571aa86e5a6596369c380d5aedf31410399efa33c88d75f431cef4736"
 }
diff --git a/packages/base_trie/base_trie.v0.18~preview.130.55+197/opam b/packages/base_trie/base_trie.v0.18~preview.130.74+175/opam
similarity index 73%
rename from packages/base_trie/base_trie.v0.18~preview.130.55+197/opam
rename to packages/base_trie/base_trie.v0.18~preview.130.74+175/opam
index 70dfcfe8ba..9d7c66d7d8 100644
--- a/packages/base_trie/base_trie.v0.18~preview.130.55+197/opam
+++ b/packages/base_trie/base_trie.v0.18~preview.130.74+175/opam
@@ -12,12 +12,12 @@ build: [
 ]
 depends: [
   "ocaml"                    {>= "5.1.0"}
-  "base"                     {= "v0.18~preview.130.55+197"}
-  "bin_prot"                 {= "v0.18~preview.130.55+197"}
-  "core"                     {= "v0.18~preview.130.55+197"}
-  "expect_test_helpers_core" {= "v0.18~preview.130.55+197"}
-  "ppx_jane"                 {= "v0.18~preview.130.55+197"}
-  "ppx_stable_witness"       {= "v0.18~preview.130.55+197"}
+  "base"                     {= "v0.18~preview.130.74+175"}
+  "bin_prot"                 {= "v0.18~preview.130.74+175"}
+  "core"                     {= "v0.18~preview.130.74+175"}
+  "expect_test_helpers_core" {= "v0.18~preview.130.74+175"}
+  "ppx_jane"                 {= "v0.18~preview.130.74+175"}
+  "ppx_stable_witness"       {= "v0.18~preview.130.74+175"}
   "dune"                     {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/basement/basement.v0.18~preview.130.55+197/opam b/packages/basement/basement.v0.18~preview.130.74+175/opam
similarity index 82%
rename from packages/basement/basement.v0.18~preview.130.55+197/opam
rename to packages/basement/basement.v0.18~preview.130.74+175/opam
index f1a5825e58..dc218c5c31 100644
--- a/packages/basement/basement.v0.18~preview.130.55+197/opam
+++ b/packages/basement/basement.v0.18~preview.130.74+175/opam
@@ -23,7 +23,7 @@ sexplib0
 """
 url {
   src:
-    "https://github.com/janestreet/basement/archive/bfe5c6953f5e69c148431c4027ed41385e68402e.tar.gz"
+    "https://github.com/janestreet/basement/archive/d74517c4e0cb30f1f8846c6bb331efd5e2c1dee9.tar.gz"
   checksum:
-    "sha256=2201829a1d1fe13138d75a7ae856bd742e38fe78ffdbfb06e38ecd624ccbfefd"
+    "sha256=0368b3ae2b62020775328d612f7264827beea6d3c18ae8f55088f5a512ceaf83"
 }
diff --git a/packages/bidirectional_map/bidirectional_map.v0.18~preview.130.55+197/opam b/packages/bidirectional_map/bidirectional_map.v0.18~preview.130.74+175/opam
similarity index 80%
rename from packages/bidirectional_map/bidirectional_map.v0.18~preview.130.55+197/opam
rename to packages/bidirectional_map/bidirectional_map.v0.18~preview.130.74+175/opam
index dbe894c891..be0f6e99ba 100644
--- a/packages/bidirectional_map/bidirectional_map.v0.18~preview.130.55+197/opam
+++ b/packages/bidirectional_map/bidirectional_map.v0.18~preview.130.74+175/opam
@@ -23,7 +23,7 @@ and bidirectional multimaps with many-to-many key relationships.
 """
 url {
   src:
-    "https://github.com/janestreet/bidirectional_map/archive/5d464546c7b81cd285cf34b9eb843bfd2aef3b90.tar.gz"
+    "https://github.com/janestreet/bidirectional_map/archive/b6ead2145b2614869a636d821613f16444a4c0cf.tar.gz"
   checksum:
-    "sha256=04a8000eab6337b5c3e52698750da129ca2fbc837d892e0172ea7a9c1cce2ece"
+    "sha256=9077c7ce06aa8c56584e3ecb4e5025ba6a1725feabbcfb2f66c70f55bd9705b9"
 }
diff --git a/packages/big_percent/big_percent.v0.18~preview.130.55+197/opam b/packages/big_percent/big_percent.v0.18~preview.130.74+175/opam
similarity index 87%
rename from packages/big_percent/big_percent.v0.18~preview.130.55+197/opam
rename to packages/big_percent/big_percent.v0.18~preview.130.74+175/opam
index 79282d6c59..82c531a1c1 100644
--- a/packages/big_percent/big_percent.v0.18~preview.130.55+197/opam
+++ b/packages/big_percent/big_percent.v0.18~preview.130.74+175/opam
@@ -12,9 +12,9 @@ build: [
 ]
 depends: [
   "ocaml"    {>= "5.1.0"}
-  "bignum"   {= "v0.18~preview.130.55+197"}
-  "core"     {= "v0.18~preview.130.55+197"}
-  "ppx_jane" {= "v0.18~preview.130.55+197"}
+  "bignum"   {= "v0.18~preview.130.74+175"}
+  "core"     {= "v0.18~preview.130.74+175"}
+  "ppx_jane" {= "v0.18~preview.130.74+175"}
   "dune"     {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/bigdecimal/bigdecimal.v0.18~preview.130.55+197/opam b/packages/bigdecimal/bigdecimal.v0.18~preview.130.74+175/opam
similarity index 82%
rename from packages/bigdecimal/bigdecimal.v0.18~preview.130.55+197/opam
rename to packages/bigdecimal/bigdecimal.v0.18~preview.130.74+175/opam
index ce8a51993e..396c97a8a9 100644
--- a/packages/bigdecimal/bigdecimal.v0.18~preview.130.55+197/opam
+++ b/packages/bigdecimal/bigdecimal.v0.18~preview.130.74+175/opam
@@ -12,10 +12,10 @@ build: [
 ]
 depends: [
   "ocaml"              {>= "5.1.0"}
-  "bignum"             {= "v0.18~preview.130.55+197"}
-  "core"               {= "v0.18~preview.130.55+197"}
-  "ppx_jane"           {= "v0.18~preview.130.55+197"}
-  "ppx_stable_witness" {= "v0.18~preview.130.55+197"}
+  "bignum"             {= "v0.18~preview.130.74+175"}
+  "core"               {= "v0.18~preview.130.74+175"}
+  "ppx_jane"           {= "v0.18~preview.130.74+175"}
+  "ppx_stable_witness" {= "v0.18~preview.130.74+175"}
   "dune"               {>= "3.17.0"}
   "zarith"             {= "1.12+ox"}
 ]
diff --git a/packages/bignum/bignum.v0.18~preview.130.55+197/opam b/packages/bignum/bignum.v0.18~preview.130.74+175/opam
similarity index 56%
rename from packages/bignum/bignum.v0.18~preview.130.55+197/opam
rename to packages/bignum/bignum.v0.18~preview.130.74+175/opam
index 605168bbd1..656aa07c38 100644
--- a/packages/bignum/bignum.v0.18~preview.130.55+197/opam
+++ b/packages/bignum/bignum.v0.18~preview.130.74+175/opam
@@ -11,13 +11,13 @@ build: [
 ]
 depends: [
   "ocaml"              {>= "5.1.0"}
-  "core"               {= "v0.18~preview.130.55+197"}
-  "ppx_jane"           {= "v0.18~preview.130.55+197"}
-  "ppx_stable_witness" {= "v0.18~preview.130.55+197"}
-  "sexplib"            {= "v0.18~preview.130.55+197"}
-  "splittable_random"  {= "v0.18~preview.130.55+197"}
-  "typerep"            {= "v0.18~preview.130.55+197"}
-  "zarith_stubs_js"    {= "v0.18~preview.130.55+197"}
+  "core"               {= "v0.18~preview.130.74+175"}
+  "ppx_jane"           {= "v0.18~preview.130.74+175"}
+  "ppx_stable_witness" {= "v0.18~preview.130.74+175"}
+  "sexplib"            {= "v0.18~preview.130.74+175"}
+  "splittable_random"  {= "v0.18~preview.130.74+175"}
+  "typerep"            {= "v0.18~preview.130.74+175"}
+  "zarith_stubs_js"    {= "v0.18~preview.130.74+175"}
   "dune"               {>= "3.17.0"}
   "num"
   "zarith"             {= "1.12+ox"}
@@ -29,7 +29,7 @@ description: """
 """
 url {
   src:
-    "https://github.com/janestreet/bignum/archive/28a5b007e1ea12e8059e11759a429fb68610fb28.tar.gz"
+    "https://github.com/janestreet/bignum/archive/16c3b09fecccdb9b4ecbb552032790a90c0c4f95.tar.gz"
   checksum:
-    "sha256=fe85affbc9b2bbac9158276b37d2b0d45cc8c711406f11cc5f1c79ce78ff8189"
+    "sha256=0c34b1a61dd7454bd0eb5df10b3fd27d30fb88fad0a901e985567121cc0e0d88"
 }
diff --git a/packages/bin_prot/bin_prot.v0.18~preview.130.55+197/opam b/packages/bin_prot/bin_prot.v0.18~preview.130.74+175/opam
similarity index 53%
rename from packages/bin_prot/bin_prot.v0.18~preview.130.55+197/opam
rename to packages/bin_prot/bin_prot.v0.18~preview.130.74+175/opam
index 4d1c8580a3..66f526de98 100644
--- a/packages/bin_prot/bin_prot.v0.18~preview.130.55+197/opam
+++ b/packages/bin_prot/bin_prot.v0.18~preview.130.74+175/opam
@@ -11,16 +11,16 @@ build: [
 ]
 depends: [
   "ocaml"              {>= "5.1.0"}
-  "base"               {= "v0.18~preview.130.55+197"}
-  "ppx_compare"        {= "v0.18~preview.130.55+197"}
-  "ppx_custom_printf"  {= "v0.18~preview.130.55+197"}
-  "ppx_fields_conv"    {= "v0.18~preview.130.55+197"}
-  "ppx_globalize"      {= "v0.18~preview.130.55+197"}
-  "ppx_optcomp"        {= "v0.18~preview.130.55+197"}
-  "ppx_sexp_conv"      {= "v0.18~preview.130.55+197"}
-  "ppx_stable_witness" {= "v0.18~preview.130.55+197"}
-  "ppx_template"       {= "v0.18~preview.130.55+197"}
-  "ppx_variants_conv"  {= "v0.18~preview.130.55+197"}
+  "base"               {= "v0.18~preview.130.74+175"}
+  "ppx_compare"        {= "v0.18~preview.130.74+175"}
+  "ppx_custom_printf"  {= "v0.18~preview.130.74+175"}
+  "ppx_fields_conv"    {= "v0.18~preview.130.74+175"}
+  "ppx_globalize"      {= "v0.18~preview.130.74+175"}
+  "ppx_optcomp"        {= "v0.18~preview.130.74+175"}
+  "ppx_sexp_conv"      {= "v0.18~preview.130.74+175"}
+  "ppx_stable_witness" {= "v0.18~preview.130.74+175"}
+  "ppx_template"       {= "v0.18~preview.130.74+175"}
+  "ppx_variants_conv"  {= "v0.18~preview.130.74+175"}
   "dune"               {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -33,7 +33,7 @@ largest industrial user of OCaml.
 """
 url {
   src:
-    "https://github.com/janestreet/bin_prot/archive/b509f4439e1a5ac98389d20a795bf583547c758d.tar.gz"
+    "https://github.com/janestreet/bin_prot/archive/cdceb7fad5ae20a1ab9fcd67842a2cdba2a8f1f2.tar.gz"
   checksum:
-    "sha256=5b320ce8cd28e223ea4b9a24e36b5d175578f764bfe3f1fde2b48d841bf4bebb"
+    "sha256=8e8493b30e302ff3131e073c8d1e15feb18865157807adfd4aa5b670fcee58db"
 }
diff --git a/packages/bitset/bitset.v0.18~preview.130.55+197/opam b/packages/bitset/bitset.v0.18~preview.130.74+175/opam
similarity index 61%
rename from packages/bitset/bitset.v0.18~preview.130.55+197/opam
rename to packages/bitset/bitset.v0.18~preview.130.74+175/opam
index 4d87fc96c6..8581825786 100644
--- a/packages/bitset/bitset.v0.18~preview.130.55+197/opam
+++ b/packages/bitset/bitset.v0.18~preview.130.74+175/opam
@@ -11,10 +11,10 @@ build: [
 ]
 depends: [
   "ocaml"                   {>= "5.1.0"}
-  "core"                    {= "v0.18~preview.130.55+197"}
-  "ocaml_intrinsics_kernel" {= "v0.18~preview.130.55+197"}
-  "ppx_jane"                {= "v0.18~preview.130.55+197"}
-  "unboxed"                 {= "v0.18~preview.130.55+197"}
+  "core"                    {= "v0.18~preview.130.74+175"}
+  "ocaml_intrinsics_kernel" {= "v0.18~preview.130.74+175"}
+  "ppx_jane"                {= "v0.18~preview.130.74+175"}
+  "unboxed"                 {= "v0.18~preview.130.74+175"}
   "dune"                    {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -24,7 +24,7 @@ description: """
 """
 url {
   src:
-    "https://github.com/janestreet/bitset/archive/b2fc30418f4fd65bbb8a12515c0ae62b09e08c6a.tar.gz"
+    "https://github.com/janestreet/bitset/archive/a71a0286a241efe96adf3d8fcf40853bb1c92831.tar.gz"
   checksum:
-    "sha256=314ee908e43b67d7ca2b7be470c7eea23b7ec757f5d0c627ad91d976c5499924"
+    "sha256=44afa90cf3ea89b60b803915608ab162d0cda627a0aae5446786390f53b2163f"
 }
diff --git a/packages/bonsai/bonsai.v0.18~preview.130.55+197/opam b/packages/bonsai/bonsai.v0.18~preview.130.55+197/opam
deleted file mode 100644
index fe926d7e1f..0000000000
--- a/packages/bonsai/bonsai.v0.18~preview.130.55+197/opam
+++ /dev/null
@@ -1,44 +0,0 @@
-opam-version: "2.0"
-maintainer: "Jane Street developers"
-authors: ["Jane Street Group, LLC"]
-homepage: "https://github.com/janestreet/bonsai"
-bug-reports: "https://github.com/janestreet/bonsai/issues"
-dev-repo: "git+https://github.com/janestreet/bonsai.git"
-doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/bonsai/index.html"
-license: "MIT"
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-]
-depends: [
-  "ocaml"            {>= "5.1.0"}
-  "abstract_algebra" {= "v0.18~preview.130.55+197"}
-  "async_rpc_kernel" {= "v0.18~preview.130.55+197"}
-  "bonsai_concrete"  {= "v0.18~preview.130.55+197"}
-  "core"             {= "v0.18~preview.130.55+197"}
-  "core_kernel"      {= "v0.18~preview.130.55+197"}
-  "incr_map"         {= "v0.18~preview.130.55+197"}
-  "incremental"      {= "v0.18~preview.130.55+197"}
-  "ocaml-embed-file" {= "v0.18~preview.130.55+197"}
-  "ppx_here"         {= "v0.18~preview.130.55+197"}
-  "ppx_jane"         {= "v0.18~preview.130.55+197"}
-  "ppx_let"          {= "v0.18~preview.130.55+197"}
-  "ppx_pattern_bind" {= "v0.18~preview.130.55+197"}
-  "ppxlib_jane"      {= "v0.18~preview.130.55+197"}
-  "uopt"             {= "v0.18~preview.130.55+197"}
-  "virtual_dom"      {= "v0.18~preview.130.55+197"}
-  "dune"             {>= "3.17.0"}
-  "js_of_ocaml-ppx"  {= "6.0.1+ox"}
-  "ppxlib"           {= "0.33.0+ox"}
-]
-available: arch != "arm32" & arch != "x86_32"
-synopsis: "A library for building dynamic webapps, using Js_of_ocaml"
-description: """
-Bonsai is a library for building reusable UI components inside an
-     Incremental-style UI framework such as Incr_dom or React.
-"""
-url {
-  src:
-    "https://github.com/janestreet/bonsai/archive/62e97a91d9af876b4c1e53e109a50042e7dc9ebb.tar.gz"
-  checksum:
-    "sha256=371e12953188b72bb3b1964736f45e085851c65d999f5081cb1372a7fd501ad1"
-}
diff --git a/packages/bonsai/bonsai.v0.18~preview.130.74+175/opam b/packages/bonsai/bonsai.v0.18~preview.130.74+175/opam
new file mode 100644
index 0000000000..a3fff4d0ab
--- /dev/null
+++ b/packages/bonsai/bonsai.v0.18~preview.130.74+175/opam
@@ -0,0 +1,44 @@
+opam-version: "2.0"
+maintainer: "Jane Street developers"
+authors: ["Jane Street Group, LLC"]
+homepage: "https://github.com/janestreet/bonsai"
+bug-reports: "https://github.com/janestreet/bonsai/issues"
+dev-repo: "git+https://github.com/janestreet/bonsai.git"
+doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/bonsai/index.html"
+license: "MIT"
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+]
+depends: [
+  "ocaml"            {>= "5.1.0"}
+  "abstract_algebra" {= "v0.18~preview.130.74+175"}
+  "async_rpc_kernel" {= "v0.18~preview.130.74+175"}
+  "bonsai_concrete"  {= "v0.18~preview.130.74+175"}
+  "core"             {= "v0.18~preview.130.74+175"}
+  "core_kernel"      {= "v0.18~preview.130.74+175"}
+  "incr_map"         {= "v0.18~preview.130.74+175"}
+  "incremental"      {= "v0.18~preview.130.74+175"}
+  "ocaml-embed-file" {= "v0.18~preview.130.74+175"}
+  "ppx_here"         {= "v0.18~preview.130.74+175"}
+  "ppx_jane"         {= "v0.18~preview.130.74+175"}
+  "ppx_let"          {= "v0.18~preview.130.74+175"}
+  "ppx_pattern_bind" {= "v0.18~preview.130.74+175"}
+  "ppxlib_jane"      {= "v0.18~preview.130.74+175"}
+  "uopt"             {= "v0.18~preview.130.74+175"}
+  "virtual_dom"      {= "v0.18~preview.130.74+175"}
+  "dune"             {>= "3.17.0"}
+  "js_of_ocaml-ppx"  {= "6.0.1+ox"}
+  "ppxlib"           {= "0.33.0+ox"}
+]
+available: arch != "arm32" & arch != "x86_32"
+synopsis: "A library for building dynamic webapps, using Js_of_ocaml"
+description: """
+Bonsai is a library for building reusable UI components inside an
+     Incremental-style UI framework such as Incr_dom or React.
+"""
+url {
+  src:
+    "https://github.com/janestreet/bonsai/archive/fb965ee25aab1606a3d212c882ac94c220e41ef3.tar.gz"
+  checksum:
+    "sha256=741ef26f6322b7583370b37509b19e79cd3ebec81116ca972e20204ff024f6b7"
+}
diff --git a/packages/bonsai_bench/bonsai_bench.v0.18~preview.130.55+197/opam b/packages/bonsai_bench/bonsai_bench.v0.18~preview.130.74+175/opam
similarity index 65%
rename from packages/bonsai_bench/bonsai_bench.v0.18~preview.130.55+197/opam
rename to packages/bonsai_bench/bonsai_bench.v0.18~preview.130.74+175/opam
index 88c720e542..ac2a02affc 100644
--- a/packages/bonsai_bench/bonsai_bench.v0.18~preview.130.55+197/opam
+++ b/packages/bonsai_bench/bonsai_bench.v0.18~preview.130.74+175/opam
@@ -12,17 +12,17 @@ build: [
 ]
 depends: [
   "ocaml"            {>= "5.1.0"}
-  "bonsai"           {= "v0.18~preview.130.55+197"}
-  "bonsai_concrete"  {= "v0.18~preview.130.55+197"}
-  "command_nodejs"   {= "v0.18~preview.130.55+197"}
-  "core"             {= "v0.18~preview.130.55+197"}
-  "core_bench"       {= "v0.18~preview.130.55+197"}
-  "expectable"       {= "v0.18~preview.130.55+197"}
-  "incr_dom"         {= "v0.18~preview.130.55+197"}
-  "ocaml-embed-file" {= "v0.18~preview.130.55+197"}
-  "ppx_jane"         {= "v0.18~preview.130.55+197"}
-  "ppx_pattern_bind" {= "v0.18~preview.130.55+197"}
-  "textutils"        {= "v0.18~preview.130.55+197"}
+  "bonsai"           {= "v0.18~preview.130.74+175"}
+  "bonsai_concrete"  {= "v0.18~preview.130.74+175"}
+  "command_nodejs"   {= "v0.18~preview.130.74+175"}
+  "core"             {= "v0.18~preview.130.74+175"}
+  "core_bench"       {= "v0.18~preview.130.74+175"}
+  "expectable"       {= "v0.18~preview.130.74+175"}
+  "incr_dom"         {= "v0.18~preview.130.74+175"}
+  "ocaml-embed-file" {= "v0.18~preview.130.74+175"}
+  "ppx_jane"         {= "v0.18~preview.130.74+175"}
+  "ppx_pattern_bind" {= "v0.18~preview.130.74+175"}
+  "textutils"        {= "v0.18~preview.130.74+175"}
   "dune"             {>= "3.17.0"}
   "js_of_ocaml-ppx"  {= "6.0.1+ox"}
   "uri"              {>= "3.0.0"}
diff --git a/packages/bonsai_concrete/bonsai_concrete.v0.18~preview.130.55+197/opam b/packages/bonsai_concrete/bonsai_concrete.v0.18~preview.130.74+175/opam
similarity index 67%
rename from packages/bonsai_concrete/bonsai_concrete.v0.18~preview.130.55+197/opam
rename to packages/bonsai_concrete/bonsai_concrete.v0.18~preview.130.74+175/opam
index ddc38c433f..877d08e391 100644
--- a/packages/bonsai_concrete/bonsai_concrete.v0.18~preview.130.55+197/opam
+++ b/packages/bonsai_concrete/bonsai_concrete.v0.18~preview.130.74+175/opam
@@ -12,14 +12,14 @@ build: [
 ]
 depends: [
   "ocaml"       {>= "5.1.0"}
-  "core"        {= "v0.18~preview.130.55+197"}
-  "core_kernel" {= "v0.18~preview.130.55+197"}
-  "incr_map"    {= "v0.18~preview.130.55+197"}
-  "incr_select" {= "v0.18~preview.130.55+197"}
-  "incremental" {= "v0.18~preview.130.55+197"}
-  "ppx_jane"    {= "v0.18~preview.130.55+197"}
-  "time_now"    {= "v0.18~preview.130.55+197"}
-  "virtual_dom" {= "v0.18~preview.130.55+197"}
+  "core"        {= "v0.18~preview.130.74+175"}
+  "core_kernel" {= "v0.18~preview.130.74+175"}
+  "incr_map"    {= "v0.18~preview.130.74+175"}
+  "incr_select" {= "v0.18~preview.130.74+175"}
+  "incremental" {= "v0.18~preview.130.74+175"}
+  "ppx_jane"    {= "v0.18~preview.130.74+175"}
+  "time_now"    {= "v0.18~preview.130.74+175"}
+  "virtual_dom" {= "v0.18~preview.130.74+175"}
   "dune"        {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -36,7 +36,7 @@ This repo contains shared dependencies between incr_dom and bonsai: ui_incr
 """
 url {
   src:
-    "https://github.com/janestreet/bonsai_concrete/archive/4dff7e589088e0e1ec640d002f6d9cdd9b8c88be.tar.gz"
+    "https://github.com/janestreet/bonsai_concrete/archive/ace920d6512a3383a2c06f6eeb717c0176972c87.tar.gz"
   checksum:
-    "sha256=caa893dd4ce6bdc707b2f8826191925077783cf7c779718797196c22994ef146"
+    "sha256=4a0333d3d9552f4244eb81d4526746a28b6318797aaeb673a424231693f21746"
 }
diff --git a/packages/bonsai_examples/bonsai_examples.v0.18~preview.130.55+197/opam b/packages/bonsai_examples/bonsai_examples.v0.18~preview.130.74+175/opam
similarity index 54%
rename from packages/bonsai_examples/bonsai_examples.v0.18~preview.130.55+197/opam
rename to packages/bonsai_examples/bonsai_examples.v0.18~preview.130.74+175/opam
index b6fda51d94..39e30eae42 100644
--- a/packages/bonsai_examples/bonsai_examples.v0.18~preview.130.55+197/opam
+++ b/packages/bonsai_examples/bonsai_examples.v0.18~preview.130.74+175/opam
@@ -12,20 +12,20 @@ build: [
 ]
 depends: [
   "ocaml"               {>= "5.1.0"}
-  "async"               {= "v0.18~preview.130.55+197"}
-  "async_extra"         {= "v0.18~preview.130.55+197"}
-  "async_js"            {= "v0.18~preview.130.55+197"}
-  "async_kernel"        {= "v0.18~preview.130.55+197"}
-  "async_rpc_kernel"    {= "v0.18~preview.130.55+197"}
-  "async_rpc_websocket" {= "v0.18~preview.130.55+197"}
-  "base"                {= "v0.18~preview.130.55+197"}
-  "bonsai"              {= "v0.18~preview.130.55+197"}
-  "bonsai_web"          {= "v0.18~preview.130.55+197"}
-  "core"                {= "v0.18~preview.130.55+197"}
-  "core_kernel"         {= "v0.18~preview.130.55+197"}
-  "ocaml-embed-file"    {= "v0.18~preview.130.55+197"}
-  "ppx_jane"            {= "v0.18~preview.130.55+197"}
-  "virtual_dom"         {= "v0.18~preview.130.55+197"}
+  "async"               {= "v0.18~preview.130.74+175"}
+  "async_extra"         {= "v0.18~preview.130.74+175"}
+  "async_js"            {= "v0.18~preview.130.74+175"}
+  "async_kernel"        {= "v0.18~preview.130.74+175"}
+  "async_rpc_kernel"    {= "v0.18~preview.130.74+175"}
+  "async_rpc_websocket" {= "v0.18~preview.130.74+175"}
+  "base"                {= "v0.18~preview.130.74+175"}
+  "bonsai"              {= "v0.18~preview.130.74+175"}
+  "bonsai_web"          {= "v0.18~preview.130.74+175"}
+  "core"                {= "v0.18~preview.130.74+175"}
+  "core_kernel"         {= "v0.18~preview.130.74+175"}
+  "ocaml-embed-file"    {= "v0.18~preview.130.74+175"}
+  "ppx_jane"            {= "v0.18~preview.130.74+175"}
+  "virtual_dom"         {= "v0.18~preview.130.74+175"}
   "cohttp"              {>= "2.5.6"}
   "cohttp-async"        {>= "2.5.7" & < "3.0.0" | >= "5.1.1" & < "6.0.0"}
   "dune"                {>= "3.17.0"}
@@ -43,7 +43,7 @@ A collection of bonsai_web examples. Bonsai is a library for building
 """
 url {
   src:
-    "https://github.com/janestreet/bonsai_examples/archive/0b055ea075f3e95e8330f40dbbdf1118894a43a3.tar.gz"
+    "https://github.com/janestreet/bonsai_examples/archive/ec5db0b6fd0584fc04b44cfa508b78ec8c1f193e.tar.gz"
   checksum:
-    "sha256=04184fc4aec3cdeefc1f665fdc4baeeae3866c9f83c5f6f1bd5795d421d1d283"
+    "sha256=fd45f8f0fb3d5f7d92c493946b7a3f72d5acaac56c58090e0d94d2ef22c6cd25"
 }
diff --git a/packages/portable_async/.generated b/packages/bonsai_term/.generated
similarity index 100%
rename from packages/portable_async/.generated
rename to packages/bonsai_term/.generated
diff --git a/packages/bonsai_term/bonsai_term.v0.18~preview.130.74+175/opam b/packages/bonsai_term/bonsai_term.v0.18~preview.130.74+175/opam
new file mode 100644
index 0000000000..13ffc9e5d8
--- /dev/null
+++ b/packages/bonsai_term/bonsai_term.v0.18~preview.130.74+175/opam
@@ -0,0 +1,38 @@
+opam-version: "2.0"
+maintainer: "Jane Street developers"
+authors: ["Jane Street Group, LLC"]
+homepage: "https://github.com/janestreet/bonsai_term"
+bug-reports: "https://github.com/janestreet/bonsai_term/issues"
+dev-repo: "git+https://github.com/janestreet/bonsai_term.git"
+doc:
+  "https://ocaml.janestreet.com/ocaml-core/latest/doc/bonsai_term/index.html"
+license: "MIT"
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+]
+depends: [
+  "ocaml"           {>= "5.1.0"}
+  "async"           {= "v0.18~preview.130.74+175"}
+  "bonsai"          {= "v0.18~preview.130.74+175"}
+  "core"            {= "v0.18~preview.130.74+175"}
+  "core_unix"       {= "v0.18~preview.130.74+175"}
+  "notty_async"     {= "v0.18~preview.130.74+175"}
+  "parallel"        {= "v0.18~preview.130.74+175"}
+  "ppx_jane"        {= "v0.18~preview.130.74+175"}
+  "uopt"            {= "v0.18~preview.130.74+175"}
+  "virtual_dom"     {= "v0.18~preview.130.74+175"}
+  "dune"            {>= "3.17.0"}
+  "notty-community" {= "0.2.4+ox"}
+]
+available: arch != "arm32" & arch != "x86_32"
+synopsis: "A library for building dynamic terminal apps, using bonsai"
+description: """
+Bonsai_term is a library for building reusable TUI componetns and apps inside an
+    Incremental-style UI framework such as Bonsai_web, Incr_dom or React.
+"""
+url {
+  src:
+    "https://github.com/janestreet/bonsai_term/archive/8ed9ea9d05f60f4a32e0dfad9b097c2e1d7fb04c.tar.gz"
+  checksum:
+    "sha256=0270179db1f617c36b037ccbe1ee2666843c3130dfc0087b3eb0679353bef5ce"
+}
diff --git a/packages/bonsai_term_components/.generated b/packages/bonsai_term_components/.generated
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/bonsai_term_components/bonsai_term_components.v0.18~preview.130.74+175/opam b/packages/bonsai_term_components/bonsai_term_components.v0.18~preview.130.74+175/opam
new file mode 100644
index 0000000000..37e2a0566a
--- /dev/null
+++ b/packages/bonsai_term_components/bonsai_term_components.v0.18~preview.130.74+175/opam
@@ -0,0 +1,38 @@
+opam-version: "2.0"
+maintainer: "Jane Street developers"
+authors: ["Jane Street Group, LLC"]
+homepage: "https://github.com/janestreet/bonsai_term_components"
+bug-reports: "https://github.com/janestreet/bonsai_term_components/issues"
+dev-repo: "git+https://github.com/janestreet/bonsai_term_components.git"
+doc:
+  "https://ocaml.janestreet.com/ocaml-core/latest/doc/bonsai_term_components/index.html"
+license: "MIT"
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+]
+depends: [
+  "ocaml"           {>= "5.1.0"}
+  "bonsai"          {= "v0.18~preview.130.74+175"}
+  "bonsai_concrete" {= "v0.18~preview.130.74+175"}
+  "bonsai_term"     {= "v0.18~preview.130.74+175"}
+  "core"            {= "v0.18~preview.130.74+175"}
+  "core_kernel"     {= "v0.18~preview.130.74+175"}
+  "expectree"       {= "v0.18~preview.130.74+175"}
+  "ppx_jane"        {= "v0.18~preview.130.74+175"}
+  "sexplib"         {= "v0.18~preview.130.74+175"}
+  "vec"             {= "v0.18~preview.130.74+175"}
+  "dune"            {>= "3.17.0"}
+  "notty-community" {= "0.2.4+ox"}
+  "react"
+]
+available: arch != "arm32" & arch != "x86_32"
+synopsis: "A set of Terminal UI (TUI) component libraries for bonsai_term."
+description: """
+bonsai_term_components is an opam package that contains a couple of bonsai_term TUI components.
+"""
+url {
+  src:
+    "https://github.com/janestreet/bonsai_term_components/archive/d24375f07ca5a9df165958bfe7451a0465fcbeef.tar.gz"
+  checksum:
+    "sha256=71d89b6cbeadf061572c737601ba149830c068ddcb81e8e19c394b6906b47e10"
+}
diff --git a/packages/bonsai_term_examples/.generated b/packages/bonsai_term_examples/.generated
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/bonsai_term_examples/bonsai_term_examples.v0.18~preview.130.74+175/opam b/packages/bonsai_term_examples/bonsai_term_examples.v0.18~preview.130.74+175/opam
new file mode 100644
index 0000000000..4ac0bd9ce8
--- /dev/null
+++ b/packages/bonsai_term_examples/bonsai_term_examples.v0.18~preview.130.74+175/opam
@@ -0,0 +1,41 @@
+opam-version: "2.0"
+maintainer: "Jane Street developers"
+authors: ["Jane Street Group, LLC"]
+homepage: "https://github.com/janestreet/bonsai_term_examples"
+bug-reports: "https://github.com/janestreet/bonsai_term_examples/issues"
+dev-repo: "git+https://github.com/janestreet/bonsai_term_examples.git"
+doc:
+  "https://ocaml.janestreet.com/ocaml-core/latest/doc/bonsai_term_examples/index.html"
+license: "MIT"
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+]
+depends: [
+  "ocaml"                  {>= "5.1.0"}
+  "async"                  {= "v0.18~preview.130.74+175"}
+  "bonsai"                 {= "v0.18~preview.130.74+175"}
+  "bonsai_term"            {= "v0.18~preview.130.74+175"}
+  "bonsai_term_components" {= "v0.18~preview.130.74+175"}
+  "bonsai_term_test"       {= "v0.18~preview.130.74+175"}
+  "bonsai_test"            {= "v0.18~preview.130.74+175"}
+  "core"                   {= "v0.18~preview.130.74+175"}
+  "core_unix"              {= "v0.18~preview.130.74+175"}
+  "ppx_embed_file"         {= "v0.18~preview.130.74+175"}
+  "ppx_expect"             {= "v0.18~preview.130.74+175"}
+  "ppx_jane"               {= "v0.18~preview.130.74+175"}
+  "dune"                   {>= "3.17.0"}
+]
+available: arch != "arm32" & arch != "x86_32"
+synopsis: "Some examples for bonsai_term"
+description: """
+Bonsai_term is a library for building reusable TUI componetns and apps
+   inside an Incremental-style UI framework such as Bonsai_web, Incr_dom or
+   React. This library contains some examples that you can reference on how to
+   use `bonsai_term`.
+"""
+url {
+  src:
+    "https://github.com/janestreet/bonsai_term_examples/archive/8a768a57ec2d693c1effe9eca110e06731f34050.tar.gz"
+  checksum:
+    "sha256=2efa9dad20cb2080486fc95af103765714e9da475c1debcde5a3453f7fe37c12"
+}
diff --git a/packages/bonsai_term_test/.generated b/packages/bonsai_term_test/.generated
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/bonsai_term_test/bonsai_term_test.v0.18~preview.130.74+175/opam b/packages/bonsai_term_test/bonsai_term_test.v0.18~preview.130.74+175/opam
new file mode 100644
index 0000000000..5253675406
--- /dev/null
+++ b/packages/bonsai_term_test/bonsai_term_test.v0.18~preview.130.74+175/opam
@@ -0,0 +1,43 @@
+opam-version: "2.0"
+maintainer: "Jane Street developers"
+authors: ["Jane Street Group, LLC"]
+homepage: "https://github.com/janestreet/bonsai_term_test"
+bug-reports: "https://github.com/janestreet/bonsai_term_test/issues"
+dev-repo: "git+https://github.com/janestreet/bonsai_term_test.git"
+doc:
+  "https://ocaml.janestreet.com/ocaml-core/latest/doc/bonsai_term_test/index.html"
+license: "MIT"
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+]
+depends: [
+  "ocaml"                    {>= "5.1.0"}
+  "async"                    {= "v0.18~preview.130.74+175"}
+  "bonsai"                   {= "v0.18~preview.130.74+175"}
+  "bonsai_term"              {= "v0.18~preview.130.74+175"}
+  "bonsai_term_components"   {= "v0.18~preview.130.74+175"}
+  "bonsai_test"              {= "v0.18~preview.130.74+175"}
+  "core"                     {= "v0.18~preview.130.74+175"}
+  "expect_test_helpers_core" {= "v0.18~preview.130.74+175"}
+  "expectable"               {= "v0.18~preview.130.74+175"}
+  "notty_async"              {= "v0.18~preview.130.74+175"}
+  "patdiff"                  {= "v0.18~preview.130.74+175"}
+  "ppx_jane"                 {= "v0.18~preview.130.74+175"}
+  "ppx_quick_test"           {= "v0.18~preview.130.74+175"}
+  "ppx_with"                 {= "v0.18~preview.130.74+175"}
+  "dune"                     {>= "3.17.0"}
+  "notty-community"          {= "0.2.4+ox"}
+  "re"                       {= "1.14.0+ox"}
+]
+available: arch != "arm32" & arch != "x86_32"
+synopsis: "A library for building dynamic terminal apps, using bonsai"
+description: """
+Bonsai_term is a library for building reusable TUI componetns and apps inside an
+    Incremental-style UI framework such as Bonsai_web, Incr_dom or React.
+"""
+url {
+  src:
+    "https://github.com/janestreet/bonsai_term_test/archive/f1bed0a68dabe2cac72fa5605a16dfbc18bbbf43.tar.gz"
+  checksum:
+    "sha256=55dbdec823cc44b7449a6472cb2ee3d52e2174a78847ad61354a53b0725c235f"
+}
diff --git a/packages/bonsai_test/bonsai_test.v0.18~preview.130.55+197/opam b/packages/bonsai_test/bonsai_test.v0.18~preview.130.55+197/opam
deleted file mode 100644
index 54f76deb64..0000000000
--- a/packages/bonsai_test/bonsai_test.v0.18~preview.130.55+197/opam
+++ /dev/null
@@ -1,47 +0,0 @@
-opam-version: "2.0"
-maintainer: "Jane Street developers"
-authors: ["Jane Street Group, LLC"]
-homepage: "https://github.com/janestreet/bonsai_test"
-bug-reports: "https://github.com/janestreet/bonsai_test/issues"
-dev-repo: "git+https://github.com/janestreet/bonsai_test.git"
-doc:
-  "https://ocaml.janestreet.com/ocaml-core/latest/doc/bonsai_test/index.html"
-license: "MIT"
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-]
-depends: [
-  "ocaml"                    {>= "5.1.0"}
-  "async"                    {= "v0.18~preview.130.55+197"}
-  "async_js"                 {= "v0.18~preview.130.55+197"}
-  "base"                     {= "v0.18~preview.130.55+197"}
-  "bonsai"                   {= "v0.18~preview.130.55+197"}
-  "bonsai_concrete"          {= "v0.18~preview.130.55+197"}
-  "core"                     {= "v0.18~preview.130.55+197"}
-  "core_unix"                {= "v0.18~preview.130.55+197"}
-  "expect_test_helpers_core" {= "v0.18~preview.130.55+197"}
-  "expectable"               {= "v0.18~preview.130.55+197"}
-  "incr_map"                 {= "v0.18~preview.130.55+197"}
-  "incremental"              {= "v0.18~preview.130.55+197"}
-  "ocaml-embed-file"         {= "v0.18~preview.130.55+197"}
-  "patdiff"                  {= "v0.18~preview.130.55+197"}
-  "ppx_expect"               {= "v0.18~preview.130.55+197"}
-  "ppx_jane"                 {= "v0.18~preview.130.55+197"}
-  "ppx_pattern_bind"         {= "v0.18~preview.130.55+197"}
-  "ppx_quick_test"           {= "v0.18~preview.130.55+197"}
-  "virtual_dom"              {= "v0.18~preview.130.55+197"}
-  "dune"                     {>= "3.17.0"}
-  "re"                       {= "1.14.0+ox"}
-]
-available: arch != "arm32" & arch != "x86_32"
-synopsis: "A library for testing Bonsai state machines."
-description: """
-Bonsai is a library for building composable state machines. This libary
-    provides testing capabilities.
-"""
-url {
-  src:
-    "https://github.com/janestreet/bonsai_test/archive/9a6a2dbd18495856c625a24c573e9e1e5944658d.tar.gz"
-  checksum:
-    "sha256=8adbcf8aed7de629812eb029453262c19edbe34be9b3589b3f3d90f1df7b8a4c"
-}
diff --git a/packages/bonsai_test/bonsai_test.v0.18~preview.130.74+175/opam b/packages/bonsai_test/bonsai_test.v0.18~preview.130.74+175/opam
new file mode 100644
index 0000000000..b6388726eb
--- /dev/null
+++ b/packages/bonsai_test/bonsai_test.v0.18~preview.130.74+175/opam
@@ -0,0 +1,47 @@
+opam-version: "2.0"
+maintainer: "Jane Street developers"
+authors: ["Jane Street Group, LLC"]
+homepage: "https://github.com/janestreet/bonsai_test"
+bug-reports: "https://github.com/janestreet/bonsai_test/issues"
+dev-repo: "git+https://github.com/janestreet/bonsai_test.git"
+doc:
+  "https://ocaml.janestreet.com/ocaml-core/latest/doc/bonsai_test/index.html"
+license: "MIT"
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+]
+depends: [
+  "ocaml"                    {>= "5.1.0"}
+  "async"                    {= "v0.18~preview.130.74+175"}
+  "async_js"                 {= "v0.18~preview.130.74+175"}
+  "base"                     {= "v0.18~preview.130.74+175"}
+  "bonsai"                   {= "v0.18~preview.130.74+175"}
+  "bonsai_concrete"          {= "v0.18~preview.130.74+175"}
+  "core"                     {= "v0.18~preview.130.74+175"}
+  "core_unix"                {= "v0.18~preview.130.74+175"}
+  "expect_test_helpers_core" {= "v0.18~preview.130.74+175"}
+  "expectable"               {= "v0.18~preview.130.74+175"}
+  "incr_map"                 {= "v0.18~preview.130.74+175"}
+  "incremental"              {= "v0.18~preview.130.74+175"}
+  "ocaml-embed-file"         {= "v0.18~preview.130.74+175"}
+  "patdiff"                  {= "v0.18~preview.130.74+175"}
+  "ppx_expect"               {= "v0.18~preview.130.74+175"}
+  "ppx_jane"                 {= "v0.18~preview.130.74+175"}
+  "ppx_pattern_bind"         {= "v0.18~preview.130.74+175"}
+  "ppx_quick_test"           {= "v0.18~preview.130.74+175"}
+  "virtual_dom"              {= "v0.18~preview.130.74+175"}
+  "dune"                     {>= "3.17.0"}
+  "re"                       {= "1.14.0+ox"}
+]
+available: arch != "arm32" & arch != "x86_32"
+synopsis: "A library for testing Bonsai state machines."
+description: """
+Bonsai is a library for building composable state machines. This libary
+    provides testing capabilities.
+"""
+url {
+  src:
+    "https://github.com/janestreet/bonsai_test/archive/9d90ea94ca59f29826899d525d8ded61e8b093d3.tar.gz"
+  checksum:
+    "sha256=80182b23f70ceec42180a21521f6d5edf8276903780b77ddc639dacc263e3fb6"
+}
diff --git a/packages/bonsai_web/bonsai_web.v0.18~preview.130.55+197/opam b/packages/bonsai_web/bonsai_web.v0.18~preview.130.55+197/opam
deleted file mode 100644
index a50e2bba5a..0000000000
--- a/packages/bonsai_web/bonsai_web.v0.18~preview.130.55+197/opam
+++ /dev/null
@@ -1,52 +0,0 @@
-opam-version: "2.0"
-maintainer: "Jane Street developers"
-authors: ["Jane Street Group, LLC"]
-homepage: "https://github.com/janestreet/bonsai_web"
-bug-reports: "https://github.com/janestreet/bonsai_web/issues"
-dev-repo: "git+https://github.com/janestreet/bonsai_web.git"
-doc:
-  "https://ocaml.janestreet.com/ocaml-core/latest/doc/bonsai_web/index.html"
-license: "MIT"
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-]
-depends: [
-  "ocaml"                       {>= "5.1.0"}
-  "am_running_how_js"           {= "v0.18~preview.130.55+197"}
-  "async_durable"               {= "v0.18~preview.130.55+197"}
-  "async_js"                    {= "v0.18~preview.130.55+197"}
-  "async_kernel"                {= "v0.18~preview.130.55+197"}
-  "async_rpc_kernel"            {= "v0.18~preview.130.55+197"}
-  "babel"                       {= "v0.18~preview.130.55+197"}
-  "bonsai"                      {= "v0.18~preview.130.55+197"}
-  "bonsai_concrete"             {= "v0.18~preview.130.55+197"}
-  "core"                        {= "v0.18~preview.130.55+197"}
-  "core_kernel"                 {= "v0.18~preview.130.55+197"}
-  "incr_dom"                    {= "v0.18~preview.130.55+197"}
-  "ocaml-embed-file"            {= "v0.18~preview.130.55+197"}
-  "pending_or_error"            {= "v0.18~preview.130.55+197"}
-  "polling_state_rpc"           {= "v0.18~preview.130.55+197"}
-  "ppx_css"                     {= "v0.18~preview.130.55+197"}
-  "ppx_diff"                    {= "v0.18~preview.130.55+197"}
-  "ppx_jane"                    {= "v0.18~preview.130.55+197"}
-  "streamable"                  {= "v0.18~preview.130.55+197"}
-  "toplayer"                    {= "v0.18~preview.130.55+197"}
-  "versioned_polling_state_rpc" {= "v0.18~preview.130.55+197"}
-  "virtual_dom"                 {= "v0.18~preview.130.55+197"}
-  "dune"                        {>= "3.17.0"}
-  "js_of_ocaml"                 {= "6.0.1+ox"}
-  "js_of_ocaml-ppx"             {= "6.0.1+ox"}
-  "uri"                         {>= "3.0.0"}
-]
-available: arch != "arm32" & arch != "x86_32"
-synopsis: "A library for building dynamic webapps, using Js_of_ocaml"
-description: """
-Bonsai is a library for building reusable UI components inside an
-     Incremental-style UI framework such as Incr_dom or React.
-"""
-url {
-  src:
-    "https://github.com/janestreet/bonsai_web/archive/76a49da493ec668278a3ab966b5fcde0de7e51be.tar.gz"
-  checksum:
-    "sha256=78566a36f7376e33e3d326e78f19fcf995857cf8aff16b6a1fbe67799423e48c"
-}
diff --git a/packages/bonsai_web/bonsai_web.v0.18~preview.130.74+175/opam b/packages/bonsai_web/bonsai_web.v0.18~preview.130.74+175/opam
new file mode 100644
index 0000000000..a6af5957a4
--- /dev/null
+++ b/packages/bonsai_web/bonsai_web.v0.18~preview.130.74+175/opam
@@ -0,0 +1,52 @@
+opam-version: "2.0"
+maintainer: "Jane Street developers"
+authors: ["Jane Street Group, LLC"]
+homepage: "https://github.com/janestreet/bonsai_web"
+bug-reports: "https://github.com/janestreet/bonsai_web/issues"
+dev-repo: "git+https://github.com/janestreet/bonsai_web.git"
+doc:
+  "https://ocaml.janestreet.com/ocaml-core/latest/doc/bonsai_web/index.html"
+license: "MIT"
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+]
+depends: [
+  "ocaml"                       {>= "5.1.0"}
+  "am_running_how_js"           {= "v0.18~preview.130.74+175"}
+  "async_durable"               {= "v0.18~preview.130.74+175"}
+  "async_js"                    {= "v0.18~preview.130.74+175"}
+  "async_kernel"                {= "v0.18~preview.130.74+175"}
+  "async_rpc_kernel"            {= "v0.18~preview.130.74+175"}
+  "babel"                       {= "v0.18~preview.130.74+175"}
+  "bonsai"                      {= "v0.18~preview.130.74+175"}
+  "bonsai_concrete"             {= "v0.18~preview.130.74+175"}
+  "core"                        {= "v0.18~preview.130.74+175"}
+  "core_kernel"                 {= "v0.18~preview.130.74+175"}
+  "incr_dom"                    {= "v0.18~preview.130.74+175"}
+  "ocaml-embed-file"            {= "v0.18~preview.130.74+175"}
+  "pending_or_error"            {= "v0.18~preview.130.74+175"}
+  "polling_state_rpc"           {= "v0.18~preview.130.74+175"}
+  "ppx_css"                     {= "v0.18~preview.130.74+175"}
+  "ppx_diff"                    {= "v0.18~preview.130.74+175"}
+  "ppx_jane"                    {= "v0.18~preview.130.74+175"}
+  "streamable"                  {= "v0.18~preview.130.74+175"}
+  "toplayer"                    {= "v0.18~preview.130.74+175"}
+  "versioned_polling_state_rpc" {= "v0.18~preview.130.74+175"}
+  "virtual_dom"                 {= "v0.18~preview.130.74+175"}
+  "dune"                        {>= "3.17.0"}
+  "js_of_ocaml"                 {= "6.0.1+ox"}
+  "js_of_ocaml-ppx"             {= "6.0.1+ox"}
+  "uri"                         {>= "3.0.0"}
+]
+available: arch != "arm32" & arch != "x86_32"
+synopsis: "A library for building dynamic webapps, using Js_of_ocaml"
+description: """
+Bonsai is a library for building reusable UI components inside an
+     Incremental-style UI framework such as Incr_dom or React.
+"""
+url {
+  src:
+    "https://github.com/janestreet/bonsai_web/archive/250b87c8887750f8ec554e61b370219bb213481e.tar.gz"
+  checksum:
+    "sha256=21c5ef3b5b781b68e502d0e2aac15f1d351a42ca04a6beeb5a3cd42045405004"
+}
diff --git a/packages/bonsai_web_components/bonsai_web_components.v0.18~preview.130.55+197/opam b/packages/bonsai_web_components/bonsai_web_components.v0.18~preview.130.55+197/opam
deleted file mode 100644
index 3dcbaf91e0..0000000000
--- a/packages/bonsai_web_components/bonsai_web_components.v0.18~preview.130.55+197/opam
+++ /dev/null
@@ -1,68 +0,0 @@
-opam-version: "2.0"
-maintainer: "Jane Street developers"
-authors: ["Jane Street Group, LLC"]
-homepage: "https://github.com/janestreet/bonsai_web_components"
-bug-reports: "https://github.com/janestreet/bonsai_web_components/issues"
-dev-repo: "git+https://github.com/janestreet/bonsai_web_components.git"
-doc:
-  "https://ocaml.janestreet.com/ocaml-core/latest/doc/bonsai_web_components/index.html"
-license: "MIT"
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-]
-depends: [
-  "ocaml"                    {>= "5.1.0"}
-  "am_running_how_js"        {= "v0.18~preview.130.55+197"}
-  "async_kernel"             {= "v0.18~preview.130.55+197"}
-  "bin_prot"                 {= "v0.18~preview.130.55+197"}
-  "bonsai"                   {= "v0.18~preview.130.55+197"}
-  "bonsai_concrete"          {= "v0.18~preview.130.55+197"}
-  "bonsai_web"               {= "v0.18~preview.130.55+197"}
-  "bonsai_web_test"          {= "v0.18~preview.130.55+197"}
-  "core"                     {= "v0.18~preview.130.55+197"}
-  "core_extended"            {= "v0.18~preview.130.55+197"}
-  "core_kernel"              {= "v0.18~preview.130.55+197"}
-  "expect_test_helpers_core" {= "v0.18~preview.130.55+197"}
-  "fuzzy_match"              {= "v0.18~preview.130.55+197"}
-  "incr_map"                 {= "v0.18~preview.130.55+197"}
-  "incremental"              {= "v0.18~preview.130.55+197"}
-  "ocaml-embed-file"         {= "v0.18~preview.130.55+197"}
-  "ordinal_abbreviation"     {= "v0.18~preview.130.55+197"}
-  "patdiff"                  {= "v0.18~preview.130.55+197"}
-  "ppx_bench"                {= "v0.18~preview.130.55+197"}
-  "ppx_css"                  {= "v0.18~preview.130.55+197"}
-  "ppx_expect"               {= "v0.18~preview.130.55+197"}
-  "ppx_html"                 {= "v0.18~preview.130.55+197"}
-  "ppx_jane"                 {= "v0.18~preview.130.55+197"}
-  "ppx_module_timer"         {= "v0.18~preview.130.55+197"}
-  "ppx_pattern_bind"         {= "v0.18~preview.130.55+197"}
-  "ppx_typed_fields"         {= "v0.18~preview.130.55+197"}
-  "profunctor"               {= "v0.18~preview.130.55+197"}
-  "record_builder"           {= "v0.18~preview.130.55+197"}
-  "sexp_grammar"             {= "v0.18~preview.130.55+197"}
-  "sexplib0"                 {= "v0.18~preview.130.55+197"}
-  "textutils"                {= "v0.18~preview.130.55+197"}
-  "toplayer"                 {= "v0.18~preview.130.55+197"}
-  "uri_parsing"              {= "v0.18~preview.130.55+197"}
-  "virtual_dom"              {= "v0.18~preview.130.55+197"}
-  "dune"                     {>= "3.17.0"}
-  "gen_js_api"               {= "1.1.2+ox"}
-  "js_of_ocaml"              {= "6.0.1+ox"}
-  "js_of_ocaml-ppx"          {= "6.0.1+ox"}
-  "re"                       {= "1.14.0+ox"}
-  "uri"                      {>= "3.0.0"}
-]
-available: arch != "arm32" & arch != "x86_32"
-synopsis:
-  "Examples for bonsai_web, a library for building dynamic webapps, using Js_of_ocaml"
-description: """
-A collection of bonsai_web examples. Bonsai is a library for building
-    reusable UI components inside an Incremental-style UI framework such as
-    Incr_dom or React. This repository contains its examples.
-"""
-url {
-  src:
-    "https://github.com/janestreet/bonsai_web_components/archive/d1399c4b3ff9ce4374794291b24f72f699ee12c0.tar.gz"
-  checksum:
-    "sha256=c3c64ccd308cde6d98d51786ff713f7c021a731e70846e7739f1085268af91eb"
-}
diff --git a/packages/bonsai_web_components/bonsai_web_components.v0.18~preview.130.74+175/opam b/packages/bonsai_web_components/bonsai_web_components.v0.18~preview.130.74+175/opam
new file mode 100644
index 0000000000..2973255231
--- /dev/null
+++ b/packages/bonsai_web_components/bonsai_web_components.v0.18~preview.130.74+175/opam
@@ -0,0 +1,68 @@
+opam-version: "2.0"
+maintainer: "Jane Street developers"
+authors: ["Jane Street Group, LLC"]
+homepage: "https://github.com/janestreet/bonsai_web_components"
+bug-reports: "https://github.com/janestreet/bonsai_web_components/issues"
+dev-repo: "git+https://github.com/janestreet/bonsai_web_components.git"
+doc:
+  "https://ocaml.janestreet.com/ocaml-core/latest/doc/bonsai_web_components/index.html"
+license: "MIT"
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+]
+depends: [
+  "ocaml"                    {>= "5.1.0"}
+  "am_running_how_js"        {= "v0.18~preview.130.74+175"}
+  "async_kernel"             {= "v0.18~preview.130.74+175"}
+  "bin_prot"                 {= "v0.18~preview.130.74+175"}
+  "bonsai"                   {= "v0.18~preview.130.74+175"}
+  "bonsai_concrete"          {= "v0.18~preview.130.74+175"}
+  "bonsai_web"               {= "v0.18~preview.130.74+175"}
+  "bonsai_web_test"          {= "v0.18~preview.130.74+175"}
+  "core"                     {= "v0.18~preview.130.74+175"}
+  "core_extended"            {= "v0.18~preview.130.74+175"}
+  "core_kernel"              {= "v0.18~preview.130.74+175"}
+  "expect_test_helpers_core" {= "v0.18~preview.130.74+175"}
+  "fuzzy_match"              {= "v0.18~preview.130.74+175"}
+  "incr_map"                 {= "v0.18~preview.130.74+175"}
+  "incremental"              {= "v0.18~preview.130.74+175"}
+  "ocaml-embed-file"         {= "v0.18~preview.130.74+175"}
+  "ordinal_abbreviation"     {= "v0.18~preview.130.74+175"}
+  "patdiff"                  {= "v0.18~preview.130.74+175"}
+  "ppx_bench"                {= "v0.18~preview.130.74+175"}
+  "ppx_css"                  {= "v0.18~preview.130.74+175"}
+  "ppx_expect"               {= "v0.18~preview.130.74+175"}
+  "ppx_html"                 {= "v0.18~preview.130.74+175"}
+  "ppx_jane"                 {= "v0.18~preview.130.74+175"}
+  "ppx_module_timer"         {= "v0.18~preview.130.74+175"}
+  "ppx_pattern_bind"         {= "v0.18~preview.130.74+175"}
+  "ppx_typed_fields"         {= "v0.18~preview.130.74+175"}
+  "profunctor"               {= "v0.18~preview.130.74+175"}
+  "record_builder"           {= "v0.18~preview.130.74+175"}
+  "sexp_grammar"             {= "v0.18~preview.130.74+175"}
+  "sexplib0"                 {= "v0.18~preview.130.74+175"}
+  "textutils"                {= "v0.18~preview.130.74+175"}
+  "toplayer"                 {= "v0.18~preview.130.74+175"}
+  "uri_parsing"              {= "v0.18~preview.130.74+175"}
+  "virtual_dom"              {= "v0.18~preview.130.74+175"}
+  "dune"                     {>= "3.17.0"}
+  "gen_js_api"               {= "1.1.2+ox"}
+  "js_of_ocaml"              {= "6.0.1+ox"}
+  "js_of_ocaml-ppx"          {= "6.0.1+ox"}
+  "re"                       {= "1.14.0+ox"}
+  "uri"                      {>= "3.0.0"}
+]
+available: arch != "arm32" & arch != "x86_32"
+synopsis:
+  "Examples for bonsai_web, a library for building dynamic webapps, using Js_of_ocaml"
+description: """
+A collection of bonsai_web examples. Bonsai is a library for building
+    reusable UI components inside an Incremental-style UI framework such as
+    Incr_dom or React. This repository contains its examples.
+"""
+url {
+  src:
+    "https://github.com/janestreet/bonsai_web_components/archive/49151d401cf0b0c15e556108d977f88fc0e62623.tar.gz"
+  checksum:
+    "sha256=3d1df677d2698a6d5d1429f9a7c4ecd400bb53ab6a7049fe6fda76928bb0007b"
+}
diff --git a/packages/bonsai_web_test/bonsai_web_test.v0.18~preview.130.55+197/opam b/packages/bonsai_web_test/bonsai_web_test.v0.18~preview.130.55+197/opam
deleted file mode 100644
index 110a547c50..0000000000
--- a/packages/bonsai_web_test/bonsai_web_test.v0.18~preview.130.55+197/opam
+++ /dev/null
@@ -1,64 +0,0 @@
-opam-version: "2.0"
-maintainer: "Jane Street developers"
-authors: ["Jane Street Group, LLC"]
-homepage: "https://github.com/janestreet/bonsai_web_test"
-bug-reports: "https://github.com/janestreet/bonsai_web_test/issues"
-dev-repo: "git+https://github.com/janestreet/bonsai_web_test.git"
-doc:
-  "https://ocaml.janestreet.com/ocaml-core/latest/doc/bonsai_web_test/index.html"
-license: "MIT"
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-]
-depends: [
-  "ocaml"                       {>= "5.1.0"}
-  "am_running_how_js"           {= "v0.18~preview.130.55+197"}
-  "async_durable"               {= "v0.18~preview.130.55+197"}
-  "async_js"                    {= "v0.18~preview.130.55+197"}
-  "async_kernel"                {= "v0.18~preview.130.55+197"}
-  "async_rpc_kernel"            {= "v0.18~preview.130.55+197"}
-  "babel"                       {= "v0.18~preview.130.55+197"}
-  "base"                        {= "v0.18~preview.130.55+197"}
-  "bonsai"                      {= "v0.18~preview.130.55+197"}
-  "bonsai_concrete"             {= "v0.18~preview.130.55+197"}
-  "bonsai_test"                 {= "v0.18~preview.130.55+197"}
-  "bonsai_web"                  {= "v0.18~preview.130.55+197"}
-  "core"                        {= "v0.18~preview.130.55+197"}
-  "expect_test_helpers_core"    {= "v0.18~preview.130.55+197"}
-  "expectable"                  {= "v0.18~preview.130.55+197"}
-  "incr_map"                    {= "v0.18~preview.130.55+197"}
-  "incremental"                 {= "v0.18~preview.130.55+197"}
-  "legacy_diffable"             {= "v0.18~preview.130.55+197"}
-  "ocaml-embed-file"            {= "v0.18~preview.130.55+197"}
-  "patdiff"                     {= "v0.18~preview.130.55+197"}
-  "polling_state_rpc"           {= "v0.18~preview.130.55+197"}
-  "ppx_css"                     {= "v0.18~preview.130.55+197"}
-  "ppx_diff"                    {= "v0.18~preview.130.55+197"}
-  "ppx_expect"                  {= "v0.18~preview.130.55+197"}
-  "ppx_html"                    {= "v0.18~preview.130.55+197"}
-  "ppx_jane"                    {= "v0.18~preview.130.55+197"}
-  "ppx_pattern_bind"            {= "v0.18~preview.130.55+197"}
-  "streamable"                  {= "v0.18~preview.130.55+197"}
-  "textutils"                   {= "v0.18~preview.130.55+197"}
-  "toplayer"                    {= "v0.18~preview.130.55+197"}
-  "versioned_polling_state_rpc" {= "v0.18~preview.130.55+197"}
-  "virtual_dom"                 {= "v0.18~preview.130.55+197"}
-  "dune"                        {>= "3.17.0"}
-  "js_of_ocaml"                 {= "6.0.1+ox"}
-  "js_of_ocaml-ppx"             {= "6.0.1+ox"}
-  "lambdasoup"                  {>= "0.6.3"}
-  "re"                          {= "1.14.0+ox"}
-]
-available: arch != "arm32" & arch != "x86_32"
-synopsis: "A library for testing dynamic bonsai webapps, using Js_of_ocaml"
-description: """
-Bonsai is a library for building reusable UI components inside an
-     Incremental-style UI framework such as Incr_dom or React. This library provides
-     testing capabilities.
-"""
-url {
-  src:
-    "https://github.com/janestreet/bonsai_web_test/archive/edddf4747f9af0663cdcf3ac49ce8e4344d2ae45.tar.gz"
-  checksum:
-    "sha256=72a6c903eaea16cb70274386203b65d72000cc50820f67fc92db1227a8b35efa"
-}
diff --git a/packages/bonsai_web_test/bonsai_web_test.v0.18~preview.130.74+175/opam b/packages/bonsai_web_test/bonsai_web_test.v0.18~preview.130.74+175/opam
new file mode 100644
index 0000000000..2c67b232de
--- /dev/null
+++ b/packages/bonsai_web_test/bonsai_web_test.v0.18~preview.130.74+175/opam
@@ -0,0 +1,64 @@
+opam-version: "2.0"
+maintainer: "Jane Street developers"
+authors: ["Jane Street Group, LLC"]
+homepage: "https://github.com/janestreet/bonsai_web_test"
+bug-reports: "https://github.com/janestreet/bonsai_web_test/issues"
+dev-repo: "git+https://github.com/janestreet/bonsai_web_test.git"
+doc:
+  "https://ocaml.janestreet.com/ocaml-core/latest/doc/bonsai_web_test/index.html"
+license: "MIT"
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+]
+depends: [
+  "ocaml"                       {>= "5.1.0"}
+  "am_running_how_js"           {= "v0.18~preview.130.74+175"}
+  "async_durable"               {= "v0.18~preview.130.74+175"}
+  "async_js"                    {= "v0.18~preview.130.74+175"}
+  "async_kernel"                {= "v0.18~preview.130.74+175"}
+  "async_rpc_kernel"            {= "v0.18~preview.130.74+175"}
+  "babel"                       {= "v0.18~preview.130.74+175"}
+  "base"                        {= "v0.18~preview.130.74+175"}
+  "bonsai"                      {= "v0.18~preview.130.74+175"}
+  "bonsai_concrete"             {= "v0.18~preview.130.74+175"}
+  "bonsai_test"                 {= "v0.18~preview.130.74+175"}
+  "bonsai_web"                  {= "v0.18~preview.130.74+175"}
+  "core"                        {= "v0.18~preview.130.74+175"}
+  "expect_test_helpers_core"    {= "v0.18~preview.130.74+175"}
+  "expectable"                  {= "v0.18~preview.130.74+175"}
+  "incr_map"                    {= "v0.18~preview.130.74+175"}
+  "incremental"                 {= "v0.18~preview.130.74+175"}
+  "legacy_diffable"             {= "v0.18~preview.130.74+175"}
+  "ocaml-embed-file"            {= "v0.18~preview.130.74+175"}
+  "patdiff"                     {= "v0.18~preview.130.74+175"}
+  "polling_state_rpc"           {= "v0.18~preview.130.74+175"}
+  "ppx_css"                     {= "v0.18~preview.130.74+175"}
+  "ppx_diff"                    {= "v0.18~preview.130.74+175"}
+  "ppx_expect"                  {= "v0.18~preview.130.74+175"}
+  "ppx_html"                    {= "v0.18~preview.130.74+175"}
+  "ppx_jane"                    {= "v0.18~preview.130.74+175"}
+  "ppx_pattern_bind"            {= "v0.18~preview.130.74+175"}
+  "streamable"                  {= "v0.18~preview.130.74+175"}
+  "textutils"                   {= "v0.18~preview.130.74+175"}
+  "toplayer"                    {= "v0.18~preview.130.74+175"}
+  "versioned_polling_state_rpc" {= "v0.18~preview.130.74+175"}
+  "virtual_dom"                 {= "v0.18~preview.130.74+175"}
+  "dune"                        {>= "3.17.0"}
+  "js_of_ocaml"                 {= "6.0.1+ox"}
+  "js_of_ocaml-ppx"             {= "6.0.1+ox"}
+  "lambdasoup"                  {>= "0.6.3"}
+  "re"                          {= "1.14.0+ox"}
+]
+available: arch != "arm32" & arch != "x86_32"
+synopsis: "A library for testing dynamic bonsai webapps, using Js_of_ocaml"
+description: """
+Bonsai is a library for building reusable UI components inside an
+     Incremental-style UI framework such as Incr_dom or React. This library provides
+     testing capabilities.
+"""
+url {
+  src:
+    "https://github.com/janestreet/bonsai_web_test/archive/edddf4747f9af0663cdcf3ac49ce8e4344d2ae45.tar.gz"
+  checksum:
+    "sha256=72a6c903eaea16cb70274386203b65d72000cc50820f67fc92db1227a8b35efa"
+}
diff --git a/packages/capitalization/capitalization.v0.18~preview.130.55+197/opam b/packages/capitalization/capitalization.v0.18~preview.130.74+175/opam
similarity index 91%
rename from packages/capitalization/capitalization.v0.18~preview.130.55+197/opam
rename to packages/capitalization/capitalization.v0.18~preview.130.74+175/opam
index 40c6fe0381..5ae51682a5 100644
--- a/packages/capitalization/capitalization.v0.18~preview.130.55+197/opam
+++ b/packages/capitalization/capitalization.v0.18~preview.130.74+175/opam
@@ -12,8 +12,8 @@ build: [
 ]
 depends: [
   "ocaml"    {>= "5.1.0"}
-  "base"     {= "v0.18~preview.130.55+197"}
-  "ppx_base" {= "v0.18~preview.130.55+197"}
+  "base"     {= "v0.18~preview.130.74+175"}
+  "ppx_base" {= "v0.18~preview.130.74+175"}
   "dune"     {>= "3.17.0"}
   "ppxlib"   {= "0.33.0+ox"}
 ]
diff --git a/packages/codicons/codicons.v0.18~preview.130.55+197/opam b/packages/codicons/codicons.v0.18~preview.130.74+175/opam
similarity index 53%
rename from packages/codicons/codicons.v0.18~preview.130.55+197/opam
rename to packages/codicons/codicons.v0.18~preview.130.74+175/opam
index d5e09fb8e4..e7aedf801f 100644
--- a/packages/codicons/codicons.v0.18~preview.130.55+197/opam
+++ b/packages/codicons/codicons.v0.18~preview.130.74+175/opam
@@ -10,11 +10,12 @@ build: [
   ["dune" "build" "-p" name "-j" jobs]
 ]
 depends: [
-  "ocaml"       {>= "5.1.0"}
-  "core"        {= "v0.18~preview.130.55+197"}
-  "ppx_jane"    {= "v0.18~preview.130.55+197"}
-  "virtual_dom" {= "v0.18~preview.130.55+197"}
-  "dune"        {>= "3.17.0"}
+  "ocaml"                 {>= "5.1.0"}
+  "bonsai_web_components" {= "v0.18~preview.130.74+175"}
+  "core"                  {= "v0.18~preview.130.74+175"}
+  "ppx_jane"              {= "v0.18~preview.130.74+175"}
+  "virtual_dom"           {= "v0.18~preview.130.74+175"}
+  "dune"                  {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
 synopsis: "Icons from VS code"
@@ -23,7 +24,7 @@ Icons from VS code
 """
 url {
   src:
-    "https://github.com/janestreet/codicons/archive/85445c14c3fb5f1e049652c33e0c5c8dab08a5fd.tar.gz"
+    "https://github.com/janestreet/codicons/archive/37540c022e3e3eb0f584a1cbba9f06b3a6b66bdf.tar.gz"
   checksum:
-    "sha256=96c5af1e6d157bab30c439f1f9a668cddcb32469d62e1b3c0d2c36964b0fdae1"
+    "sha256=1990af6b954ceb20315e8ef4223c5f0b6646a92bfd3d255028efce73c3403263"
 }
diff --git a/packages/cohttp_async_websocket/cohttp_async_websocket.v0.18~preview.130.55+197/opam b/packages/cohttp_async_websocket/cohttp_async_websocket.v0.18~preview.130.74+175/opam
similarity index 77%
rename from packages/cohttp_async_websocket/cohttp_async_websocket.v0.18~preview.130.55+197/opam
rename to packages/cohttp_async_websocket/cohttp_async_websocket.v0.18~preview.130.74+175/opam
index 96f04e534e..f2db39ac05 100644
--- a/packages/cohttp_async_websocket/cohttp_async_websocket.v0.18~preview.130.55+197/opam
+++ b/packages/cohttp_async_websocket/cohttp_async_websocket.v0.18~preview.130.74+175/opam
@@ -12,11 +12,11 @@ build: [
 ]
 depends: [
   "ocaml"           {>= "5.1.0"}
-  "async"           {= "v0.18~preview.130.55+197"}
-  "async_ssl"       {= "v0.18~preview.130.55+197"}
-  "async_websocket" {= "v0.18~preview.130.55+197"}
-  "core"            {= "v0.18~preview.130.55+197"}
-  "ppx_jane"        {= "v0.18~preview.130.55+197"}
+  "async"           {= "v0.18~preview.130.74+175"}
+  "async_ssl"       {= "v0.18~preview.130.74+175"}
+  "async_websocket" {= "v0.18~preview.130.74+175"}
+  "core"            {= "v0.18~preview.130.74+175"}
+  "ppx_jane"        {= "v0.18~preview.130.74+175"}
   "base64"          {>= "3.4.0"}
   "cohttp"          {>= "2.5.6"}
   "cohttp-async"    {>= "2.5.7" & < "3.0.0" | >= "5.1.1" & < "6.0.0"}
@@ -39,7 +39,7 @@ conjunction with async-js and google-chrome.
 """
 url {
   src:
-    "https://github.com/janestreet/cohttp_async_websocket/archive/a5d19b1901914858bdc84c0088b7acee9a7508ef.tar.gz"
+    "https://github.com/janestreet/cohttp_async_websocket/archive/97eb1762ba5eaac498293219ce37c5c1048752d3.tar.gz"
   checksum:
-    "sha256=85333b57c808f11c51df0bfa0ca91938c57e08a1fed49d6990a0db3b8709163c"
+    "sha256=0d8a273afc7ba9cc6b67149fa6531eb2e97531a0e4820925e5f30b19b753869e"
 }
diff --git a/packages/cohttp_static_handler/cohttp_static_handler.v0.18~preview.130.55+197/opam b/packages/cohttp_static_handler/cohttp_static_handler.v0.18~preview.130.74+175/opam
similarity index 86%
rename from packages/cohttp_static_handler/cohttp_static_handler.v0.18~preview.130.55+197/opam
rename to packages/cohttp_static_handler/cohttp_static_handler.v0.18~preview.130.74+175/opam
index dd0d6a0956..72fd650e92 100644
--- a/packages/cohttp_static_handler/cohttp_static_handler.v0.18~preview.130.55+197/opam
+++ b/packages/cohttp_static_handler/cohttp_static_handler.v0.18~preview.130.74+175/opam
@@ -12,10 +12,10 @@ build: [
 ]
 depends: [
   "ocaml"        {>= "5.1.0"}
-  "async"        {= "v0.18~preview.130.55+197"}
-  "core"         {= "v0.18~preview.130.55+197"}
-  "core_unix"    {= "v0.18~preview.130.55+197"}
-  "ppx_jane"     {= "v0.18~preview.130.55+197"}
+  "async"        {= "v0.18~preview.130.74+175"}
+  "core"         {= "v0.18~preview.130.74+175"}
+  "core_unix"    {= "v0.18~preview.130.74+175"}
+  "ppx_jane"     {= "v0.18~preview.130.74+175"}
   "cohttp"       {>= "2.5.6"}
   "cohttp-async" {>= "2.5.7" & < "3.0.0" | >= "5.1.1" & < "6.0.0"}
   "dune"         {>= "3.17.0"}
diff --git a/packages/command_nodejs/command_nodejs.v0.18~preview.130.55+197/opam b/packages/command_nodejs/command_nodejs.v0.18~preview.130.74+175/opam
similarity index 71%
rename from packages/command_nodejs/command_nodejs.v0.18~preview.130.55+197/opam
rename to packages/command_nodejs/command_nodejs.v0.18~preview.130.74+175/opam
index 20d50dda29..9f7ac901e6 100644
--- a/packages/command_nodejs/command_nodejs.v0.18~preview.130.55+197/opam
+++ b/packages/command_nodejs/command_nodejs.v0.18~preview.130.74+175/opam
@@ -12,9 +12,9 @@ build: [
 ]
 depends: [
   "ocaml"           {>= "5.1.0"}
-  "core"            {= "v0.18~preview.130.55+197"}
-  "core_kernel"     {= "v0.18~preview.130.55+197"}
-  "ppx_jane"        {= "v0.18~preview.130.55+197"}
+  "core"            {= "v0.18~preview.130.74+175"}
+  "core_kernel"     {= "v0.18~preview.130.74+175"}
+  "ppx_jane"        {= "v0.18~preview.130.74+175"}
   "dune"            {>= "3.17.0"}
   "js_of_ocaml"     {= "6.0.1+ox"}
   "js_of_ocaml-ppx" {= "6.0.1+ox"}
@@ -27,7 +27,7 @@ A library for running [Command.t]s in JS/Wasm executables running on Node.
 """
 url {
   src:
-    "https://github.com/janestreet/command_nodejs/archive/738f4ee2501498be66e4e6cfbd92cba6b1cdaf9b.tar.gz"
+    "https://github.com/janestreet/command_nodejs/archive/98d2452fe758095cc801104df64a4ac56ca4c480.tar.gz"
   checksum:
-    "sha256=d6a3676f293911928e5d56d2fe36fde5b59ba85057d1c669622d6fa7373b1257"
+    "sha256=e2673bc3eb075e904c6091b769f2008e36b9fe4fc6ac55b72d8786f6ffa5b711"
 }
diff --git a/packages/command_rpc/command_rpc.v0.18~preview.130.55+197/opam b/packages/command_rpc/command_rpc.v0.18~preview.130.74+175/opam
similarity index 62%
rename from packages/command_rpc/command_rpc.v0.18~preview.130.55+197/opam
rename to packages/command_rpc/command_rpc.v0.18~preview.130.74+175/opam
index 1bc5a6e0f0..0a1b0cd44d 100644
--- a/packages/command_rpc/command_rpc.v0.18~preview.130.55+197/opam
+++ b/packages/command_rpc/command_rpc.v0.18~preview.130.74+175/opam
@@ -12,11 +12,11 @@ build: [
 ]
 depends: [
   "ocaml"       {>= "5.1.0"}
-  "async"       {= "v0.18~preview.130.55+197"}
-  "core"        {= "v0.18~preview.130.55+197"}
-  "core_kernel" {= "v0.18~preview.130.55+197"}
-  "core_unix"   {= "v0.18~preview.130.55+197"}
-  "ppx_jane"    {= "v0.18~preview.130.55+197"}
+  "async"       {= "v0.18~preview.130.74+175"}
+  "core"        {= "v0.18~preview.130.74+175"}
+  "core_kernel" {= "v0.18~preview.130.74+175"}
+  "core_unix"   {= "v0.18~preview.130.74+175"}
+  "ppx_jane"    {= "v0.18~preview.130.74+175"}
   "dune"        {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -26,7 +26,7 @@ description: """
 """
 url {
   src:
-    "https://github.com/janestreet/command_rpc/archive/04239488e80982d1730b5de8d3c3ec7e6d9af149.tar.gz"
+    "https://github.com/janestreet/command_rpc/archive/740caf625a26dc4cfa400df0894d12b3b350f763.tar.gz"
   checksum:
-    "sha256=7c4299f16f78c3308e4610793074d8e84e73dd51602b0d328b1f7f556af94eea"
+    "sha256=ec6d7a34ed239302d6a231679b1e95f4689889fea5b8128602562ad8900a2608"
 }
diff --git a/packages/concurrent/concurrent.v0.18~preview.130.55+197/opam b/packages/concurrent/concurrent.v0.18~preview.130.74+175/opam
similarity index 58%
rename from packages/concurrent/concurrent.v0.18~preview.130.55+197/opam
rename to packages/concurrent/concurrent.v0.18~preview.130.74+175/opam
index 681673ee68..5951621d71 100644
--- a/packages/concurrent/concurrent.v0.18~preview.130.55+197/opam
+++ b/packages/concurrent/concurrent.v0.18~preview.130.74+175/opam
@@ -12,14 +12,14 @@ build: [
 ]
 depends: [
   "ocaml"            {>= "5.2.0"}
-  "async"            {= "v0.18~preview.130.55+197"}
-  "await"            {= "v0.18~preview.130.55+197"}
-  "base"             {= "v0.18~preview.130.55+197"}
-  "core"             {= "v0.18~preview.130.55+197"}
-  "portable"         {= "v0.18~preview.130.55+197"}
-  "ppx_debug_assert" {= "v0.18~preview.130.55+197"}
-  "ppx_jane"         {= "v0.18~preview.130.55+197"}
-  "unique"           {= "v0.18~preview.130.55+197"}
+  "async"            {= "v0.18~preview.130.74+175"}
+  "await"            {= "v0.18~preview.130.74+175"}
+  "base"             {= "v0.18~preview.130.74+175"}
+  "core"             {= "v0.18~preview.130.74+175"}
+  "portable"         {= "v0.18~preview.130.74+175"}
+  "ppx_debug_assert" {= "v0.18~preview.130.74+175"}
+  "ppx_jane"         {= "v0.18~preview.130.74+175"}
+  "unique"           {= "v0.18~preview.130.74+175"}
   "base-threads"
   "dune"             {>= "3.17.0"}
 ]
@@ -31,7 +31,7 @@ description: """
 """
 url {
   src:
-    "https://github.com/janestreet/concurrent/archive/6d4e3360d9474cd9c612e8233a03c889e1123b5e.tar.gz"
+    "https://github.com/janestreet/concurrent/archive/ce8463f98f10aa54c06e9e595d191479668b3968.tar.gz"
   checksum:
-    "sha256=cf5fbd84d959268656dc6b79eac86457f0b65d54f2f327a9ebfa43d7259e2289"
+    "sha256=4465eb6cbda0777621649d3eada5ef63bd6823481ef027b142e6b27980a80d01"
 }
diff --git a/packages/content_security_policy/content_security_policy.v0.18~preview.130.55+197/opam b/packages/content_security_policy/content_security_policy.v0.18~preview.130.74+175/opam
similarity index 79%
rename from packages/content_security_policy/content_security_policy.v0.18~preview.130.55+197/opam
rename to packages/content_security_policy/content_security_policy.v0.18~preview.130.74+175/opam
index b04dafcaf3..cd203b1a9c 100644
--- a/packages/content_security_policy/content_security_policy.v0.18~preview.130.55+197/opam
+++ b/packages/content_security_policy/content_security_policy.v0.18~preview.130.74+175/opam
@@ -12,8 +12,8 @@ build: [
 ]
 depends: [
   "ocaml"     {>= "5.1.0"}
-  "core"      {= "v0.18~preview.130.55+197"}
-  "ppx_jane"  {= "v0.18~preview.130.55+197"}
+  "core"      {= "v0.18~preview.130.74+175"}
+  "ppx_jane"  {= "v0.18~preview.130.74+175"}
   "base64"    {>= "3.4.0"}
   "cryptokit" {>= "1.16" & < "1.17"}
   "dune"      {>= "3.17.0"}
@@ -25,7 +25,7 @@ https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP
 """
 url {
   src:
-    "https://github.com/janestreet/content_security_policy/archive/0831359d3a1680319f57abefc5221178e877b125.tar.gz"
+    "https://github.com/janestreet/content_security_policy/archive/468a6ca4df8049303918b786cf9a6d8a1130c626.tar.gz"
   checksum:
-    "sha256=85fa8577a5aae3edeb282e683fc9e83ce23805c8136f2459ff2cd57233a34c20"
+    "sha256=f4f2e193fdfab290ed10591dca32ca508798e8a08b1a6600e3a5ac1428a4e760"
 }
diff --git a/packages/core/core.v0.18~preview.130.55+197/opam b/packages/core/core.v0.18~preview.130.55+197/opam
deleted file mode 100644
index 7b5016ac8a..0000000000
--- a/packages/core/core.v0.18~preview.130.55+197/opam
+++ /dev/null
@@ -1,59 +0,0 @@
-opam-version: "2.0"
-maintainer: "Jane Street developers"
-authors: ["Jane Street Group, LLC"]
-homepage: "https://github.com/janestreet/core"
-bug-reports: "https://github.com/janestreet/core/issues"
-dev-repo: "git+https://github.com/janestreet/core.git"
-doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/core/index.html"
-license: "MIT"
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-]
-depends: [
-  "ocaml"               {>= "5.1.0"}
-  "base"                {= "v0.18~preview.130.55+197"}
-  "base_bigstring"      {= "v0.18~preview.130.55+197"}
-  "base_quickcheck"     {= "v0.18~preview.130.55+197"}
-  "bin_prot"            {= "v0.18~preview.130.55+197"}
-  "fieldslib"           {= "v0.18~preview.130.55+197"}
-  "jane-street-headers" {= "v0.18~preview.130.55+197"}
-  "jst-config"          {= "v0.18~preview.130.55+197"}
-  "parsexp"             {= "v0.18~preview.130.55+197"}
-  "portable"            {= "v0.18~preview.130.55+197"}
-  "ppx_assert"          {= "v0.18~preview.130.55+197"}
-  "ppx_base"            {= "v0.18~preview.130.55+197"}
-  "ppx_diff"            {= "v0.18~preview.130.55+197"}
-  "ppx_expect"          {= "v0.18~preview.130.55+197"}
-  "ppx_hash"            {= "v0.18~preview.130.55+197"}
-  "ppx_inline_test"     {= "v0.18~preview.130.55+197"}
-  "ppx_jane"            {= "v0.18~preview.130.55+197"}
-  "ppx_optcomp"         {= "v0.18~preview.130.55+197"}
-  "ppx_sexp_conv"       {= "v0.18~preview.130.55+197"}
-  "ppx_sexp_message"    {= "v0.18~preview.130.55+197"}
-  "ppx_stable_witness"  {= "v0.18~preview.130.55+197"}
-  "sexplib"             {= "v0.18~preview.130.55+197"}
-  "splittable_random"   {= "v0.18~preview.130.55+197"}
-  "stdio"               {= "v0.18~preview.130.55+197"}
-  "string_dict"         {= "v0.18~preview.130.55+197"}
-  "time_now"            {= "v0.18~preview.130.55+197"}
-  "typerep"             {= "v0.18~preview.130.55+197"}
-  "univ_map"            {= "v0.18~preview.130.55+197"}
-  "uopt"                {= "v0.18~preview.130.55+197"}
-  "variantslib"         {= "v0.18~preview.130.55+197"}
-  "dune"                {>= "3.17.0"}
-]
-available: arch != "arm32" & arch != "x86_32"
-synopsis: "Industrial strength alternative to OCaml's standard library"
-description: """
-The Core suite of libraries is an industrial strength alternative to
-OCaml's standard library that was developed by Jane Street, the
-largest industrial user of OCaml.
-
-This is the system-independent part of Core. Unix-specific parts were moved to [core_unix].
-"""
-url {
-  src:
-    "https://github.com/janestreet/core/archive/4ac588890f6f4b5d47035d3c4e0773e131fa8e00.tar.gz"
-  checksum:
-    "sha256=cc35033bcdeea71bb5a53f4ca6783fe440ee84c2d34ee665c777a14724d6b297"
-}
diff --git a/packages/core/core.v0.18~preview.130.74+175/opam b/packages/core/core.v0.18~preview.130.74+175/opam
new file mode 100644
index 0000000000..354c9db545
--- /dev/null
+++ b/packages/core/core.v0.18~preview.130.74+175/opam
@@ -0,0 +1,59 @@
+opam-version: "2.0"
+maintainer: "Jane Street developers"
+authors: ["Jane Street Group, LLC"]
+homepage: "https://github.com/janestreet/core"
+bug-reports: "https://github.com/janestreet/core/issues"
+dev-repo: "git+https://github.com/janestreet/core.git"
+doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/core/index.html"
+license: "MIT"
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+]
+depends: [
+  "ocaml"               {>= "5.1.0"}
+  "base"                {= "v0.18~preview.130.74+175"}
+  "base_bigstring"      {= "v0.18~preview.130.74+175"}
+  "base_quickcheck"     {= "v0.18~preview.130.74+175"}
+  "bin_prot"            {= "v0.18~preview.130.74+175"}
+  "fieldslib"           {= "v0.18~preview.130.74+175"}
+  "jane-street-headers" {= "v0.18~preview.130.74+175"}
+  "jst-config"          {= "v0.18~preview.130.74+175"}
+  "parsexp"             {= "v0.18~preview.130.74+175"}
+  "portable"            {= "v0.18~preview.130.74+175"}
+  "ppx_assert"          {= "v0.18~preview.130.74+175"}
+  "ppx_base"            {= "v0.18~preview.130.74+175"}
+  "ppx_diff"            {= "v0.18~preview.130.74+175"}
+  "ppx_expect"          {= "v0.18~preview.130.74+175"}
+  "ppx_hash"            {= "v0.18~preview.130.74+175"}
+  "ppx_inline_test"     {= "v0.18~preview.130.74+175"}
+  "ppx_jane"            {= "v0.18~preview.130.74+175"}
+  "ppx_optcomp"         {= "v0.18~preview.130.74+175"}
+  "ppx_sexp_conv"       {= "v0.18~preview.130.74+175"}
+  "ppx_sexp_message"    {= "v0.18~preview.130.74+175"}
+  "ppx_stable_witness"  {= "v0.18~preview.130.74+175"}
+  "sexplib"             {= "v0.18~preview.130.74+175"}
+  "splittable_random"   {= "v0.18~preview.130.74+175"}
+  "stdio"               {= "v0.18~preview.130.74+175"}
+  "string_dict"         {= "v0.18~preview.130.74+175"}
+  "time_now"            {= "v0.18~preview.130.74+175"}
+  "typerep"             {= "v0.18~preview.130.74+175"}
+  "univ_map"            {= "v0.18~preview.130.74+175"}
+  "uopt"                {= "v0.18~preview.130.74+175"}
+  "variantslib"         {= "v0.18~preview.130.74+175"}
+  "dune"                {>= "3.17.0"}
+]
+available: arch != "arm32" & arch != "x86_32"
+synopsis: "Industrial strength alternative to OCaml's standard library"
+description: """
+The Core suite of libraries is an industrial strength alternative to
+OCaml's standard library that was developed by Jane Street, the
+largest industrial user of OCaml.
+
+This is the system-independent part of Core. Unix-specific parts were moved to [core_unix].
+"""
+url {
+  src:
+    "https://github.com/janestreet/core/archive/977b3bda06d3af193ab651ee7e4d4ac2e10d6688.tar.gz"
+  checksum:
+    "sha256=8e1923ee677cb392526c503b23917e766bf3f4301113325f6f19201cb29630c1"
+}
diff --git a/packages/core_bench/core_bench.v0.18~preview.130.55+197/opam b/packages/core_bench/core_bench.v0.18~preview.130.55+197/opam
deleted file mode 100644
index 2b6e2b191e..0000000000
--- a/packages/core_bench/core_bench.v0.18~preview.130.55+197/opam
+++ /dev/null
@@ -1,42 +0,0 @@
-opam-version: "2.0"
-maintainer: "Jane Street developers"
-authors: ["Jane Street Group, LLC"]
-homepage: "https://github.com/janestreet/core_bench"
-bug-reports: "https://github.com/janestreet/core_bench/issues"
-dev-repo: "git+https://github.com/janestreet/core_bench.git"
-doc:
-  "https://ocaml.janestreet.com/ocaml-core/latest/doc/core_bench/index.html"
-license: "MIT"
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-]
-depends: [
-  "ocaml"             {>= "5.1.0"}
-  "command_nodejs"    {= "v0.18~preview.130.55+197"}
-  "core"              {= "v0.18~preview.130.55+197"}
-  "core_extended"     {= "v0.18~preview.130.55+197"}
-  "core_kernel"       {= "v0.18~preview.130.55+197"}
-  "core_unix"         {= "v0.18~preview.130.55+197"}
-  "delimited_parsing" {= "v0.18~preview.130.55+197"}
-  "ppx_bench"         {= "v0.18~preview.130.55+197"}
-  "ppx_compare"       {= "v0.18~preview.130.55+197"}
-  "ppx_fields_conv"   {= "v0.18~preview.130.55+197"}
-  "ppx_jane"          {= "v0.18~preview.130.55+197"}
-  "ppx_let"           {= "v0.18~preview.130.55+197"}
-  "ppx_sexp_conv"     {= "v0.18~preview.130.55+197"}
-  "textutils"         {= "v0.18~preview.130.55+197"}
-  "time_now"          {= "v0.18~preview.130.55+197"}
-  "dune"              {>= "3.17.0"}
-  "js_of_ocaml-ppx"   {= "6.0.1+ox"}
-  "re"                {= "1.14.0+ox"}
-]
-available: arch != "arm32" & arch != "x86_32"
-synopsis: "Benchmarking library"
-description: """
-"""
-url {
-  src:
-    "https://github.com/janestreet/core_bench/archive/188b102a81bfee9d2f2109ef40fcaca24fd19b16.tar.gz"
-  checksum:
-    "sha256=f5beac5203dc8ea0f8636be5d980df4f0b57435491a3a0baabf3395746c5dcf3"
-}
diff --git a/packages/core_bench/core_bench.v0.18~preview.130.74+175/opam b/packages/core_bench/core_bench.v0.18~preview.130.74+175/opam
new file mode 100644
index 0000000000..750a75da71
--- /dev/null
+++ b/packages/core_bench/core_bench.v0.18~preview.130.74+175/opam
@@ -0,0 +1,42 @@
+opam-version: "2.0"
+maintainer: "Jane Street developers"
+authors: ["Jane Street Group, LLC"]
+homepage: "https://github.com/janestreet/core_bench"
+bug-reports: "https://github.com/janestreet/core_bench/issues"
+dev-repo: "git+https://github.com/janestreet/core_bench.git"
+doc:
+  "https://ocaml.janestreet.com/ocaml-core/latest/doc/core_bench/index.html"
+license: "MIT"
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+]
+depends: [
+  "ocaml"             {>= "5.1.0"}
+  "command_nodejs"    {= "v0.18~preview.130.74+175"}
+  "core"              {= "v0.18~preview.130.74+175"}
+  "core_extended"     {= "v0.18~preview.130.74+175"}
+  "core_kernel"       {= "v0.18~preview.130.74+175"}
+  "core_unix"         {= "v0.18~preview.130.74+175"}
+  "delimited_parsing" {= "v0.18~preview.130.74+175"}
+  "ppx_bench"         {= "v0.18~preview.130.74+175"}
+  "ppx_compare"       {= "v0.18~preview.130.74+175"}
+  "ppx_fields_conv"   {= "v0.18~preview.130.74+175"}
+  "ppx_jane"          {= "v0.18~preview.130.74+175"}
+  "ppx_let"           {= "v0.18~preview.130.74+175"}
+  "ppx_sexp_conv"     {= "v0.18~preview.130.74+175"}
+  "textutils"         {= "v0.18~preview.130.74+175"}
+  "time_now"          {= "v0.18~preview.130.74+175"}
+  "dune"              {>= "3.17.0"}
+  "js_of_ocaml-ppx"   {= "6.0.1+ox"}
+  "re"                {= "1.14.0+ox"}
+]
+available: arch != "arm32" & arch != "x86_32"
+synopsis: "Benchmarking library"
+description: """
+"""
+url {
+  src:
+    "https://github.com/janestreet/core_bench/archive/a44cc6ca9dd2c84796e73e2fd4517a79ad726285.tar.gz"
+  checksum:
+    "sha256=02e7078c36f10aebeae4605036037d9fd77019a04950aafa275d0c9e030d8d3e"
+}
diff --git a/packages/core_extended/core_extended.v0.18~preview.130.55+197/opam b/packages/core_extended/core_extended.v0.18~preview.130.74+175/opam
similarity index 57%
rename from packages/core_extended/core_extended.v0.18~preview.130.55+197/opam
rename to packages/core_extended/core_extended.v0.18~preview.130.74+175/opam
index c3c367e2d9..044f570d1a 100644
--- a/packages/core_extended/core_extended.v0.18~preview.130.55+197/opam
+++ b/packages/core_extended/core_extended.v0.18~preview.130.74+175/opam
@@ -12,15 +12,15 @@ build: [
 ]
 depends: [
   "ocaml"              {>= "5.1.0"}
-  "bin_prot"           {= "v0.18~preview.130.55+197"}
-  "core"               {= "v0.18~preview.130.55+197"}
-  "core_kernel"        {= "v0.18~preview.130.55+197"}
-  "core_unix"          {= "v0.18~preview.130.55+197"}
-  "int_repr"           {= "v0.18~preview.130.55+197"}
-  "ppx_jane"           {= "v0.18~preview.130.55+197"}
-  "ppx_stable_witness" {= "v0.18~preview.130.55+197"}
-  "record_builder"     {= "v0.18~preview.130.55+197"}
-  "sexplib"            {= "v0.18~preview.130.55+197"}
+  "bin_prot"           {= "v0.18~preview.130.74+175"}
+  "core"               {= "v0.18~preview.130.74+175"}
+  "core_kernel"        {= "v0.18~preview.130.74+175"}
+  "core_unix"          {= "v0.18~preview.130.74+175"}
+  "int_repr"           {= "v0.18~preview.130.74+175"}
+  "ppx_jane"           {= "v0.18~preview.130.74+175"}
+  "ppx_stable_witness" {= "v0.18~preview.130.74+175"}
+  "record_builder"     {= "v0.18~preview.130.74+175"}
+  "sexplib"            {= "v0.18~preview.130.74+175"}
   "dune"               {>= "3.17.0"}
   "re"                 {= "1.14.0+ox"}
 ]
@@ -34,7 +34,7 @@ largest industrial user of OCaml.
 """
 url {
   src:
-    "https://github.com/janestreet/core_extended/archive/32a6bddbbc62006fc447e33c0d8fc6cfc546bfe3.tar.gz"
+    "https://github.com/janestreet/core_extended/archive/5300dcb94cb0df343fb3bbbcdc1fef9ad6b1dd62.tar.gz"
   checksum:
-    "sha256=8f3da27b0926de9cfb4f2b9bf58961f3f33fe457ae49332dbb8054e45b9b35cc"
+    "sha256=1fdf132d446e5900a0e69faf42fd3efcdbe3377152b17a248eab69297238248f"
 }
diff --git a/packages/core_kernel/core_kernel.v0.18~preview.130.55+197/opam b/packages/core_kernel/core_kernel.v0.18~preview.130.74+175/opam
similarity index 52%
rename from packages/core_kernel/core_kernel.v0.18~preview.130.55+197/opam
rename to packages/core_kernel/core_kernel.v0.18~preview.130.74+175/opam
index 715c0dadd9..b283cb899a 100644
--- a/packages/core_kernel/core_kernel.v0.18~preview.130.55+197/opam
+++ b/packages/core_kernel/core_kernel.v0.18~preview.130.74+175/opam
@@ -12,18 +12,18 @@ build: [
 ]
 depends: [
   "ocaml"              {>= "5.1.0"}
-  "base"               {= "v0.18~preview.130.55+197"}
-  "bin_prot"           {= "v0.18~preview.130.55+197"}
-  "core"               {= "v0.18~preview.130.55+197"}
-  "int_repr"           {= "v0.18~preview.130.55+197"}
-  "parsexp"            {= "v0.18~preview.130.55+197"}
-  "ppx_jane"           {= "v0.18~preview.130.55+197"}
-  "ppx_optcomp"        {= "v0.18~preview.130.55+197"}
-  "ppx_sexp_conv"      {= "v0.18~preview.130.55+197"}
-  "ppx_stable_witness" {= "v0.18~preview.130.55+197"}
-  "sexplib"            {= "v0.18~preview.130.55+197"}
-  "univ_map"           {= "v0.18~preview.130.55+197"}
-  "uopt"               {= "v0.18~preview.130.55+197"}
+  "base"               {= "v0.18~preview.130.74+175"}
+  "bin_prot"           {= "v0.18~preview.130.74+175"}
+  "core"               {= "v0.18~preview.130.74+175"}
+  "int_repr"           {= "v0.18~preview.130.74+175"}
+  "parsexp"            {= "v0.18~preview.130.74+175"}
+  "ppx_jane"           {= "v0.18~preview.130.74+175"}
+  "ppx_optcomp"        {= "v0.18~preview.130.74+175"}
+  "ppx_sexp_conv"      {= "v0.18~preview.130.74+175"}
+  "ppx_stable_witness" {= "v0.18~preview.130.74+175"}
+  "sexplib"            {= "v0.18~preview.130.74+175"}
+  "univ_map"           {= "v0.18~preview.130.74+175"}
+  "uopt"               {= "v0.18~preview.130.74+175"}
   "base-threads"
   "dune"               {>= "3.17.0"}
 ]
@@ -38,7 +38,7 @@ Core_kernel is the system-independent part of Core.
 """
 url {
   src:
-    "https://github.com/janestreet/core_kernel/archive/d534c22a517bcc93883163b5473ed315c4a2a4e3.tar.gz"
+    "https://github.com/janestreet/core_kernel/archive/28edf2b3dbef9d01931ebe0eabcbe10c767b68c3.tar.gz"
   checksum:
-    "sha256=c046834116c92b8ec2e687b67ccea0dd1a3b9da1610970faf9ade471045838c5"
+    "sha256=9199307f51026ed78a42364b318d1a5c28f1ff94712ac64a1e03247bbdce2455"
 }
diff --git a/packages/core_profiler/core_profiler.v0.18~preview.130.55+197/opam b/packages/core_profiler/core_profiler.v0.18~preview.130.74+175/opam
similarity index 54%
rename from packages/core_profiler/core_profiler.v0.18~preview.130.55+197/opam
rename to packages/core_profiler/core_profiler.v0.18~preview.130.74+175/opam
index dff2516cdc..eaf1c4da14 100644
--- a/packages/core_profiler/core_profiler.v0.18~preview.130.55+197/opam
+++ b/packages/core_profiler/core_profiler.v0.18~preview.130.74+175/opam
@@ -12,14 +12,14 @@ build: [
 ]
 depends: [
   "ocaml"            {>= "5.1.0"}
-  "core"             {= "v0.18~preview.130.55+197"}
-  "core_kernel"      {= "v0.18~preview.130.55+197"}
-  "core_unix"        {= "v0.18~preview.130.55+197"}
-  "ppx_jane"         {= "v0.18~preview.130.55+197"}
-  "re2"              {= "v0.18~preview.130.55+197"}
-  "shell"            {= "v0.18~preview.130.55+197"}
-  "textutils"        {= "v0.18~preview.130.55+197"}
-  "textutils_kernel" {= "v0.18~preview.130.55+197"}
+  "core"             {= "v0.18~preview.130.74+175"}
+  "core_kernel"      {= "v0.18~preview.130.74+175"}
+  "core_unix"        {= "v0.18~preview.130.74+175"}
+  "ppx_jane"         {= "v0.18~preview.130.74+175"}
+  "re2"              {= "v0.18~preview.130.74+175"}
+  "shell"            {= "v0.18~preview.130.74+175"}
+  "textutils"        {= "v0.18~preview.130.74+175"}
+  "textutils_kernel" {= "v0.18~preview.130.74+175"}
   "dune"             {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -30,7 +30,7 @@ estimate various costs.
 """
 url {
   src:
-    "https://github.com/janestreet/core_profiler/archive/ea9ac4143598e5e17ae3bb14e50ac795f17b0688.tar.gz"
+    "https://github.com/janestreet/core_profiler/archive/3e585974321e717904a21ff6ad6323e788e92bef.tar.gz"
   checksum:
-    "sha256=1e292a11abb5b8f62419b123d23932b8c8e2f4fd4cd63204f109b74c4bcc82b3"
+    "sha256=c03d1bf6e296d502f6f75b78ae4b35480d8f6da76a63891d5d3ff44369815c37"
 }
diff --git a/packages/core_unix/core_unix.v0.18~preview.130.55+197/opam b/packages/core_unix/core_unix.v0.18~preview.130.55+197/opam
deleted file mode 100644
index 8bcb3f6054..0000000000
--- a/packages/core_unix/core_unix.v0.18~preview.130.55+197/opam
+++ /dev/null
@@ -1,42 +0,0 @@
-opam-version: "2.0"
-maintainer: "Jane Street developers"
-authors: ["Jane Street Group, LLC"]
-homepage: "https://github.com/janestreet/core_unix"
-bug-reports: "https://github.com/janestreet/core_unix/issues"
-dev-repo: "git+https://github.com/janestreet/core_unix.git"
-doc:
-  "https://ocaml.janestreet.com/ocaml-core/latest/doc/core_unix/index.html"
-license: "MIT"
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-]
-depends: [
-  "ocaml"                    {>= "5.1.0"}
-  "base"                     {= "v0.18~preview.130.55+197"}
-  "core"                     {= "v0.18~preview.130.55+197"}
-  "core_kernel"              {= "v0.18~preview.130.55+197"}
-  "expect_test_helpers_core" {= "v0.18~preview.130.55+197"}
-  "jane-street-headers"      {= "v0.18~preview.130.55+197"}
-  "jst-config"               {= "v0.18~preview.130.55+197"}
-  "ppx_diff"                 {= "v0.18~preview.130.55+197"}
-  "ppx_jane"                 {= "v0.18~preview.130.55+197"}
-  "ppx_optcomp"              {= "v0.18~preview.130.55+197"}
-  "ppx_stable_witness"       {= "v0.18~preview.130.55+197"}
-  "sexplib"                  {= "v0.18~preview.130.55+197"}
-  "uopt"                     {= "v0.18~preview.130.55+197"}
-  "base-threads"
-  "dune"                     {>= "3.17.0"}
-  "spawn"                    {= "v0.15.1+ox"}
-]
-available: arch != "arm32" & arch != "x86_32"
-synopsis: "Unix-specific portions of Core"
-description: """
-Unix-specific extensions to some of the modules defined in [core] and [core_kernel].
-"""
-depexts: ["linux-headers"] {os-family = "alpine"}
-url {
-  src:
-    "https://github.com/janestreet/core_unix/archive/e8ca6adf4c171386a7de475a53981825819e15f6.tar.gz"
-  checksum:
-    "sha256=bd072aef9ae9cee6a77b287d6a8a6a3bd309a1ecd6e0e3b2d5756aaf797e228a"
-}
diff --git a/packages/core_unix/core_unix.v0.18~preview.130.74+175/opam b/packages/core_unix/core_unix.v0.18~preview.130.74+175/opam
new file mode 100644
index 0000000000..22cfe85ad6
--- /dev/null
+++ b/packages/core_unix/core_unix.v0.18~preview.130.74+175/opam
@@ -0,0 +1,42 @@
+opam-version: "2.0"
+maintainer: "Jane Street developers"
+authors: ["Jane Street Group, LLC"]
+homepage: "https://github.com/janestreet/core_unix"
+bug-reports: "https://github.com/janestreet/core_unix/issues"
+dev-repo: "git+https://github.com/janestreet/core_unix.git"
+doc:
+  "https://ocaml.janestreet.com/ocaml-core/latest/doc/core_unix/index.html"
+license: "MIT"
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+]
+depends: [
+  "ocaml"                    {>= "5.1.0"}
+  "base"                     {= "v0.18~preview.130.74+175"}
+  "core"                     {= "v0.18~preview.130.74+175"}
+  "core_kernel"              {= "v0.18~preview.130.74+175"}
+  "expect_test_helpers_core" {= "v0.18~preview.130.74+175"}
+  "jane-street-headers"      {= "v0.18~preview.130.74+175"}
+  "jst-config"               {= "v0.18~preview.130.74+175"}
+  "ppx_diff"                 {= "v0.18~preview.130.74+175"}
+  "ppx_jane"                 {= "v0.18~preview.130.74+175"}
+  "ppx_optcomp"              {= "v0.18~preview.130.74+175"}
+  "ppx_stable_witness"       {= "v0.18~preview.130.74+175"}
+  "sexplib"                  {= "v0.18~preview.130.74+175"}
+  "uopt"                     {= "v0.18~preview.130.74+175"}
+  "base-threads"
+  "dune"                     {>= "3.17.0"}
+  "spawn"                    {= "v0.15.1+ox"}
+]
+available: arch != "arm32" & arch != "x86_32"
+synopsis: "Unix-specific portions of Core"
+description: """
+Unix-specific extensions to some of the modules defined in [core] and [core_kernel].
+"""
+depexts: ["linux-headers"] {os-family = "alpine"}
+url {
+  src:
+    "https://github.com/janestreet/core_unix/archive/f5564fed4b3328624ff42e38b289ada84851a82d.tar.gz"
+  checksum:
+    "sha256=f63ca3c3e418ee889a1418def0fc56f2490383ace7a80b935b9918eaf503007b"
+}
diff --git a/packages/csvfields/csvfields.v0.18~preview.130.55+197/opam b/packages/csvfields/csvfields.v0.18~preview.130.74+175/opam
similarity index 86%
rename from packages/csvfields/csvfields.v0.18~preview.130.55+197/opam
rename to packages/csvfields/csvfields.v0.18~preview.130.74+175/opam
index e069e1501c..57511906c0 100644
--- a/packages/csvfields/csvfields.v0.18~preview.130.55+197/opam
+++ b/packages/csvfields/csvfields.v0.18~preview.130.74+175/opam
@@ -12,9 +12,9 @@ build: [
 ]
 depends: [
   "ocaml"    {>= "5.1.0"}
-  "core"     {= "v0.18~preview.130.55+197"}
-  "ppx_jane" {= "v0.18~preview.130.55+197"}
-  "sexplib"  {= "v0.18~preview.130.55+197"}
+  "core"     {= "v0.18~preview.130.74+175"}
+  "ppx_jane" {= "v0.18~preview.130.74+175"}
+  "sexplib"  {= "v0.18~preview.130.74+175"}
   "dune"     {>= "3.17.0"}
   "num"
 ]
diff --git a/packages/curl_async/.generated b/packages/curl_async/.generated
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/curl_async/curl_async.v0.18~preview.130.74+175/opam b/packages/curl_async/curl_async.v0.18~preview.130.74+175/opam
new file mode 100644
index 0000000000..555cdde93e
--- /dev/null
+++ b/packages/curl_async/curl_async.v0.18~preview.130.74+175/opam
@@ -0,0 +1,35 @@
+opam-version: "2.0"
+maintainer: "Jane Street developers"
+authors: ["Jane Street Group, LLC"]
+homepage: "https://github.com/janestreet/curl_async"
+bug-reports: "https://github.com/janestreet/curl_async/issues"
+dev-repo: "git+https://github.com/janestreet/curl_async.git"
+doc:
+  "https://ocaml.janestreet.com/ocaml-core/latest/doc/curl_async/index.html"
+license: "MIT"
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+]
+depends: [
+  "ocaml"     {>= "5.1.0"}
+  "async"     {= "v0.18~preview.130.74+175"}
+  "core"      {= "v0.18~preview.130.74+175"}
+  "core_unix" {= "v0.18~preview.130.74+175"}
+  "ppx_jane"  {= "v0.18~preview.130.74+175"}
+  "curl"
+  "dune"      {>= "3.17.0"}
+]
+available: arch != "arm32" & arch != "x86_32"
+synopsis: "Curl for Async applications"
+description: """
+Provides a full-featured, performant HTTP client for OCaml with Async.
+
+Note that a libcurl build with '--disable-socketpair' is required and failures may occur
+with an OS-provided package.
+"""
+url {
+  src:
+    "https://github.com/janestreet/curl_async/archive/8376afe32530e32f023f653b54272dba99cadbc1.tar.gz"
+  checksum:
+    "sha256=507af840d75bb45626f292e455249da36fdc580d8604e174315133986704a483"
+}
diff --git a/packages/current_exe/.generated b/packages/current_exe/.generated
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/current_exe/current_exe.v0.18~preview.130.74+175/opam b/packages/current_exe/current_exe.v0.18~preview.130.74+175/opam
new file mode 100644
index 0000000000..4cc978c842
--- /dev/null
+++ b/packages/current_exe/current_exe.v0.18~preview.130.74+175/opam
@@ -0,0 +1,31 @@
+opam-version: "2.0"
+maintainer: "Jane Street developers"
+authors: ["Jane Street Group, LLC"]
+homepage: "https://github.com/janestreet/current_exe"
+bug-reports: "https://github.com/janestreet/current_exe/issues"
+dev-repo: "git+https://github.com/janestreet/current_exe.git"
+doc:
+  "https://ocaml.janestreet.com/ocaml-core/latest/doc/current_exe/index.html"
+license: "MIT"
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+]
+depends: [
+  "ocaml"     {>= "5.2.0"}
+  "core"      {= "v0.18~preview.130.74+175"}
+  "core_unix" {= "v0.18~preview.130.74+175"}
+  "ppx_jane"  {= "v0.18~preview.130.74+175"}
+  "dune"      {>= "3.17.0"}
+]
+available: arch != "arm32" & arch != "x86_32"
+synopsis:
+  "A library for getting the path to the currently running executable, with support for overriding in special environments."
+description: """
+In some environments, arg0 does not contain the path necessary to launch the current program. This library can serve as a coordination point so that environment setup code can supply the correct path to other code that will need it, without the other code having to be aware that it's in an unusual environment.
+"""
+url {
+  src:
+    "https://github.com/janestreet/current_exe/archive/531da737d7aa43baddf8651ebff946ce8412526d.tar.gz"
+  checksum:
+    "sha256=eeb4d8e84fc154963778a9ee92cca6b197591ef5f404d9ed054512a33d046776"
+}
diff --git a/packages/dedent/dedent.v0.18~preview.130.55+197/opam b/packages/dedent/dedent.v0.18~preview.130.74+175/opam
similarity index 87%
rename from packages/dedent/dedent.v0.18~preview.130.55+197/opam
rename to packages/dedent/dedent.v0.18~preview.130.74+175/opam
index ecd0130c94..26d342f9b7 100644
--- a/packages/dedent/dedent.v0.18~preview.130.55+197/opam
+++ b/packages/dedent/dedent.v0.18~preview.130.74+175/opam
@@ -11,9 +11,9 @@ build: [
 ]
 depends: [
   "ocaml"    {>= "5.1.0"}
-  "base"     {= "v0.18~preview.130.55+197"}
-  "ppx_jane" {= "v0.18~preview.130.55+197"}
-  "stdio"    {= "v0.18~preview.130.55+197"}
+  "base"     {= "v0.18~preview.130.74+175"}
+  "ppx_jane" {= "v0.18~preview.130.74+175"}
+  "stdio"    {= "v0.18~preview.130.74+175"}
   "dune"     {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/delimited_parsing/delimited_parsing.v0.18~preview.130.55+197/opam b/packages/delimited_parsing/delimited_parsing.v0.18~preview.130.74+175/opam
similarity index 83%
rename from packages/delimited_parsing/delimited_parsing.v0.18~preview.130.55+197/opam
rename to packages/delimited_parsing/delimited_parsing.v0.18~preview.130.74+175/opam
index fd3432096e..b691286235 100644
--- a/packages/delimited_parsing/delimited_parsing.v0.18~preview.130.55+197/opam
+++ b/packages/delimited_parsing/delimited_parsing.v0.18~preview.130.74+175/opam
@@ -12,10 +12,10 @@ build: [
 ]
 depends: [
   "ocaml"         {>= "5.1.0"}
-  "async"         {= "v0.18~preview.130.55+197"}
-  "core"          {= "v0.18~preview.130.55+197"}
-  "core_extended" {= "v0.18~preview.130.55+197"}
-  "ppx_jane"      {= "v0.18~preview.130.55+197"}
+  "async"         {= "v0.18~preview.130.74+175"}
+  "core"          {= "v0.18~preview.130.74+175"}
+  "core_extended" {= "v0.18~preview.130.74+175"}
+  "ppx_jane"      {= "v0.18~preview.130.74+175"}
   "dune"          {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/ecaml/ecaml.v0.18~preview.130.55+197/opam b/packages/ecaml/ecaml.v0.18~preview.130.55+197/opam
deleted file mode 100644
index 5e2280a6e8..0000000000
--- a/packages/ecaml/ecaml.v0.18~preview.130.55+197/opam
+++ /dev/null
@@ -1,42 +0,0 @@
-opam-version: "2.0"
-maintainer: "Jane Street developers"
-authors: ["Jane Street Group, LLC"]
-homepage: "https://github.com/janestreet/ecaml"
-bug-reports: "https://github.com/janestreet/ecaml/issues"
-dev-repo: "git+https://github.com/janestreet/ecaml.git"
-doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/ecaml/index.html"
-license: "MIT"
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-]
-depends: [
-  "ocaml"                    {>= "5.1.0"}
-  "async"                    {= "v0.18~preview.130.55+197"}
-  "async_kernel"             {= "v0.18~preview.130.55+197"}
-  "async_unix"               {= "v0.18~preview.130.55+197"}
-  "base"                     {= "v0.18~preview.130.55+197"}
-  "core"                     {= "v0.18~preview.130.55+197"}
-  "core_kernel"              {= "v0.18~preview.130.55+197"}
-  "core_unix"                {= "v0.18~preview.130.55+197"}
-  "expect_test_helpers_core" {= "v0.18~preview.130.55+197"}
-  "file_path"                {= "v0.18~preview.130.55+197"}
-  "ppx_expect"               {= "v0.18~preview.130.55+197"}
-  "ppx_jane"                 {= "v0.18~preview.130.55+197"}
-  "sexp_pretty"              {= "v0.18~preview.130.55+197"}
-  "sexplib"                  {= "v0.18~preview.130.55+197"}
-  "dune"                     {>= "3.17.0"}
-  "memtrace"                 {>= "0.2.1.2"}
-  "uutf"                     {= "1.0.3+ox"}
-]
-available: arch != "arm32" & arch != "x86_32"
-synopsis: "Library for writing Emacs plugin in OCaml"
-description: """
-Ecaml is a library for writing Emacs plugins in OCaml. It uses Emacs
-25 support for plugins to load native OCaml compiled code.
-"""
-url {
-  src:
-    "https://github.com/janestreet/ecaml/archive/3753b3ec1324a67dcee82091f1319b69751800c6.tar.gz"
-  checksum:
-    "sha256=c5b0cb94ccd53ebc81b04b9f36cb2b003c36d2755823074a040ab76c8cf69890"
-}
diff --git a/packages/ecaml/ecaml.v0.18~preview.130.74+175/opam b/packages/ecaml/ecaml.v0.18~preview.130.74+175/opam
new file mode 100644
index 0000000000..d9fe627d7b
--- /dev/null
+++ b/packages/ecaml/ecaml.v0.18~preview.130.74+175/opam
@@ -0,0 +1,42 @@
+opam-version: "2.0"
+maintainer: "Jane Street developers"
+authors: ["Jane Street Group, LLC"]
+homepage: "https://github.com/janestreet/ecaml"
+bug-reports: "https://github.com/janestreet/ecaml/issues"
+dev-repo: "git+https://github.com/janestreet/ecaml.git"
+doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/ecaml/index.html"
+license: "MIT"
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+]
+depends: [
+  "ocaml"                    {>= "5.1.0"}
+  "async"                    {= "v0.18~preview.130.74+175"}
+  "async_kernel"             {= "v0.18~preview.130.74+175"}
+  "async_unix"               {= "v0.18~preview.130.74+175"}
+  "base"                     {= "v0.18~preview.130.74+175"}
+  "core"                     {= "v0.18~preview.130.74+175"}
+  "core_kernel"              {= "v0.18~preview.130.74+175"}
+  "core_unix"                {= "v0.18~preview.130.74+175"}
+  "expect_test_helpers_core" {= "v0.18~preview.130.74+175"}
+  "file_path"                {= "v0.18~preview.130.74+175"}
+  "ppx_expect"               {= "v0.18~preview.130.74+175"}
+  "ppx_jane"                 {= "v0.18~preview.130.74+175"}
+  "sexp_pretty"              {= "v0.18~preview.130.74+175"}
+  "sexplib"                  {= "v0.18~preview.130.74+175"}
+  "dune"                     {>= "3.17.0"}
+  "memtrace"                 {>= "0.2.1.2"}
+  "uutf"                     {= "1.0.3+ox"}
+]
+available: arch != "arm32" & arch != "x86_32"
+synopsis: "Library for writing Emacs plugin in OCaml"
+description: """
+Ecaml is a library for writing Emacs plugins in OCaml. It uses Emacs
+25 support for plugins to load native OCaml compiled code.
+"""
+url {
+  src:
+    "https://github.com/janestreet/ecaml/archive/72f49867a23142e4bc149a9bece1171cbef6347a.tar.gz"
+  checksum:
+    "sha256=baae69d440791abee0ca17c5f9065f287fefd80f5aa15e84d320ad5de29031db"
+}
diff --git a/packages/email_message/email_message.v0.18~preview.130.55+197/opam b/packages/email_message/email_message.v0.18~preview.130.74+175/opam
similarity index 61%
rename from packages/email_message/email_message.v0.18~preview.130.55+197/opam
rename to packages/email_message/email_message.v0.18~preview.130.74+175/opam
index c36795b123..54fbf36b95 100644
--- a/packages/email_message/email_message.v0.18~preview.130.55+197/opam
+++ b/packages/email_message/email_message.v0.18~preview.130.74+175/opam
@@ -12,12 +12,12 @@ build: [
 ]
 depends: [
   "ocaml"       {>= "5.1.0"}
-  "async"       {= "v0.18~preview.130.55+197"}
-  "core"        {= "v0.18~preview.130.55+197"}
-  "core_kernel" {= "v0.18~preview.130.55+197"}
-  "core_unix"   {= "v0.18~preview.130.55+197"}
-  "ppx_jane"    {= "v0.18~preview.130.55+197"}
-  "re2"         {= "v0.18~preview.130.55+197"}
+  "async"       {= "v0.18~preview.130.74+175"}
+  "core"        {= "v0.18~preview.130.74+175"}
+  "core_kernel" {= "v0.18~preview.130.74+175"}
+  "core_unix"   {= "v0.18~preview.130.74+175"}
+  "ppx_jane"    {= "v0.18~preview.130.74+175"}
+  "re2"         {= "v0.18~preview.130.74+175"}
   "angstrom"    {>= "0.15.0"}
   "base64"      {>= "3.4.0"}
   "cryptokit"   {>= "1.16" & < "1.17"}
@@ -30,7 +30,7 @@ description: """
 """
 url {
   src:
-    "https://github.com/janestreet/email_message/archive/77635fe0e4f0d7846b303d86de3d402233f2eaac.tar.gz"
+    "https://github.com/janestreet/email_message/archive/e105439d6a796df71f6fc0bc06e249702e4dfb12.tar.gz"
   checksum:
-    "sha256=dc4a4010ed577ff77a7b38bb85cbc2c2fd402e0ab6fe3fe9cde83e4989f5ad42"
+    "sha256=7a8f5c7cbe5b6d373b510487d7963d2be14767ed91e68510f6a63b611998491f"
 }
diff --git a/packages/env_config/env_config.v0.18~preview.130.55+197/opam b/packages/env_config/env_config.v0.18~preview.130.74+175/opam
similarity index 79%
rename from packages/env_config/env_config.v0.18~preview.130.55+197/opam
rename to packages/env_config/env_config.v0.18~preview.130.74+175/opam
index d7a8e12dc4..094a07c8b2 100644
--- a/packages/env_config/env_config.v0.18~preview.130.55+197/opam
+++ b/packages/env_config/env_config.v0.18~preview.130.74+175/opam
@@ -12,12 +12,12 @@ build: [
 ]
 depends: [
   "ocaml"        {>= "5.1.0"}
-  "async_kernel" {= "v0.18~preview.130.55+197"}
-  "async_log"    {= "v0.18~preview.130.55+197"}
-  "async_unix"   {= "v0.18~preview.130.55+197"}
-  "core"         {= "v0.18~preview.130.55+197"}
-  "core_unix"    {= "v0.18~preview.130.55+197"}
-  "ppx_jane"     {= "v0.18~preview.130.55+197"}
+  "async_kernel" {= "v0.18~preview.130.74+175"}
+  "async_log"    {= "v0.18~preview.130.74+175"}
+  "async_unix"   {= "v0.18~preview.130.74+175"}
+  "core"         {= "v0.18~preview.130.74+175"}
+  "core_unix"    {= "v0.18~preview.130.74+175"}
+  "ppx_jane"     {= "v0.18~preview.130.74+175"}
   "dune"         {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/expect_test_helpers_async/expect_test_helpers_async.v0.18~preview.130.55+197/opam b/packages/expect_test_helpers_async/expect_test_helpers_async.v0.18~preview.130.74+175/opam
similarity index 66%
rename from packages/expect_test_helpers_async/expect_test_helpers_async.v0.18~preview.130.55+197/opam
rename to packages/expect_test_helpers_async/expect_test_helpers_async.v0.18~preview.130.74+175/opam
index f571b514d2..56d6644cd4 100644
--- a/packages/expect_test_helpers_async/expect_test_helpers_async.v0.18~preview.130.55+197/opam
+++ b/packages/expect_test_helpers_async/expect_test_helpers_async.v0.18~preview.130.74+175/opam
@@ -12,12 +12,12 @@ build: [
 ]
 depends: [
   "ocaml"                    {>= "5.1.0"}
-  "async"                    {= "v0.18~preview.130.55+197"}
-  "core"                     {= "v0.18~preview.130.55+197"}
-  "core_unix"                {= "v0.18~preview.130.55+197"}
-  "expect_test_helpers_core" {= "v0.18~preview.130.55+197"}
-  "ppx_jane"                 {= "v0.18~preview.130.55+197"}
-  "sexp_pretty"              {= "v0.18~preview.130.55+197"}
+  "async"                    {= "v0.18~preview.130.74+175"}
+  "core"                     {= "v0.18~preview.130.74+175"}
+  "core_unix"                {= "v0.18~preview.130.74+175"}
+  "expect_test_helpers_core" {= "v0.18~preview.130.74+175"}
+  "ppx_jane"                 {= "v0.18~preview.130.74+175"}
+  "sexp_pretty"              {= "v0.18~preview.130.74+175"}
   "dune"                     {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -30,7 +30,7 @@ look at expect_test_helpers_core.
 """
 url {
   src:
-    "https://github.com/janestreet/expect_test_helpers_async/archive/d09bcfe15c0d06f8d290c5ebfcb4ff967b4edfa3.tar.gz"
+    "https://github.com/janestreet/expect_test_helpers_async/archive/0c577424b119d1f62b6b1bd7f546d664d772f291.tar.gz"
   checksum:
-    "sha256=4c3bac7fa3574f9d2dc5d6e06a5a9d389e813e0f17ae97bf4f50bf4281bd6e56"
+    "sha256=a98fc8168caa3ed4a9011a7dbba8682bd081b48ee67d88d75d39636433b485cf"
 }
diff --git a/packages/expect_test_helpers_core/expect_test_helpers_core.v0.18~preview.130.55+197/opam b/packages/expect_test_helpers_core/expect_test_helpers_core.v0.18~preview.130.74+175/opam
similarity index 75%
rename from packages/expect_test_helpers_core/expect_test_helpers_core.v0.18~preview.130.55+197/opam
rename to packages/expect_test_helpers_core/expect_test_helpers_core.v0.18~preview.130.74+175/opam
index ce351c9516..efe36621b6 100644
--- a/packages/expect_test_helpers_core/expect_test_helpers_core.v0.18~preview.130.55+197/opam
+++ b/packages/expect_test_helpers_core/expect_test_helpers_core.v0.18~preview.130.74+175/opam
@@ -12,13 +12,13 @@ build: [
 ]
 depends: [
   "ocaml"           {>= "5.1.0"}
-  "base"            {= "v0.18~preview.130.55+197"}
-  "base_quickcheck" {= "v0.18~preview.130.55+197"}
-  "core"            {= "v0.18~preview.130.55+197"}
-  "portable"        {= "v0.18~preview.130.55+197"}
-  "ppx_jane"        {= "v0.18~preview.130.55+197"}
-  "sexp_pretty"     {= "v0.18~preview.130.55+197"}
-  "stdio"           {= "v0.18~preview.130.55+197"}
+  "base"            {= "v0.18~preview.130.74+175"}
+  "base_quickcheck" {= "v0.18~preview.130.74+175"}
+  "core"            {= "v0.18~preview.130.74+175"}
+  "portable"        {= "v0.18~preview.130.74+175"}
+  "ppx_jane"        {= "v0.18~preview.130.74+175"}
+  "sexp_pretty"     {= "v0.18~preview.130.74+175"}
+  "stdio"           {= "v0.18~preview.130.74+175"}
   "dune"            {>= "3.17.0"}
   "re"              {= "1.14.0+ox"}
 ]
diff --git a/packages/expectable/expectable.v0.18~preview.130.55+197/opam b/packages/expectable/expectable.v0.18~preview.130.74+175/opam
similarity index 85%
rename from packages/expectable/expectable.v0.18~preview.130.55+197/opam
rename to packages/expectable/expectable.v0.18~preview.130.74+175/opam
index b78e2cc257..4036a1d87d 100644
--- a/packages/expectable/expectable.v0.18~preview.130.55+197/opam
+++ b/packages/expectable/expectable.v0.18~preview.130.74+175/opam
@@ -12,10 +12,10 @@ build: [
 ]
 depends: [
   "ocaml"     {>= "4.14.0"}
-  "base"      {= "v0.18~preview.130.55+197"}
-  "core"      {= "v0.18~preview.130.55+197"}
-  "ppx_jane"  {= "v0.18~preview.130.55+197"}
-  "textutils" {= "v0.18~preview.130.55+197"}
+  "base"      {= "v0.18~preview.130.74+175"}
+  "core"      {= "v0.18~preview.130.74+175"}
+  "ppx_jane"  {= "v0.18~preview.130.74+175"}
+  "textutils" {= "v0.18~preview.130.74+175"}
   "dune"      {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/expectree/expectree.v0.18~preview.130.55+197/opam b/packages/expectree/expectree.v0.18~preview.130.74+175/opam
similarity index 88%
rename from packages/expectree/expectree.v0.18~preview.130.55+197/opam
rename to packages/expectree/expectree.v0.18~preview.130.74+175/opam
index b99ba7c852..81cb42a095 100644
--- a/packages/expectree/expectree.v0.18~preview.130.55+197/opam
+++ b/packages/expectree/expectree.v0.18~preview.130.74+175/opam
@@ -12,9 +12,9 @@ build: [
 ]
 depends: [
   "ocaml"    {>= "5.1.0"}
-  "base"     {= "v0.18~preview.130.55+197"}
-  "core"     {= "v0.18~preview.130.55+197"}
-  "ppx_jane" {= "v0.18~preview.130.55+197"}
+  "base"     {= "v0.18~preview.130.74+175"}
+  "core"     {= "v0.18~preview.130.74+175"}
+  "ppx_jane" {= "v0.18~preview.130.74+175"}
   "dune"     {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/fieldslib/fieldslib.v0.18~preview.130.55+197/opam b/packages/fieldslib/fieldslib.v0.18~preview.130.74+175/opam
similarity index 96%
rename from packages/fieldslib/fieldslib.v0.18~preview.130.55+197/opam
rename to packages/fieldslib/fieldslib.v0.18~preview.130.74+175/opam
index 453d0e23c5..0f855c42d9 100644
--- a/packages/fieldslib/fieldslib.v0.18~preview.130.55+197/opam
+++ b/packages/fieldslib/fieldslib.v0.18~preview.130.74+175/opam
@@ -12,7 +12,7 @@ build: [
 ]
 depends: [
   "ocaml" {>= "5.1.0"}
-  "base"  {= "v0.18~preview.130.55+197"}
+  "base"  {= "v0.18~preview.130.74+175"}
   "dune"  {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/file_path/file_path.v0.18~preview.130.55+197/opam b/packages/file_path/file_path.v0.18~preview.130.74+175/opam
similarity index 52%
rename from packages/file_path/file_path.v0.18~preview.130.55+197/opam
rename to packages/file_path/file_path.v0.18~preview.130.74+175/opam
index 22d5be4183..aad7ee1f87 100644
--- a/packages/file_path/file_path.v0.18~preview.130.55+197/opam
+++ b/packages/file_path/file_path.v0.18~preview.130.74+175/opam
@@ -12,14 +12,14 @@ build: [
 ]
 depends: [
   "ocaml"                     {>= "5.1.0"}
-  "async"                     {= "v0.18~preview.130.55+197"}
-  "core"                      {= "v0.18~preview.130.55+197"}
-  "core_kernel"               {= "v0.18~preview.130.55+197"}
-  "core_unix"                 {= "v0.18~preview.130.55+197"}
-  "expect_test_helpers_async" {= "v0.18~preview.130.55+197"}
-  "expect_test_helpers_core"  {= "v0.18~preview.130.55+197"}
-  "ppx_jane"                  {= "v0.18~preview.130.55+197"}
-  "ppx_stable_witness"        {= "v0.18~preview.130.55+197"}
+  "async"                     {= "v0.18~preview.130.74+175"}
+  "core"                      {= "v0.18~preview.130.74+175"}
+  "core_kernel"               {= "v0.18~preview.130.74+175"}
+  "core_unix"                 {= "v0.18~preview.130.74+175"}
+  "expect_test_helpers_async" {= "v0.18~preview.130.74+175"}
+  "expect_test_helpers_core"  {= "v0.18~preview.130.74+175"}
+  "ppx_jane"                  {= "v0.18~preview.130.74+175"}
+  "ppx_stable_witness"        {= "v0.18~preview.130.74+175"}
   "dune"                      {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -29,7 +29,7 @@ A library for typed manipulation of UNIX-style file paths.
 """
 url {
   src:
-    "https://github.com/janestreet/file_path/archive/2a222889cea98598e0ef1153f044215fc7d594d7.tar.gz"
+    "https://github.com/janestreet/file_path/archive/c976c8df8f9d3ebbd1bfa47fd729ed2a3060a3a0.tar.gz"
   checksum:
-    "sha256=e3570af921daa903a5e90830785db94f41e298ea6c2b8529a70d6a9418f1f0f6"
+    "sha256=8cfb4f8523600be3fb7ff2cc53fdf071b8e2c2f25258fcee908da2dbaf9dfb57"
 }
diff --git a/packages/filesystem/filesystem.v0.18~preview.130.55+197/opam b/packages/filesystem/filesystem.v0.18~preview.130.74+175/opam
similarity index 58%
rename from packages/filesystem/filesystem.v0.18~preview.130.55+197/opam
rename to packages/filesystem/filesystem.v0.18~preview.130.74+175/opam
index 47ade21b49..3aabd92cb0 100644
--- a/packages/filesystem/filesystem.v0.18~preview.130.55+197/opam
+++ b/packages/filesystem/filesystem.v0.18~preview.130.74+175/opam
@@ -12,13 +12,13 @@ build: [
 ]
 depends: [
   "ocaml"        {>= "5.1.0"}
-  "async_kernel" {= "v0.18~preview.130.55+197"}
-  "async_log"    {= "v0.18~preview.130.55+197"}
-  "async_unix"   {= "v0.18~preview.130.55+197"}
-  "core"         {= "v0.18~preview.130.55+197"}
-  "core_unix"    {= "v0.18~preview.130.55+197"}
-  "file_path"    {= "v0.18~preview.130.55+197"}
-  "ppx_jane"     {= "v0.18~preview.130.55+197"}
+  "async_kernel" {= "v0.18~preview.130.74+175"}
+  "async_log"    {= "v0.18~preview.130.74+175"}
+  "async_unix"   {= "v0.18~preview.130.74+175"}
+  "core"         {= "v0.18~preview.130.74+175"}
+  "core_unix"    {= "v0.18~preview.130.74+175"}
+  "file_path"    {= "v0.18~preview.130.74+175"}
+  "ppx_jane"     {= "v0.18~preview.130.74+175"}
   "dune"         {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -28,7 +28,7 @@ A library for filesystem operations with the file_path library.
 """
 url {
   src:
-    "https://github.com/janestreet/filesystem/archive/b41367601f40b1ac848f68e6a0fbf2af9700678d.tar.gz"
+    "https://github.com/janestreet/filesystem/archive/2ee091ee5e6f59026750925d376525eda5227e9f.tar.gz"
   checksum:
-    "sha256=75c00de33e070ed119501c2132c75cedfefed94f3767a276fdb590a3a203b82d"
+    "sha256=a024b02118ff2adcb083ab882907c07fe65cd70fd17faaec26c3e4628b3c6197"
 }
diff --git a/packages/flexible_sexp/flexible_sexp.v0.18~preview.130.55+197/opam b/packages/flexible_sexp/flexible_sexp.v0.18~preview.130.74+175/opam
similarity index 77%
rename from packages/flexible_sexp/flexible_sexp.v0.18~preview.130.55+197/opam
rename to packages/flexible_sexp/flexible_sexp.v0.18~preview.130.74+175/opam
index 6568a6e216..affd2a248d 100644
--- a/packages/flexible_sexp/flexible_sexp.v0.18~preview.130.55+197/opam
+++ b/packages/flexible_sexp/flexible_sexp.v0.18~preview.130.74+175/opam
@@ -12,10 +12,10 @@ build: [
 ]
 depends: [
   "ocaml"       {>= "5.1.0"}
-  "basement"    {= "v0.18~preview.130.55+197"}
-  "core"        {= "v0.18~preview.130.55+197"}
-  "ppx_jane"    {= "v0.18~preview.130.55+197"}
-  "string_dict" {= "v0.18~preview.130.55+197"}
+  "basement"    {= "v0.18~preview.130.74+175"}
+  "core"        {= "v0.18~preview.130.74+175"}
+  "ppx_jane"    {= "v0.18~preview.130.74+175"}
+  "string_dict" {= "v0.18~preview.130.74+175"}
   "dune"        {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -38,7 +38,7 @@ Using flexible_sexp one can achieve the following:
 """
 url {
   src:
-    "https://github.com/janestreet/flexible_sexp/archive/cc080de6a380ffa09e5e41bd4c9a97e1b8ae756d.tar.gz"
+    "https://github.com/janestreet/flexible_sexp/archive/f039bd701d2a34c1121a6dcdeb9663ba3963adb8.tar.gz"
   checksum:
-    "sha256=21d942775c9476affda708cc266a48f9efe33fe12964709a8a78f781c2070d58"
+    "sha256=0629fdf7a7da0ddeb1603f290874b37508de5a21b2c0f635f09e09b5afeb113b"
 }
diff --git a/packages/float_array/float_array.v0.18~preview.130.55+197/opam b/packages/float_array/float_array.v0.18~preview.130.74+175/opam
similarity index 87%
rename from packages/float_array/float_array.v0.18~preview.130.55+197/opam
rename to packages/float_array/float_array.v0.18~preview.130.74+175/opam
index febd53cd4d..2b4efedbe2 100644
--- a/packages/float_array/float_array.v0.18~preview.130.55+197/opam
+++ b/packages/float_array/float_array.v0.18~preview.130.74+175/opam
@@ -12,9 +12,9 @@ build: [
 ]
 depends: [
   "ocaml"    {>= "5.2.0"}
-  "bin_prot" {= "v0.18~preview.130.55+197"}
-  "core"     {= "v0.18~preview.130.55+197"}
-  "ppx_jane" {= "v0.18~preview.130.55+197"}
+  "bin_prot" {= "v0.18~preview.130.74+175"}
+  "core"     {= "v0.18~preview.130.74+175"}
+  "ppx_jane" {= "v0.18~preview.130.74+175"}
   "dune"     {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/font_awesome_icons/font_awesome_icons.v0.18~preview.130.55+197/opam b/packages/font_awesome_icons/font_awesome_icons.v0.18~preview.130.74+175/opam
similarity index 65%
rename from packages/font_awesome_icons/font_awesome_icons.v0.18~preview.130.55+197/opam
rename to packages/font_awesome_icons/font_awesome_icons.v0.18~preview.130.74+175/opam
index c4c8a37314..e70bfd8137 100644
--- a/packages/font_awesome_icons/font_awesome_icons.v0.18~preview.130.55+197/opam
+++ b/packages/font_awesome_icons/font_awesome_icons.v0.18~preview.130.74+175/opam
@@ -12,11 +12,11 @@ build: [
 ]
 depends: [
   "ocaml"      {>= "5.1.0"}
-  "async"      {= "v0.18~preview.130.55+197"}
-  "async_unix" {= "v0.18~preview.130.55+197"}
-  "core"       {= "v0.18~preview.130.55+197"}
-  "core_unix"  {= "v0.18~preview.130.55+197"}
-  "ppx_jane"   {= "v0.18~preview.130.55+197"}
+  "async"      {= "v0.18~preview.130.74+175"}
+  "async_unix" {= "v0.18~preview.130.74+175"}
+  "core"       {= "v0.18~preview.130.74+175"}
+  "core_unix"  {= "v0.18~preview.130.74+175"}
+  "ppx_jane"   {= "v0.18~preview.130.74+175"}
   "dune"       {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -26,7 +26,7 @@ This library contains the free brands, regular and solid SVG icons from Font-Awe
 """
 url {
   src:
-    "https://github.com/janestreet/font_awesome_icons/archive/baf4982bd5fe9437904f52fae9dbb2a6c04896d4.tar.gz"
+    "https://github.com/janestreet/font_awesome_icons/archive/04c381c5b120e5922864952958014f186ecaaabb.tar.gz"
   checksum:
-    "sha256=5b8ff1ee630179c2a0ec27541572437d12ea7facbbd2510d294fa869a4edfcbc"
+    "sha256=2551160d3b596c6a435e5c9b1c84416310922180aff57bdb894818a8aa4e4f06"
 }
diff --git a/packages/fuzzy_match/fuzzy_match.v0.18~preview.130.55+197/opam b/packages/fuzzy_match/fuzzy_match.v0.18~preview.130.74+175/opam
similarity index 90%
rename from packages/fuzzy_match/fuzzy_match.v0.18~preview.130.55+197/opam
rename to packages/fuzzy_match/fuzzy_match.v0.18~preview.130.74+175/opam
index 88120a85c4..29143c5b68 100644
--- a/packages/fuzzy_match/fuzzy_match.v0.18~preview.130.55+197/opam
+++ b/packages/fuzzy_match/fuzzy_match.v0.18~preview.130.74+175/opam
@@ -12,8 +12,8 @@ build: [
 ]
 depends: [
   "ocaml"    {>= "5.1.0"}
-  "core"     {= "v0.18~preview.130.55+197"}
-  "ppx_jane" {= "v0.18~preview.130.55+197"}
+  "core"     {= "v0.18~preview.130.74+175"}
+  "ppx_jane" {= "v0.18~preview.130.74+175"}
   "dune"     {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/fzf/fzf.v0.18~preview.130.55+197/opam b/packages/fzf/fzf.v0.18~preview.130.74+175/opam
similarity index 62%
rename from packages/fzf/fzf.v0.18~preview.130.55+197/opam
rename to packages/fzf/fzf.v0.18~preview.130.74+175/opam
index 423a25bb50..15aa3553b1 100644
--- a/packages/fzf/fzf.v0.18~preview.130.55+197/opam
+++ b/packages/fzf/fzf.v0.18~preview.130.74+175/opam
@@ -11,11 +11,11 @@ build: [
 ]
 depends: [
   "ocaml"       {>= "5.1.0"}
-  "async"       {= "v0.18~preview.130.55+197"}
-  "core"        {= "v0.18~preview.130.55+197"}
-  "core_kernel" {= "v0.18~preview.130.55+197"}
-  "core_unix"   {= "v0.18~preview.130.55+197"}
-  "ppx_jane"    {= "v0.18~preview.130.55+197"}
+  "async"       {= "v0.18~preview.130.74+175"}
+  "core"        {= "v0.18~preview.130.74+175"}
+  "core_kernel" {= "v0.18~preview.130.74+175"}
+  "core_unix"   {= "v0.18~preview.130.74+175"}
+  "ppx_jane"    {= "v0.18~preview.130.74+175"}
   "dune"        {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -25,7 +25,7 @@ A library for running the fzf command line fuzzy matcher
 """
 url {
   src:
-    "https://github.com/janestreet/fzf/archive/0439828d50e012e3893ace047554bccee9ca4342.tar.gz"
+    "https://github.com/janestreet/fzf/archive/b6a39d5cc6a136f85bef9c9a579c755096cfd04a.tar.gz"
   checksum:
-    "sha256=b31d35d7600d77dd25b8518f25e5eede7916faca8f6ac304ff9e9177108d8d22"
+    "sha256=197b501ef908cec8d31c7ffaed231c02ef2666be28fbf2aef867f3fd89ac1ff8"
 }
diff --git a/packages/hardcaml/hardcaml.v0.18~preview.130.55+197/opam b/packages/hardcaml/hardcaml.v0.18~preview.130.74+175/opam
similarity index 53%
rename from packages/hardcaml/hardcaml.v0.18~preview.130.55+197/opam
rename to packages/hardcaml/hardcaml.v0.18~preview.130.74+175/opam
index 0e884c1df4..6fa634d2be 100644
--- a/packages/hardcaml/hardcaml.v0.18~preview.130.55+197/opam
+++ b/packages/hardcaml/hardcaml.v0.18~preview.130.74+175/opam
@@ -11,19 +11,19 @@ build: [
 ]
 depends: [
   "ocaml"             {>= "5.1.0"}
-  "base"              {= "v0.18~preview.130.55+197"}
-  "bignum"            {= "v0.18~preview.130.55+197"}
-  "bin_prot"          {= "v0.18~preview.130.55+197"}
-  "core"              {= "v0.18~preview.130.55+197"}
-  "core_kernel"       {= "v0.18~preview.130.55+197"}
-  "jane_rope"         {= "v0.18~preview.130.55+197"}
-  "ppx_compare"       {= "v0.18~preview.130.55+197"}
-  "ppx_jane"          {= "v0.18~preview.130.55+197"}
-  "ppx_rope"          {= "v0.18~preview.130.55+197"}
-  "ppx_sexp_conv"     {= "v0.18~preview.130.55+197"}
-  "sexplib"           {= "v0.18~preview.130.55+197"}
-  "splittable_random" {= "v0.18~preview.130.55+197"}
-  "stdio"             {= "v0.18~preview.130.55+197"}
+  "base"              {= "v0.18~preview.130.74+175"}
+  "bignum"            {= "v0.18~preview.130.74+175"}
+  "bin_prot"          {= "v0.18~preview.130.74+175"}
+  "core"              {= "v0.18~preview.130.74+175"}
+  "core_kernel"       {= "v0.18~preview.130.74+175"}
+  "jane_rope"         {= "v0.18~preview.130.74+175"}
+  "ppx_compare"       {= "v0.18~preview.130.74+175"}
+  "ppx_jane"          {= "v0.18~preview.130.74+175"}
+  "ppx_rope"          {= "v0.18~preview.130.74+175"}
+  "ppx_sexp_conv"     {= "v0.18~preview.130.74+175"}
+  "sexplib"           {= "v0.18~preview.130.74+175"}
+  "splittable_random" {= "v0.18~preview.130.74+175"}
+  "stdio"             {= "v0.18~preview.130.74+175"}
   "dune"              {>= "3.17.0"}
   "ppxlib"            {= "0.33.0+ox"}
 ]
@@ -38,7 +38,7 @@ VHDL to interact with standard back end tooling.
 """
 url {
   src:
-    "https://github.com/janestreet/hardcaml/archive/b40b4cabb7cdd8aceb369bcacdf00f71ff35f54f.tar.gz"
+    "https://github.com/janestreet/hardcaml/archive/277cd1f3a830553a51f687f2dda72e68aafe29a3.tar.gz"
   checksum:
-    "sha256=bd3a60efd19eb60d6eb6004b0c4f207ab2fbd29d5b45c6576028ce75d26b6e9f"
+    "sha256=b4906948e18fb81ea48527dcab9a744538fb1620198ec2f1c29399e7185b8545"
 }
diff --git a/packages/hardcaml_axi/hardcaml_axi.v0.18~preview.130.55+197/opam b/packages/hardcaml_axi/hardcaml_axi.v0.18~preview.130.74+175/opam
similarity index 53%
rename from packages/hardcaml_axi/hardcaml_axi.v0.18~preview.130.55+197/opam
rename to packages/hardcaml_axi/hardcaml_axi.v0.18~preview.130.74+175/opam
index 7fee910f92..ae1a4f923b 100644
--- a/packages/hardcaml_axi/hardcaml_axi.v0.18~preview.130.55+197/opam
+++ b/packages/hardcaml_axi/hardcaml_axi.v0.18~preview.130.74+175/opam
@@ -12,14 +12,14 @@ build: [
 ]
 depends: [
   "ocaml"              {>= "5.1.0"}
-  "base"               {= "v0.18~preview.130.55+197"}
-  "core"               {= "v0.18~preview.130.55+197"}
-  "hardcaml"           {= "v0.18~preview.130.55+197"}
-  "hardcaml_circuits"  {= "v0.18~preview.130.55+197"}
-  "hardcaml_handshake" {= "v0.18~preview.130.55+197"}
-  "ppx_hardcaml"       {= "v0.18~preview.130.55+197"}
-  "ppx_jane"           {= "v0.18~preview.130.55+197"}
-  "stdio"              {= "v0.18~preview.130.55+197"}
+  "base"               {= "v0.18~preview.130.74+175"}
+  "core"               {= "v0.18~preview.130.74+175"}
+  "hardcaml"           {= "v0.18~preview.130.74+175"}
+  "hardcaml_circuits"  {= "v0.18~preview.130.74+175"}
+  "hardcaml_handshake" {= "v0.18~preview.130.74+175"}
+  "ppx_hardcaml"       {= "v0.18~preview.130.74+175"}
+  "ppx_jane"           {= "v0.18~preview.130.74+175"}
+  "stdio"              {= "v0.18~preview.130.74+175"}
   "dune"               {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -29,7 +29,7 @@ AXI Lite, Full and Stream Interfaces for Hardcaml
 """
 url {
   src:
-    "https://github.com/janestreet/hardcaml_axi/archive/7f3c10eefb8aefe3271baa6eb98378ef22dba15d.tar.gz"
+    "https://github.com/janestreet/hardcaml_axi/archive/7a42ad2b52dfb70bed5b3eec2f29b50ad74c0707.tar.gz"
   checksum:
-    "sha256=10525a67cfdc8a78dcd002b731aa669f619b53ae905a29fe622746c35e38aaf8"
+    "sha256=91f428c6c879d442ca1141ab887bce171506ac865d3532c31bcf428132277f9d"
 }
diff --git a/packages/hardcaml_c/hardcaml_c.v0.18~preview.130.55+197/opam b/packages/hardcaml_c/hardcaml_c.v0.18~preview.130.74+175/opam
similarity index 62%
rename from packages/hardcaml_c/hardcaml_c.v0.18~preview.130.55+197/opam
rename to packages/hardcaml_c/hardcaml_c.v0.18~preview.130.74+175/opam
index d7b2bb1f28..3838922621 100644
--- a/packages/hardcaml_c/hardcaml_c.v0.18~preview.130.55+197/opam
+++ b/packages/hardcaml_c/hardcaml_c.v0.18~preview.130.74+175/opam
@@ -12,15 +12,15 @@ build: [
 ]
 depends: [
   "ocaml"          {>= "5.1.0"}
-  "core"           {= "v0.18~preview.130.55+197"}
-  "core_unix"      {= "v0.18~preview.130.55+197"}
-  "hardcaml"       {= "v0.18~preview.130.55+197"}
-  "jane_rope"      {= "v0.18~preview.130.55+197"}
-  "ppx_hardcaml"   {= "v0.18~preview.130.55+197"}
-  "ppx_jane"       {= "v0.18~preview.130.55+197"}
-  "ppx_rope"       {= "v0.18~preview.130.55+197"}
+  "core"           {= "v0.18~preview.130.74+175"}
+  "core_unix"      {= "v0.18~preview.130.74+175"}
+  "hardcaml"       {= "v0.18~preview.130.74+175"}
+  "jane_rope"      {= "v0.18~preview.130.74+175"}
+  "ppx_hardcaml"   {= "v0.18~preview.130.74+175"}
+  "ppx_jane"       {= "v0.18~preview.130.74+175"}
+  "ppx_rope"       {= "v0.18~preview.130.74+175"}
   "ctypes"         {= "0.23.0+ox"}
-  "ctypes-foreign"
+  "ctypes-foreign" {= "0.23.0+ox"}
   "dune"           {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -34,7 +34,7 @@ any other cyclesim simulation.
 """
 url {
   src:
-    "https://github.com/janestreet/hardcaml_c/archive/77d07f3cdc56c381c694c9fc494b2628be50e876.tar.gz"
+    "https://github.com/janestreet/hardcaml_c/archive/5dfe5b8c35cd871ff565795352e5de1bbe280399.tar.gz"
   checksum:
-    "sha256=22319f492a2e27941a9117b099ff60ffe43352f057a1e5a39b27eaaa47216f17"
+    "sha256=ec814a01e76cd7297bc3673dc139e979284f6945f969f738456152b1ec0f6837"
 }
diff --git a/packages/hardcaml_circuits/hardcaml_circuits.v0.18~preview.130.55+197/opam b/packages/hardcaml_circuits/hardcaml_circuits.v0.18~preview.130.74+175/opam
similarity index 55%
rename from packages/hardcaml_circuits/hardcaml_circuits.v0.18~preview.130.55+197/opam
rename to packages/hardcaml_circuits/hardcaml_circuits.v0.18~preview.130.74+175/opam
index cf6c4a53b5..30bcd8bf79 100644
--- a/packages/hardcaml_circuits/hardcaml_circuits.v0.18~preview.130.55+197/opam
+++ b/packages/hardcaml_circuits/hardcaml_circuits.v0.18~preview.130.74+175/opam
@@ -12,13 +12,13 @@ build: [
 ]
 depends: [
   "ocaml"                {>= "5.1.0"}
-  "base"                 {= "v0.18~preview.130.55+197"}
-  "bignum"               {= "v0.18~preview.130.55+197"}
-  "hardcaml"             {= "v0.18~preview.130.55+197"}
-  "hardcaml_fixed_point" {= "v0.18~preview.130.55+197"}
-  "ppx_hardcaml"         {= "v0.18~preview.130.55+197"}
-  "ppx_jane"             {= "v0.18~preview.130.55+197"}
-  "stdio"                {= "v0.18~preview.130.55+197"}
+  "base"                 {= "v0.18~preview.130.74+175"}
+  "bignum"               {= "v0.18~preview.130.74+175"}
+  "hardcaml"             {= "v0.18~preview.130.74+175"}
+  "hardcaml_fixed_point" {= "v0.18~preview.130.74+175"}
+  "ppx_hardcaml"         {= "v0.18~preview.130.74+175"}
+  "ppx_jane"             {= "v0.18~preview.130.74+175"}
+  "stdio"                {= "v0.18~preview.130.74+175"}
   "dune"                 {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -28,7 +28,7 @@ A small library of useful/interesting Hardcaml circuits.
 """
 url {
   src:
-    "https://github.com/janestreet/hardcaml_circuits/archive/fceacaceff285660e56926e2a66db1161510a3fb.tar.gz"
+    "https://github.com/janestreet/hardcaml_circuits/archive/d00fdd1ff4960d381f2c89dd4320a4997602585a.tar.gz"
   checksum:
-    "sha256=7afa54d1d6ce4c5aeec5bdff19bb1942f4a0a2f8336a2d51889ee6c27b643a90"
+    "sha256=5df1c6c0e541e8b27c894da6b0bef7bc491d2854867e008d600f00af30e1aa35"
 }
diff --git a/packages/hardcaml_event_driven_sim/hardcaml_event_driven_sim.v0.18~preview.130.55+197/opam b/packages/hardcaml_event_driven_sim/hardcaml_event_driven_sim.v0.18~preview.130.74+175/opam
similarity index 72%
rename from packages/hardcaml_event_driven_sim/hardcaml_event_driven_sim.v0.18~preview.130.55+197/opam
rename to packages/hardcaml_event_driven_sim/hardcaml_event_driven_sim.v0.18~preview.130.74+175/opam
index 6ed5848605..83c2a87d2a 100644
--- a/packages/hardcaml_event_driven_sim/hardcaml_event_driven_sim.v0.18~preview.130.55+197/opam
+++ b/packages/hardcaml_event_driven_sim/hardcaml_event_driven_sim.v0.18~preview.130.74+175/opam
@@ -12,11 +12,11 @@ build: [
 ]
 depends: [
   "ocaml"             {>= "5.1.0"}
-  "core"              {= "v0.18~preview.130.55+197"}
-  "core_kernel"       {= "v0.18~preview.130.55+197"}
-  "hardcaml"          {= "v0.18~preview.130.55+197"}
-  "hardcaml_waveterm" {= "v0.18~preview.130.55+197"}
-  "ppx_jane"          {= "v0.18~preview.130.55+197"}
+  "core"              {= "v0.18~preview.130.74+175"}
+  "core_kernel"       {= "v0.18~preview.130.74+175"}
+  "hardcaml"          {= "v0.18~preview.130.74+175"}
+  "hardcaml_waveterm" {= "v0.18~preview.130.74+175"}
+  "ppx_jane"          {= "v0.18~preview.130.74+175"}
   "dune"              {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -31,7 +31,7 @@ simulation model and write testbenches against it.
 """
 url {
   src:
-    "https://github.com/janestreet/hardcaml_event_driven_sim/archive/67b51e77c3c82928e408ec0cee5386f68f5312ef.tar.gz"
+    "https://github.com/janestreet/hardcaml_event_driven_sim/archive/178b1abde7e9f7f9c527d939f5e4f409e2dac23f.tar.gz"
   checksum:
-    "sha256=38971cf03131d5bbdecad8a203e26bc6d9ecf03a4fa5771fb9bc5c137cef3ed0"
+    "sha256=832c2281338f9ae684b7ac963eabc631d250c8a7d9df5f719157c79a49ec52a4"
 }
diff --git a/packages/hardcaml_fixed_point/hardcaml_fixed_point.v0.18~preview.130.55+197/opam b/packages/hardcaml_fixed_point/hardcaml_fixed_point.v0.18~preview.130.74+175/opam
similarity index 76%
rename from packages/hardcaml_fixed_point/hardcaml_fixed_point.v0.18~preview.130.55+197/opam
rename to packages/hardcaml_fixed_point/hardcaml_fixed_point.v0.18~preview.130.74+175/opam
index e2128efc3c..3328530683 100644
--- a/packages/hardcaml_fixed_point/hardcaml_fixed_point.v0.18~preview.130.55+197/opam
+++ b/packages/hardcaml_fixed_point/hardcaml_fixed_point.v0.18~preview.130.74+175/opam
@@ -12,9 +12,9 @@ build: [
 ]
 depends: [
   "ocaml"    {>= "5.1.0"}
-  "base"     {= "v0.18~preview.130.55+197"}
-  "hardcaml" {= "v0.18~preview.130.55+197"}
-  "ppx_jane" {= "v0.18~preview.130.55+197"}
+  "base"     {= "v0.18~preview.130.74+175"}
+  "hardcaml" {= "v0.18~preview.130.74+175"}
+  "ppx_jane" {= "v0.18~preview.130.74+175"}
   "dune"     {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -25,7 +25,7 @@ overflow functionality.
 """
 url {
   src:
-    "https://github.com/janestreet/hardcaml_fixed_point/archive/b30dd5dbc691e3a527e07626df3b27c4d0251c09.tar.gz"
+    "https://github.com/janestreet/hardcaml_fixed_point/archive/8b535162cd33238d2c5359540c87bdaf732ab2fb.tar.gz"
   checksum:
-    "sha256=662d6c19ea7881fbc60cdd78f37070126f0b96d622a677e273b76fc12433fae1"
+    "sha256=917ecff2fdef062eb5c1bdfcbe067564937291e5cb5a026fe10f102bfabab981"
 }
diff --git a/packages/hardcaml_handshake/hardcaml_handshake.v0.18~preview.130.55+197/opam b/packages/hardcaml_handshake/hardcaml_handshake.v0.18~preview.130.74+175/opam
similarity index 82%
rename from packages/hardcaml_handshake/hardcaml_handshake.v0.18~preview.130.55+197/opam
rename to packages/hardcaml_handshake/hardcaml_handshake.v0.18~preview.130.74+175/opam
index 259f31b0b7..e5d20abfb4 100644
--- a/packages/hardcaml_handshake/hardcaml_handshake.v0.18~preview.130.55+197/opam
+++ b/packages/hardcaml_handshake/hardcaml_handshake.v0.18~preview.130.74+175/opam
@@ -12,10 +12,10 @@ build: [
 ]
 depends: [
   "ocaml"        {>= "5.1.0"}
-  "base"         {= "v0.18~preview.130.55+197"}
-  "hardcaml"     {= "v0.18~preview.130.55+197"}
-  "ppx_hardcaml" {= "v0.18~preview.130.55+197"}
-  "ppx_jane"     {= "v0.18~preview.130.55+197"}
+  "base"         {= "v0.18~preview.130.74+175"}
+  "hardcaml"     {= "v0.18~preview.130.74+175"}
+  "ppx_hardcaml" {= "v0.18~preview.130.74+175"}
+  "ppx_jane"     {= "v0.18~preview.130.74+175"}
   "dune"         {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/hardcaml_hobby_boards/hardcaml_hobby_boards.v0.18~preview.130.55+197/opam b/packages/hardcaml_hobby_boards/hardcaml_hobby_boards.v0.18~preview.130.74+175/opam
similarity index 55%
rename from packages/hardcaml_hobby_boards/hardcaml_hobby_boards.v0.18~preview.130.55+197/opam
rename to packages/hardcaml_hobby_boards/hardcaml_hobby_boards.v0.18~preview.130.74+175/opam
index 9eb738b4a2..ba0efb1045 100644
--- a/packages/hardcaml_hobby_boards/hardcaml_hobby_boards.v0.18~preview.130.55+197/opam
+++ b/packages/hardcaml_hobby_boards/hardcaml_hobby_boards.v0.18~preview.130.74+175/opam
@@ -12,18 +12,18 @@ build: [
 ]
 depends: [
   "ocaml"        {>= "5.1.0"}
-  "base"         {= "v0.18~preview.130.55+197"}
-  "core"         {= "v0.18~preview.130.55+197"}
-  "core_unix"    {= "v0.18~preview.130.55+197"}
-  "hardcaml"     {= "v0.18~preview.130.55+197"}
-  "hardcaml_axi" {= "v0.18~preview.130.55+197"}
-  "jane_rope"    {= "v0.18~preview.130.55+197"}
-  "parsexp"      {= "v0.18~preview.130.55+197"}
-  "ppx_hardcaml" {= "v0.18~preview.130.55+197"}
-  "ppx_jane"     {= "v0.18~preview.130.55+197"}
-  "ppx_rope"     {= "v0.18~preview.130.55+197"}
-  "simple_xml"   {= "v0.18~preview.130.55+197"}
-  "stdio"        {= "v0.18~preview.130.55+197"}
+  "base"         {= "v0.18~preview.130.74+175"}
+  "core"         {= "v0.18~preview.130.74+175"}
+  "core_unix"    {= "v0.18~preview.130.74+175"}
+  "hardcaml"     {= "v0.18~preview.130.74+175"}
+  "hardcaml_axi" {= "v0.18~preview.130.74+175"}
+  "jane_rope"    {= "v0.18~preview.130.74+175"}
+  "parsexp"      {= "v0.18~preview.130.74+175"}
+  "ppx_hardcaml" {= "v0.18~preview.130.74+175"}
+  "ppx_jane"     {= "v0.18~preview.130.74+175"}
+  "ppx_rope"     {= "v0.18~preview.130.74+175"}
+  "simple_xml"   {= "v0.18~preview.130.74+175"}
+  "stdio"        {= "v0.18~preview.130.74+175"}
   "dune"         {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -35,7 +35,7 @@ easier, build script generation and demos.
 """
 url {
   src:
-    "https://github.com/janestreet/hardcaml_hobby_boards/archive/40ae6bfbf70ec4885596327766b0741f86ac3e67.tar.gz"
+    "https://github.com/janestreet/hardcaml_hobby_boards/archive/c5972b075bc8774c57648e910441aa0d8e0c6c45.tar.gz"
   checksum:
-    "sha256=243799ea3235ba9e9b8ef70a64daec92c18406f66579baa5bd63ee4c5fe10b6b"
+    "sha256=c1c1b8fa69fa43cc307b1440a108a0f665fa709e169601494c0364c0cf3066f2"
 }
diff --git a/packages/hardcaml_of_verilog/hardcaml_of_verilog.v0.18~preview.130.55+197/opam b/packages/hardcaml_of_verilog/hardcaml_of_verilog.v0.18~preview.130.74+175/opam
similarity index 57%
rename from packages/hardcaml_of_verilog/hardcaml_of_verilog.v0.18~preview.130.55+197/opam
rename to packages/hardcaml_of_verilog/hardcaml_of_verilog.v0.18~preview.130.74+175/opam
index 73591924ee..bd42b056fe 100644
--- a/packages/hardcaml_of_verilog/hardcaml_of_verilog.v0.18~preview.130.55+197/opam
+++ b/packages/hardcaml_of_verilog/hardcaml_of_verilog.v0.18~preview.130.74+175/opam
@@ -12,16 +12,16 @@ build: [
 ]
 depends: [
   "ocaml"           {>= "5.1.0"}
-  "base"            {= "v0.18~preview.130.55+197"}
-  "core"            {= "v0.18~preview.130.55+197"}
-  "core_unix"       {= "v0.18~preview.130.55+197"}
-  "hardcaml"        {= "v0.18~preview.130.55+197"}
-  "hardcaml_verify" {= "v0.18~preview.130.55+197"}
-  "jsonaf"          {= "v0.18~preview.130.55+197"}
-  "ppx_hardcaml"    {= "v0.18~preview.130.55+197"}
-  "ppx_jane"        {= "v0.18~preview.130.55+197"}
-  "ppx_jsonaf_conv" {= "v0.18~preview.130.55+197"}
-  "stdio"           {= "v0.18~preview.130.55+197"}
+  "base"            {= "v0.18~preview.130.74+175"}
+  "core"            {= "v0.18~preview.130.74+175"}
+  "core_unix"       {= "v0.18~preview.130.74+175"}
+  "hardcaml"        {= "v0.18~preview.130.74+175"}
+  "hardcaml_verify" {= "v0.18~preview.130.74+175"}
+  "jsonaf"          {= "v0.18~preview.130.74+175"}
+  "ppx_hardcaml"    {= "v0.18~preview.130.74+175"}
+  "ppx_jane"        {= "v0.18~preview.130.74+175"}
+  "ppx_jsonaf_conv" {= "v0.18~preview.130.74+175"}
+  "stdio"           {= "v0.18~preview.130.74+175"}
   "dune"            {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -35,7 +35,7 @@ Code can also be generated to wrap the conversion process using Hardcaml interfa
 """
 url {
   src:
-    "https://github.com/janestreet/hardcaml_of_verilog/archive/94a5e26b1251506041e807f5f47e11bc5da050d1.tar.gz"
+    "https://github.com/janestreet/hardcaml_of_verilog/archive/a84891448497fc1f15fb684e33ab43b521747999.tar.gz"
   checksum:
-    "sha256=66f2fab4dac73bff242a70b1d62d6f9f84aab52892980a6b230a88f9608bd325"
+    "sha256=d22d85681f3a45a6386555df6b577a3c21b1380221e24b5bfe500ff8bee99cf5"
 }
diff --git a/packages/hardcaml_step_testbench/hardcaml_step_testbench.v0.18~preview.130.55+197/opam b/packages/hardcaml_step_testbench/hardcaml_step_testbench.v0.18~preview.130.74+175/opam
similarity index 60%
rename from packages/hardcaml_step_testbench/hardcaml_step_testbench.v0.18~preview.130.55+197/opam
rename to packages/hardcaml_step_testbench/hardcaml_step_testbench.v0.18~preview.130.74+175/opam
index d340779dfb..3f986ec7cc 100644
--- a/packages/hardcaml_step_testbench/hardcaml_step_testbench.v0.18~preview.130.55+197/opam
+++ b/packages/hardcaml_step_testbench/hardcaml_step_testbench.v0.18~preview.130.74+175/opam
@@ -12,13 +12,14 @@ build: [
 ]
 depends: [
   "ocaml"                     {>= "5.1.0"}
-  "base"                      {= "v0.18~preview.130.55+197"}
-  "core"                      {= "v0.18~preview.130.55+197"}
-  "hardcaml"                  {= "v0.18~preview.130.55+197"}
-  "hardcaml_event_driven_sim" {= "v0.18~preview.130.55+197"}
-  "hardcaml_waveterm"         {= "v0.18~preview.130.55+197"}
-  "ppx_jane"                  {= "v0.18~preview.130.55+197"}
-  "stdio"                     {= "v0.18~preview.130.55+197"}
+  "core"                      {= "v0.18~preview.130.74+175"}
+  "hardcaml"                  {= "v0.18~preview.130.74+175"}
+  "hardcaml_event_driven_sim" {= "v0.18~preview.130.74+175"}
+  "hardcaml_waveterm"         {= "v0.18~preview.130.74+175"}
+  "oxcaml_effect"             {= "v0.18~preview.130.74+175"}
+  "ppx_jane"                  {= "v0.18~preview.130.74+175"}
+  "stdio"                     {= "v0.18~preview.130.74+175"}
+  "unique"                    {= "v0.18~preview.130.74+175"}
   "dune"                      {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -31,7 +32,7 @@ synchronised to the system clock.
 """
 url {
   src:
-    "https://github.com/janestreet/hardcaml_step_testbench/archive/422a05bca83c73179d40b292f1f8486f449ad4e4.tar.gz"
+    "https://github.com/janestreet/hardcaml_step_testbench/archive/14986fc9275cfbee63c3d46b1e69b0075c12d2d8.tar.gz"
   checksum:
-    "sha256=75613d9ffc477b597b4653b52ad4e9f74869d0dee6379f1ae02b34b4d4f1943a"
+    "sha256=77377e0e7e7ca998c64f7d52bc117035a096d1b2fd45acd73b66d39536fe0cdf"
 }
diff --git a/packages/hardcaml_test_harness/hardcaml_test_harness.v0.18~preview.130.55+197/opam b/packages/hardcaml_test_harness/hardcaml_test_harness.v0.18~preview.130.74+175/opam
similarity index 67%
rename from packages/hardcaml_test_harness/hardcaml_test_harness.v0.18~preview.130.55+197/opam
rename to packages/hardcaml_test_harness/hardcaml_test_harness.v0.18~preview.130.74+175/opam
index cbafe3a9a2..cd2312f179 100644
--- a/packages/hardcaml_test_harness/hardcaml_test_harness.v0.18~preview.130.55+197/opam
+++ b/packages/hardcaml_test_harness/hardcaml_test_harness.v0.18~preview.130.74+175/opam
@@ -12,12 +12,12 @@ build: [
 ]
 depends: [
   "ocaml"                    {>= "5.1.0"}
-  "core"                     {= "v0.18~preview.130.55+197"}
-  "expect_test_helpers_core" {= "v0.18~preview.130.55+197"}
-  "hardcaml"                 {= "v0.18~preview.130.55+197"}
-  "hardcaml_step_testbench"  {= "v0.18~preview.130.55+197"}
-  "hardcaml_waveterm"        {= "v0.18~preview.130.55+197"}
-  "ppx_jane"                 {= "v0.18~preview.130.55+197"}
+  "core"                     {= "v0.18~preview.130.74+175"}
+  "expect_test_helpers_core" {= "v0.18~preview.130.74+175"}
+  "hardcaml"                 {= "v0.18~preview.130.74+175"}
+  "hardcaml_step_testbench"  {= "v0.18~preview.130.74+175"}
+  "hardcaml_waveterm"        {= "v0.18~preview.130.74+175"}
+  "ppx_jane"                 {= "v0.18~preview.130.74+175"}
   "dune"                     {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -29,7 +29,7 @@ test environment from a circuit and producing waveforms for debugging.
 """
 url {
   src:
-    "https://github.com/janestreet/hardcaml_test_harness/archive/31a9c2b190e8036a6e676066921f8f18acc6456f.tar.gz"
+    "https://github.com/janestreet/hardcaml_test_harness/archive/959444f57aeb2b75d89baf68b99a2dbe87f2d707.tar.gz"
   checksum:
-    "sha256=9e2b9e08ef77ae4a0d27c7cf31805c9453904aac1299c340caa0b9bfa9b56ab8"
+    "sha256=61f0379a35c09da28df52e7e0b4941245281a31f3d0a4a9d58b319ee89c328e1"
 }
diff --git a/packages/hardcaml_verify/hardcaml_verify.v0.18~preview.130.55+197/opam b/packages/hardcaml_verify/hardcaml_verify.v0.18~preview.130.74+175/opam
similarity index 63%
rename from packages/hardcaml_verify/hardcaml_verify.v0.18~preview.130.55+197/opam
rename to packages/hardcaml_verify/hardcaml_verify.v0.18~preview.130.74+175/opam
index 476639a83f..75b8ca402b 100644
--- a/packages/hardcaml_verify/hardcaml_verify.v0.18~preview.130.55+197/opam
+++ b/packages/hardcaml_verify/hardcaml_verify.v0.18~preview.130.74+175/opam
@@ -12,14 +12,14 @@ build: [
 ]
 depends: [
   "ocaml"             {>= "5.1.0"}
-  "base"              {= "v0.18~preview.130.55+197"}
-  "hardcaml"          {= "v0.18~preview.130.55+197"}
-  "hardcaml_waveterm" {= "v0.18~preview.130.55+197"}
-  "jane_rope"         {= "v0.18~preview.130.55+197"}
-  "ppx_hardcaml"      {= "v0.18~preview.130.55+197"}
-  "ppx_jane"          {= "v0.18~preview.130.55+197"}
-  "ppx_rope"          {= "v0.18~preview.130.55+197"}
-  "stdio"             {= "v0.18~preview.130.55+197"}
+  "base"              {= "v0.18~preview.130.74+175"}
+  "hardcaml"          {= "v0.18~preview.130.74+175"}
+  "hardcaml_waveterm" {= "v0.18~preview.130.74+175"}
+  "jane_rope"         {= "v0.18~preview.130.74+175"}
+  "ppx_hardcaml"      {= "v0.18~preview.130.74+175"}
+  "ppx_jane"          {= "v0.18~preview.130.74+175"}
+  "ppx_rope"          {= "v0.18~preview.130.74+175"}
+  "stdio"             {= "v0.18~preview.130.74+175"}
   "dune"              {>= "3.17.0"}
   "re"                {= "1.14.0+ox"}
 ]
@@ -37,7 +37,7 @@ checking tasks.
 """
 url {
   src:
-    "https://github.com/janestreet/hardcaml_verify/archive/286c89e044e0aa09e68b634399d333753f26201a.tar.gz"
+    "https://github.com/janestreet/hardcaml_verify/archive/3949b16b82e046850879e0d86ce350173f4ebe5b.tar.gz"
   checksum:
-    "sha256=36e3336b36bbe7032daff1dfa88a8a50916dcba72572c8c3b6fcbb53f773f6a0"
+    "sha256=393d59164ed3f4e8d787be9d45f88690fb52a75a8b0b84138c18da379116e171"
 }
diff --git a/packages/hardcaml_verilator/hardcaml_verilator.v0.18~preview.130.55+197/opam b/packages/hardcaml_verilator/hardcaml_verilator.v0.18~preview.130.74+175/opam
similarity index 59%
rename from packages/hardcaml_verilator/hardcaml_verilator.v0.18~preview.130.55+197/opam
rename to packages/hardcaml_verilator/hardcaml_verilator.v0.18~preview.130.74+175/opam
index 186bd41874..6dc268f2d4 100644
--- a/packages/hardcaml_verilator/hardcaml_verilator.v0.18~preview.130.55+197/opam
+++ b/packages/hardcaml_verilator/hardcaml_verilator.v0.18~preview.130.74+175/opam
@@ -12,16 +12,16 @@ build: [
 ]
 depends: [
   "ocaml"          {>= "5.1.0"}
-  "base"           {= "v0.18~preview.130.55+197"}
-  "core"           {= "v0.18~preview.130.55+197"}
-  "core_unix"      {= "v0.18~preview.130.55+197"}
-  "hardcaml"       {= "v0.18~preview.130.55+197"}
-  "jane_rope"      {= "v0.18~preview.130.55+197"}
-  "ppx_hardcaml"   {= "v0.18~preview.130.55+197"}
-  "ppx_jane"       {= "v0.18~preview.130.55+197"}
-  "stdio"          {= "v0.18~preview.130.55+197"}
+  "base"           {= "v0.18~preview.130.74+175"}
+  "core"           {= "v0.18~preview.130.74+175"}
+  "core_unix"      {= "v0.18~preview.130.74+175"}
+  "hardcaml"       {= "v0.18~preview.130.74+175"}
+  "jane_rope"      {= "v0.18~preview.130.74+175"}
+  "ppx_hardcaml"   {= "v0.18~preview.130.74+175"}
+  "ppx_jane"       {= "v0.18~preview.130.74+175"}
+  "stdio"          {= "v0.18~preview.130.74+175"}
   "ctypes"         {= "0.23.0+ox"}
-  "ctypes-foreign"
+  "ctypes-foreign" {= "0.23.0+ox"}
   "dune"           {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -34,7 +34,7 @@ to the running executable to be used as a Cyclesim simulation.
 """
 url {
   src:
-    "https://github.com/janestreet/hardcaml_verilator/archive/f6c2a1915d912fe43345e88b4ad5e92bbe5536f1.tar.gz"
+    "https://github.com/janestreet/hardcaml_verilator/archive/6045b79daa474e144639397ec6f6da9b8562ddaa.tar.gz"
   checksum:
-    "sha256=3787233ef79fd05fb68e4b90d30a6d2290d92b97544e342d9f1fc746815918e2"
+    "sha256=082e8c37eb0e62efc751084e8d9c777019bd92cb5d111d7e94b9432cc893b585"
 }
diff --git a/packages/hardcaml_waveterm/hardcaml_waveterm.v0.18~preview.130.55+197/opam b/packages/hardcaml_waveterm/hardcaml_waveterm.v0.18~preview.130.74+175/opam
similarity index 51%
rename from packages/hardcaml_waveterm/hardcaml_waveterm.v0.18~preview.130.55+197/opam
rename to packages/hardcaml_waveterm/hardcaml_waveterm.v0.18~preview.130.74+175/opam
index 5b263c967d..a6ee374e84 100644
--- a/packages/hardcaml_waveterm/hardcaml_waveterm.v0.18~preview.130.55+197/opam
+++ b/packages/hardcaml_waveterm/hardcaml_waveterm.v0.18~preview.130.74+175/opam
@@ -11,21 +11,21 @@ build: [
   ["dune" "build" "-p" name "-j" jobs]
 ]
 depends: [
-  "ocaml"        {>= "5.1.0"}
-  "async"        {= "v0.18~preview.130.55+197"}
-  "base"         {= "v0.18~preview.130.55+197"}
-  "bignum"       {= "v0.18~preview.130.55+197"}
-  "core"         {= "v0.18~preview.130.55+197"}
-  "core_unix"    {= "v0.18~preview.130.55+197"}
-  "hardcaml"     {= "v0.18~preview.130.55+197"}
-  "notty_async"  {= "v0.18~preview.130.55+197"}
-  "ppx_hardcaml" {= "v0.18~preview.130.55+197"}
-  "ppx_jane"     {= "v0.18~preview.130.55+197"}
-  "stdio"        {= "v0.18~preview.130.55+197"}
-  "cryptokit"    {>= "1.16" & < "1.17"}
-  "dune"         {>= "3.17.0"}
-  "notty"        {>= "0.2.1"}
-  "re"           {= "1.14.0+ox"}
+  "ocaml"           {>= "5.1.0"}
+  "async"           {= "v0.18~preview.130.74+175"}
+  "base"            {= "v0.18~preview.130.74+175"}
+  "bignum"          {= "v0.18~preview.130.74+175"}
+  "core"            {= "v0.18~preview.130.74+175"}
+  "core_unix"       {= "v0.18~preview.130.74+175"}
+  "hardcaml"        {= "v0.18~preview.130.74+175"}
+  "notty_async"     {= "v0.18~preview.130.74+175"}
+  "ppx_hardcaml"    {= "v0.18~preview.130.74+175"}
+  "ppx_jane"        {= "v0.18~preview.130.74+175"}
+  "stdio"           {= "v0.18~preview.130.74+175"}
+  "cryptokit"       {>= "1.16" & < "1.17"}
+  "dune"            {>= "3.17.0"}
+  "notty-community" {= "0.2.4+ox"}
+  "re"              {= "1.14.0+ox"}
 ]
 available: arch != "arm32" & arch != "x86_32"
 synopsis: "A terminal based digital waveform viewer for Hardcaml"
@@ -40,7 +40,7 @@ to simulations.
 conflicts: ["hardcaml-waveterm"]
 url {
   src:
-    "https://github.com/janestreet/hardcaml_waveterm/archive/43f11c3a0d60f623bd43e36ea485901bc4b6aeb7.tar.gz"
+    "https://github.com/janestreet/hardcaml_waveterm/archive/ca49cfbed7eaa0ccacb272a8b951ff18dcafc258.tar.gz"
   checksum:
-    "sha256=27e342711f3cb5ac1049f27b2c90e76e1f8f760edcf67da94f6f279a795cd9ea"
+    "sha256=98b23fad0b0530decfcf297eff2501a36357df6ce0012789b9db8a5b1a03f13b"
 }
diff --git a/packages/hardcaml_xilinx/hardcaml_xilinx.v0.18~preview.130.55+197/opam b/packages/hardcaml_xilinx/hardcaml_xilinx.v0.18~preview.130.74+175/opam
similarity index 67%
rename from packages/hardcaml_xilinx/hardcaml_xilinx.v0.18~preview.130.55+197/opam
rename to packages/hardcaml_xilinx/hardcaml_xilinx.v0.18~preview.130.74+175/opam
index 1888a15c99..d36178e408 100644
--- a/packages/hardcaml_xilinx/hardcaml_xilinx.v0.18~preview.130.55+197/opam
+++ b/packages/hardcaml_xilinx/hardcaml_xilinx.v0.18~preview.130.74+175/opam
@@ -12,11 +12,11 @@ build: [
 ]
 depends: [
   "ocaml"             {>= "5.1.0"}
-  "base"              {= "v0.18~preview.130.55+197"}
-  "hardcaml"          {= "v0.18~preview.130.55+197"}
-  "hardcaml_circuits" {= "v0.18~preview.130.55+197"}
-  "ppx_hardcaml"      {= "v0.18~preview.130.55+197"}
-  "ppx_jane"          {= "v0.18~preview.130.55+197"}
+  "base"              {= "v0.18~preview.130.74+175"}
+  "hardcaml"          {= "v0.18~preview.130.74+175"}
+  "hardcaml_circuits" {= "v0.18~preview.130.74+175"}
+  "ppx_hardcaml"      {= "v0.18~preview.130.74+175"}
+  "ppx_jane"          {= "v0.18~preview.130.74+175"}
   "dune"              {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -30,7 +30,7 @@ Xilinx LUT primitives.
 """
 url {
   src:
-    "https://github.com/janestreet/hardcaml_xilinx/archive/d1b6784694dc3bcf12e65f7175d7dc534e86f1dc.tar.gz"
+    "https://github.com/janestreet/hardcaml_xilinx/archive/db601dd57acc603b70c1a5a46260c0c4e191d9c2.tar.gz"
   checksum:
-    "sha256=3d37f82e316f3084054dd1d913813b68ab2085c0f283835803e227f79474107d"
+    "sha256=ab48b992d4b837ca1c7997a9853a1284a49b57afac5c89c82301e749d3a21f5f"
 }
diff --git a/packages/hardcaml_xilinx_components/hardcaml_xilinx_components.v0.18~preview.130.55+197/opam b/packages/hardcaml_xilinx_components/hardcaml_xilinx_components.v0.18~preview.130.74+175/opam
similarity index 69%
rename from packages/hardcaml_xilinx_components/hardcaml_xilinx_components.v0.18~preview.130.55+197/opam
rename to packages/hardcaml_xilinx_components/hardcaml_xilinx_components.v0.18~preview.130.74+175/opam
index ba5128dfeb..8fd2e5c7f3 100644
--- a/packages/hardcaml_xilinx_components/hardcaml_xilinx_components.v0.18~preview.130.55+197/opam
+++ b/packages/hardcaml_xilinx_components/hardcaml_xilinx_components.v0.18~preview.130.74+175/opam
@@ -13,12 +13,12 @@ build: [
 ]
 depends: [
   "ocaml"     {>= "5.1.0"}
-  "base"      {= "v0.18~preview.130.55+197"}
-  "core"      {= "v0.18~preview.130.55+197"}
-  "core_unix" {= "v0.18~preview.130.55+197"}
-  "hardcaml"  {= "v0.18~preview.130.55+197"}
-  "ppx_jane"  {= "v0.18~preview.130.55+197"}
-  "stdio"     {= "v0.18~preview.130.55+197"}
+  "base"      {= "v0.18~preview.130.74+175"}
+  "core"      {= "v0.18~preview.130.74+175"}
+  "core_unix" {= "v0.18~preview.130.74+175"}
+  "hardcaml"  {= "v0.18~preview.130.74+175"}
+  "ppx_jane"  {= "v0.18~preview.130.74+175"}
+  "stdio"     {= "v0.18~preview.130.74+175"}
   "dune"      {>= "3.17.0"}
   "re"        {= "1.14.0+ox"}
 ]
@@ -30,7 +30,7 @@ installation and generating Hardcaml interfaces automatically.
 """
 url {
   src:
-    "https://github.com/janestreet/hardcaml_xilinx_components/archive/9c06e8147153836a262d3f86a79861fdcf656c15.tar.gz"
+    "https://github.com/janestreet/hardcaml_xilinx_components/archive/72f78bcea8cd63b59cd717a1c0781a84207a9ff8.tar.gz"
   checksum:
-    "sha256=1b930fb70ab64590ac78793586149decdcc4f78b1b48dde84b8f6b8a207b11ce"
+    "sha256=e9080a4b05f793e51572a97288ba396c0dc3e120d64a2ed2c70558cdb30bd99a"
 }
diff --git a/packages/hardcaml_xilinx_reports/hardcaml_xilinx_reports.v0.18~preview.130.55+197/opam b/packages/hardcaml_xilinx_reports/hardcaml_xilinx_reports.v0.18~preview.130.74+175/opam
similarity index 72%
rename from packages/hardcaml_xilinx_reports/hardcaml_xilinx_reports.v0.18~preview.130.55+197/opam
rename to packages/hardcaml_xilinx_reports/hardcaml_xilinx_reports.v0.18~preview.130.74+175/opam
index e08e571104..6169b6b609 100644
--- a/packages/hardcaml_xilinx_reports/hardcaml_xilinx_reports.v0.18~preview.130.55+197/opam
+++ b/packages/hardcaml_xilinx_reports/hardcaml_xilinx_reports.v0.18~preview.130.74+175/opam
@@ -12,16 +12,16 @@ build: [
 ]
 depends: [
   "ocaml"        {>= "5.1.0"}
-  "async"        {= "v0.18~preview.130.55+197"}
-  "base"         {= "v0.18~preview.130.55+197"}
-  "core"         {= "v0.18~preview.130.55+197"}
-  "core_unix"    {= "v0.18~preview.130.55+197"}
-  "hardcaml"     {= "v0.18~preview.130.55+197"}
-  "jane_rope"    {= "v0.18~preview.130.55+197"}
-  "ppx_hardcaml" {= "v0.18~preview.130.55+197"}
-  "ppx_jane"     {= "v0.18~preview.130.55+197"}
-  "stdio"        {= "v0.18~preview.130.55+197"}
-  "textutils"    {= "v0.18~preview.130.55+197"}
+  "async"        {= "v0.18~preview.130.74+175"}
+  "base"         {= "v0.18~preview.130.74+175"}
+  "core"         {= "v0.18~preview.130.74+175"}
+  "core_unix"    {= "v0.18~preview.130.74+175"}
+  "hardcaml"     {= "v0.18~preview.130.74+175"}
+  "jane_rope"    {= "v0.18~preview.130.74+175"}
+  "ppx_hardcaml" {= "v0.18~preview.130.74+175"}
+  "ppx_jane"     {= "v0.18~preview.130.74+175"}
+  "stdio"        {= "v0.18~preview.130.74+175"}
+  "textutils"    {= "v0.18~preview.130.74+175"}
   "dune"         {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/heterogeneous_list/.generated b/packages/heterogeneous_list/.generated
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/heterogeneous_list/heterogeneous_list.v0.18~preview.130.74+175/opam b/packages/heterogeneous_list/heterogeneous_list.v0.18~preview.130.74+175/opam
new file mode 100644
index 0000000000..bcc1ed7329
--- /dev/null
+++ b/packages/heterogeneous_list/heterogeneous_list.v0.18~preview.130.74+175/opam
@@ -0,0 +1,30 @@
+opam-version: "2.0"
+maintainer: "Jane Street developers"
+authors: ["Jane Street Group, LLC"]
+homepage: "https://github.com/janestreet/heterogeneous_list"
+bug-reports: "https://github.com/janestreet/heterogeneous_list/issues"
+dev-repo: "git+https://github.com/janestreet/heterogeneous_list.git"
+doc:
+  "https://ocaml.janestreet.com/ocaml-core/latest/doc/heterogeneous_list/index.html"
+license: "MIT"
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+]
+depends: [
+  "ocaml"    {>= "5.2.0"}
+  "base"     {= "v0.18~preview.130.74+175"}
+  "ppx_jane" {= "v0.18~preview.130.74+175"}
+  "dune"     {>= "3.17.0"}
+]
+available: arch != "arm32" & arch != "x86_32"
+synopsis:
+  "[Heterogeneous_list] is a list that can contain arbitrary, mixed types as elements. A bit like a Python list."
+description: """
+[Heterogeneous_list] is a list that can contain arbitrary, mixed types as elements. A bit like a Python list.
+"""
+url {
+  src:
+    "https://github.com/janestreet/heterogeneous_list/archive/4d35796c09e849eefb37d74bf6ee125d4e385482.tar.gz"
+  checksum:
+    "sha256=8381c840ab6e0b58922c444e53f8a2a1b1702892811faa55288a800f6b4c6f12"
+}
diff --git a/packages/hex_encode/hex_encode.v0.18~preview.130.55+197/opam b/packages/hex_encode/hex_encode.v0.18~preview.130.74+175/opam
similarity index 90%
rename from packages/hex_encode/hex_encode.v0.18~preview.130.55+197/opam
rename to packages/hex_encode/hex_encode.v0.18~preview.130.74+175/opam
index e914d2df58..0af92cb1c9 100644
--- a/packages/hex_encode/hex_encode.v0.18~preview.130.55+197/opam
+++ b/packages/hex_encode/hex_encode.v0.18~preview.130.74+175/opam
@@ -12,8 +12,8 @@ build: [
 ]
 depends: [
   "ocaml"    {>= "5.1.0"}
-  "core"     {= "v0.18~preview.130.55+197"}
-  "ppx_jane" {= "v0.18~preview.130.55+197"}
+  "core"     {= "v0.18~preview.130.74+175"}
+  "ppx_jane" {= "v0.18~preview.130.74+175"}
   "dune"     {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/hg_lib/hg_lib.v0.18~preview.130.55+197/opam b/packages/hg_lib/hg_lib.v0.18~preview.130.74+175/opam
similarity index 54%
rename from packages/hg_lib/hg_lib.v0.18~preview.130.55+197/opam
rename to packages/hg_lib/hg_lib.v0.18~preview.130.74+175/opam
index ee2935daf7..53b97c8b25 100644
--- a/packages/hg_lib/hg_lib.v0.18~preview.130.55+197/opam
+++ b/packages/hg_lib/hg_lib.v0.18~preview.130.74+175/opam
@@ -11,13 +11,13 @@ build: [
 ]
 depends: [
   "ocaml"                    {>= "5.1.0"}
-  "async"                    {= "v0.18~preview.130.55+197"}
-  "async_unix"               {= "v0.18~preview.130.55+197"}
-  "core"                     {= "v0.18~preview.130.55+197"}
-  "core_kernel"              {= "v0.18~preview.130.55+197"}
-  "core_unix"                {= "v0.18~preview.130.55+197"}
-  "expect_test_helpers_core" {= "v0.18~preview.130.55+197"}
-  "ppx_jane"                 {= "v0.18~preview.130.55+197"}
+  "async"                    {= "v0.18~preview.130.74+175"}
+  "async_unix"               {= "v0.18~preview.130.74+175"}
+  "core"                     {= "v0.18~preview.130.74+175"}
+  "core_kernel"              {= "v0.18~preview.130.74+175"}
+  "core_unix"                {= "v0.18~preview.130.74+175"}
+  "expect_test_helpers_core" {= "v0.18~preview.130.74+175"}
+  "ppx_jane"                 {= "v0.18~preview.130.74+175"}
   "dune"                     {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -27,7 +27,7 @@ A library that wraps the Mercurial command line interface.
 """
 url {
   src:
-    "https://github.com/janestreet/hg_lib/archive/23b4fccebb43ea7febf776429dc2726007b9f078.tar.gz"
+    "https://github.com/janestreet/hg_lib/archive/25ca86e43f27426ba63c4b5a2e986f150bd575d0.tar.gz"
   checksum:
-    "sha256=0028c064f8b26ce463a7a84bb75d79b00bfbdd65ddf5ecc67f203df0af210d25"
+    "sha256=bb480a2e4f4fbe0a40a1ab5fe88751cfeb8f79b40b0823dd42735f0d3b76bce0"
 }
diff --git a/packages/higher_kinded/higher_kinded.v0.18~preview.130.55+197/opam b/packages/higher_kinded/higher_kinded.v0.18~preview.130.74+175/opam
similarity index 92%
rename from packages/higher_kinded/higher_kinded.v0.18~preview.130.55+197/opam
rename to packages/higher_kinded/higher_kinded.v0.18~preview.130.74+175/opam
index 965b630e8e..b094a90633 100644
--- a/packages/higher_kinded/higher_kinded.v0.18~preview.130.55+197/opam
+++ b/packages/higher_kinded/higher_kinded.v0.18~preview.130.74+175/opam
@@ -12,8 +12,8 @@ build: [
 ]
 depends: [
   "ocaml"    {>= "5.1.0"}
-  "base"     {= "v0.18~preview.130.55+197"}
-  "ppx_jane" {= "v0.18~preview.130.55+197"}
+  "base"     {= "v0.18~preview.130.74+175"}
+  "ppx_jane" {= "v0.18~preview.130.74+175"}
   "dune"     {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/incr_dom/incr_dom.v0.18~preview.130.55+197/opam b/packages/incr_dom/incr_dom.v0.18~preview.130.74+175/opam
similarity index 70%
rename from packages/incr_dom/incr_dom.v0.18~preview.130.55+197/opam
rename to packages/incr_dom/incr_dom.v0.18~preview.130.74+175/opam
index f6929d0c07..6609ba2f48 100644
--- a/packages/incr_dom/incr_dom.v0.18~preview.130.55+197/opam
+++ b/packages/incr_dom/incr_dom.v0.18~preview.130.74+175/opam
@@ -11,15 +11,15 @@ build: [
 ]
 depends: [
   "ocaml"           {>= "5.1.0"}
-  "async_js"        {= "v0.18~preview.130.55+197"}
-  "async_kernel"    {= "v0.18~preview.130.55+197"}
-  "bonsai_concrete" {= "v0.18~preview.130.55+197"}
-  "core"            {= "v0.18~preview.130.55+197"}
-  "incr_map"        {= "v0.18~preview.130.55+197"}
-  "incr_select"     {= "v0.18~preview.130.55+197"}
-  "incremental"     {= "v0.18~preview.130.55+197"}
-  "ppx_jane"        {= "v0.18~preview.130.55+197"}
-  "virtual_dom"     {= "v0.18~preview.130.55+197"}
+  "async_js"        {= "v0.18~preview.130.74+175"}
+  "async_kernel"    {= "v0.18~preview.130.74+175"}
+  "bonsai_concrete" {= "v0.18~preview.130.74+175"}
+  "core"            {= "v0.18~preview.130.74+175"}
+  "incr_map"        {= "v0.18~preview.130.74+175"}
+  "incr_select"     {= "v0.18~preview.130.74+175"}
+  "incremental"     {= "v0.18~preview.130.74+175"}
+  "ppx_jane"        {= "v0.18~preview.130.74+175"}
+  "virtual_dom"     {= "v0.18~preview.130.74+175"}
   "dune"            {>= "3.17.0"}
   "js_of_ocaml"     {= "6.0.1+ox"}
   "js_of_ocaml-ppx" {= "6.0.1+ox"}
@@ -49,7 +49,7 @@ examples directory.
 """
 url {
   src:
-    "https://github.com/janestreet/incr_dom/archive/9e2b0eb5a0d5feca27aed3ec0958b4c5fc75f8e7.tar.gz"
+    "https://github.com/janestreet/incr_dom/archive/901aab10c475da69b3c75bcc65fbe42940c03b8e.tar.gz"
   checksum:
-    "sha256=1d082ae27a58947f6782864efdcd06d45cc05703c74ae3b708fd4239e153a3fe"
+    "sha256=264cfcc909ab7c304cd15dc91f2e1ea33473865742c0263245578c133dd60ab6"
 }
diff --git a/packages/incr_dom_interactive/incr_dom_interactive.v0.18~preview.130.55+197/opam b/packages/incr_dom_interactive/incr_dom_interactive.v0.18~preview.130.74+175/opam
similarity index 64%
rename from packages/incr_dom_interactive/incr_dom_interactive.v0.18~preview.130.55+197/opam
rename to packages/incr_dom_interactive/incr_dom_interactive.v0.18~preview.130.74+175/opam
index e59f280929..81587f87d9 100644
--- a/packages/incr_dom_interactive/incr_dom_interactive.v0.18~preview.130.55+197/opam
+++ b/packages/incr_dom_interactive/incr_dom_interactive.v0.18~preview.130.74+175/opam
@@ -12,16 +12,16 @@ build: [
 ]
 depends: [
   "ocaml"           {>= "5.1.0"}
-  "async_js"        {= "v0.18~preview.130.55+197"}
-  "async_kernel"    {= "v0.18~preview.130.55+197"}
-  "core"            {= "v0.18~preview.130.55+197"}
-  "incr_dom"        {= "v0.18~preview.130.55+197"}
-  "incr_map"        {= "v0.18~preview.130.55+197"}
-  "incr_select"     {= "v0.18~preview.130.55+197"}
-  "incremental"     {= "v0.18~preview.130.55+197"}
-  "ppx_jane"        {= "v0.18~preview.130.55+197"}
-  "splay_tree"      {= "v0.18~preview.130.55+197"}
-  "virtual_dom"     {= "v0.18~preview.130.55+197"}
+  "async_js"        {= "v0.18~preview.130.74+175"}
+  "async_kernel"    {= "v0.18~preview.130.74+175"}
+  "core"            {= "v0.18~preview.130.74+175"}
+  "incr_dom"        {= "v0.18~preview.130.74+175"}
+  "incr_map"        {= "v0.18~preview.130.74+175"}
+  "incr_select"     {= "v0.18~preview.130.74+175"}
+  "incremental"     {= "v0.18~preview.130.74+175"}
+  "ppx_jane"        {= "v0.18~preview.130.74+175"}
+  "splay_tree"      {= "v0.18~preview.130.74+175"}
+  "virtual_dom"     {= "v0.18~preview.130.74+175"}
   "dune"            {>= "3.17.0"}
   "js_of_ocaml"     {= "6.0.1+ox"}
   "js_of_ocaml-ppx" {= "6.0.1+ox"}
@@ -33,7 +33,7 @@ This library allows your program to receive input from the user using DOM elemen
 """
 url {
   src:
-    "https://github.com/janestreet/incr_dom_interactive/archive/1cd9d8b91c982522faf5cdeb1a70b034e42e96bf.tar.gz"
+    "https://github.com/janestreet/incr_dom_interactive/archive/45a8f557b347e498d85f958f376dd4aaf580f019.tar.gz"
   checksum:
-    "sha256=405d69b5ddbf40d17eb5a5d97d382bf6ba80263bc049d32a13db10be7fca514b"
+    "sha256=22250c784898b1dd02af53ac825c7142969c6360997e58acb2e6d32cebd3d518"
 }
diff --git a/packages/incr_dom_partial_render/incr_dom_partial_render.v0.18~preview.130.55+197/opam b/packages/incr_dom_partial_render/incr_dom_partial_render.v0.18~preview.130.74+175/opam
similarity index 74%
rename from packages/incr_dom_partial_render/incr_dom_partial_render.v0.18~preview.130.55+197/opam
rename to packages/incr_dom_partial_render/incr_dom_partial_render.v0.18~preview.130.74+175/opam
index 7b723be350..5dddae2316 100644
--- a/packages/incr_dom_partial_render/incr_dom_partial_render.v0.18~preview.130.55+197/opam
+++ b/packages/incr_dom_partial_render/incr_dom_partial_render.v0.18~preview.130.74+175/opam
@@ -12,14 +12,14 @@ build: [
 ]
 depends: [
   "ocaml"            {>= "5.1.0"}
-  "core"             {= "v0.18~preview.130.55+197"}
-  "incr_dom"         {= "v0.18~preview.130.55+197"}
-  "incr_map"         {= "v0.18~preview.130.55+197"}
-  "incremental"      {= "v0.18~preview.130.55+197"}
-  "ppx_jane"         {= "v0.18~preview.130.55+197"}
-  "ppx_pattern_bind" {= "v0.18~preview.130.55+197"}
-  "splay_tree"       {= "v0.18~preview.130.55+197"}
-  "virtual_dom"      {= "v0.18~preview.130.55+197"}
+  "core"             {= "v0.18~preview.130.74+175"}
+  "incr_dom"         {= "v0.18~preview.130.74+175"}
+  "incr_map"         {= "v0.18~preview.130.74+175"}
+  "incremental"      {= "v0.18~preview.130.74+175"}
+  "ppx_jane"         {= "v0.18~preview.130.74+175"}
+  "ppx_pattern_bind" {= "v0.18~preview.130.74+175"}
+  "splay_tree"       {= "v0.18~preview.130.74+175"}
+  "virtual_dom"      {= "v0.18~preview.130.74+175"}
   "dune"             {>= "3.17.0"}
   "js_of_ocaml"      {= "6.0.1+ox"}
   "js_of_ocaml-ppx"  {= "6.0.1+ox"}
diff --git a/packages/incr_dom_sexp_form/incr_dom_sexp_form.v0.18~preview.130.55+197/opam b/packages/incr_dom_sexp_form/incr_dom_sexp_form.v0.18~preview.130.74+175/opam
similarity index 56%
rename from packages/incr_dom_sexp_form/incr_dom_sexp_form.v0.18~preview.130.55+197/opam
rename to packages/incr_dom_sexp_form/incr_dom_sexp_form.v0.18~preview.130.74+175/opam
index 8321242243..2fb654389e 100644
--- a/packages/incr_dom_sexp_form/incr_dom_sexp_form.v0.18~preview.130.55+197/opam
+++ b/packages/incr_dom_sexp_form/incr_dom_sexp_form.v0.18~preview.130.74+175/opam
@@ -12,15 +12,15 @@ build: [
 ]
 depends: [
   "ocaml"                {>= "5.1.0"}
-  "core"                 {= "v0.18~preview.130.55+197"}
-  "incr_dom"             {= "v0.18~preview.130.55+197"}
-  "incr_dom_interactive" {= "v0.18~preview.130.55+197"}
-  "incr_map"             {= "v0.18~preview.130.55+197"}
-  "incr_select"          {= "v0.18~preview.130.55+197"}
-  "incremental"          {= "v0.18~preview.130.55+197"}
-  "ppx_jane"             {= "v0.18~preview.130.55+197"}
-  "splay_tree"           {= "v0.18~preview.130.55+197"}
-  "virtual_dom"          {= "v0.18~preview.130.55+197"}
+  "core"                 {= "v0.18~preview.130.74+175"}
+  "incr_dom"             {= "v0.18~preview.130.74+175"}
+  "incr_dom_interactive" {= "v0.18~preview.130.74+175"}
+  "incr_map"             {= "v0.18~preview.130.74+175"}
+  "incr_select"          {= "v0.18~preview.130.74+175"}
+  "incremental"          {= "v0.18~preview.130.74+175"}
+  "ppx_jane"             {= "v0.18~preview.130.74+175"}
+  "splay_tree"           {= "v0.18~preview.130.74+175"}
+  "virtual_dom"          {= "v0.18~preview.130.74+175"}
   "dune"                 {>= "3.17.0"}
   "js_of_ocaml"          {= "6.0.1+ox"}
   "js_of_ocaml-ppx"      {= "6.0.1+ox"}
@@ -33,7 +33,7 @@ It relies on the fact that the type of the value being edited can be serialized
 """
 url {
   src:
-    "https://github.com/janestreet/incr_dom_sexp_form/archive/74ba51d53e0dd1947d5c9cd0cc81b6136cc70e64.tar.gz"
+    "https://github.com/janestreet/incr_dom_sexp_form/archive/841a801507b55eda52fb1157152d75704ed01838.tar.gz"
   checksum:
-    "sha256=46a4783670517af61af7d88170e8c185e7cb9fa1d0110627075463f81b4b902f"
+    "sha256=0e708e51c0379cbf5a7879f8e1ff1062381a5873abdf9abae037268f38b90209"
 }
diff --git a/packages/incr_map/incr_map.v0.18~preview.130.55+197/opam b/packages/incr_map/incr_map.v0.18~preview.130.74+175/opam
similarity index 53%
rename from packages/incr_map/incr_map.v0.18~preview.130.55+197/opam
rename to packages/incr_map/incr_map.v0.18~preview.130.74+175/opam
index 7c5df0dae9..462d02676d 100644
--- a/packages/incr_map/incr_map.v0.18~preview.130.55+197/opam
+++ b/packages/incr_map/incr_map.v0.18~preview.130.74+175/opam
@@ -11,17 +11,17 @@ build: [
 ]
 depends: [
   "ocaml"              {>= "5.1.0"}
-  "abstract_algebra"   {= "v0.18~preview.130.55+197"}
-  "bignum"             {= "v0.18~preview.130.55+197"}
-  "core"               {= "v0.18~preview.130.55+197"}
-  "incremental"        {= "v0.18~preview.130.55+197"}
-  "legacy_diffable"    {= "v0.18~preview.130.55+197"}
-  "ppx_diff"           {= "v0.18~preview.130.55+197"}
-  "ppx_jane"           {= "v0.18~preview.130.55+197"}
-  "ppx_pattern_bind"   {= "v0.18~preview.130.55+197"}
-  "ppx_stable_witness" {= "v0.18~preview.130.55+197"}
-  "streamable"         {= "v0.18~preview.130.55+197"}
-  "uopt"               {= "v0.18~preview.130.55+197"}
+  "abstract_algebra"   {= "v0.18~preview.130.74+175"}
+  "bignum"             {= "v0.18~preview.130.74+175"}
+  "core"               {= "v0.18~preview.130.74+175"}
+  "incremental"        {= "v0.18~preview.130.74+175"}
+  "legacy_diffable"    {= "v0.18~preview.130.74+175"}
+  "ppx_diff"           {= "v0.18~preview.130.74+175"}
+  "ppx_jane"           {= "v0.18~preview.130.74+175"}
+  "ppx_pattern_bind"   {= "v0.18~preview.130.74+175"}
+  "ppx_stable_witness" {= "v0.18~preview.130.74+175"}
+  "streamable"         {= "v0.18~preview.130.74+175"}
+  "uopt"               {= "v0.18~preview.130.74+175"}
   "dune"               {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -34,7 +34,7 @@ along with the ability to efficiently diff map data structures using
 """
 url {
   src:
-    "https://github.com/janestreet/incr_map/archive/b8ac50903b0f5f47c19e63745c43a43963f58376.tar.gz"
+    "https://github.com/janestreet/incr_map/archive/ad4bd7cefe826f8bb533f3010e447093e0ba8440.tar.gz"
   checksum:
-    "sha256=3c3172ade2fce8c570bf01eb55ec6b03b957cc902bbe0b2f32a9885514e2fc08"
+    "sha256=9921db27cdbdfe52878605ccc55dc5dbac601f31175004c412cab761bc0a2ba1"
 }
diff --git a/packages/incr_select/incr_select.v0.18~preview.130.55+197/opam b/packages/incr_select/incr_select.v0.18~preview.130.74+175/opam
similarity index 89%
rename from packages/incr_select/incr_select.v0.18~preview.130.55+197/opam
rename to packages/incr_select/incr_select.v0.18~preview.130.74+175/opam
index 2218d47999..73d9ba8828 100644
--- a/packages/incr_select/incr_select.v0.18~preview.130.55+197/opam
+++ b/packages/incr_select/incr_select.v0.18~preview.130.74+175/opam
@@ -12,9 +12,9 @@ build: [
 ]
 depends: [
   "ocaml"       {>= "5.1.0"}
-  "core"        {= "v0.18~preview.130.55+197"}
-  "incremental" {= "v0.18~preview.130.55+197"}
-  "ppx_jane"    {= "v0.18~preview.130.55+197"}
+  "core"        {= "v0.18~preview.130.74+175"}
+  "incremental" {= "v0.18~preview.130.74+175"}
+  "ppx_jane"    {= "v0.18~preview.130.74+175"}
   "dune"        {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/incremental/incremental.v0.18~preview.130.55+197/opam b/packages/incremental/incremental.v0.18~preview.130.74+175/opam
similarity index 57%
rename from packages/incremental/incremental.v0.18~preview.130.55+197/opam
rename to packages/incremental/incremental.v0.18~preview.130.74+175/opam
index e20d3646d1..5a2f067253 100644
--- a/packages/incremental/incremental.v0.18~preview.130.55+197/opam
+++ b/packages/incremental/incremental.v0.18~preview.130.74+175/opam
@@ -12,14 +12,14 @@ build: [
 ]
 depends: [
   "ocaml"                {>= "5.1.0"}
-  "basement"             {= "v0.18~preview.130.55+197"}
-  "core"                 {= "v0.18~preview.130.55+197"}
-  "core_kernel"          {= "v0.18~preview.130.55+197"}
-  "janestreet_lru_cache" {= "v0.18~preview.130.55+197"}
-  "ppx_jane"             {= "v0.18~preview.130.55+197"}
-  "ppx_optcomp"          {= "v0.18~preview.130.55+197"}
-  "textutils_kernel"     {= "v0.18~preview.130.55+197"}
-  "uopt"                 {= "v0.18~preview.130.55+197"}
+  "basement"             {= "v0.18~preview.130.74+175"}
+  "core"                 {= "v0.18~preview.130.74+175"}
+  "core_kernel"          {= "v0.18~preview.130.74+175"}
+  "janestreet_lru_cache" {= "v0.18~preview.130.74+175"}
+  "ppx_jane"             {= "v0.18~preview.130.74+175"}
+  "ppx_optcomp"          {= "v0.18~preview.130.74+175"}
+  "textutils_kernel"     {= "v0.18~preview.130.74+175"}
+  "uopt"                 {= "v0.18~preview.130.74+175"}
   "dune"                 {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -32,7 +32,7 @@ largest industrial user of OCaml.
 """
 url {
   src:
-    "https://github.com/janestreet/incremental/archive/c2ca714e61e866c511addc8ab752a5f640ce6fee.tar.gz"
+    "https://github.com/janestreet/incremental/archive/ad3af49fdc34dc33357c7c5d4b17f0ecaa7103d3.tar.gz"
   checksum:
-    "sha256=0862107adae16a9db0e4740a836adf49a42a76482c86f276c93f8e377d169c66"
+    "sha256=d2a6c03f52fa162b4de13297b5912488152966ee4680404bdb22f5fc993d326f"
 }
diff --git a/packages/indentation_buffer/indentation_buffer.v0.18~preview.130.55+197/opam b/packages/indentation_buffer/indentation_buffer.v0.18~preview.130.74+175/opam
similarity index 91%
rename from packages/indentation_buffer/indentation_buffer.v0.18~preview.130.55+197/opam
rename to packages/indentation_buffer/indentation_buffer.v0.18~preview.130.74+175/opam
index 91c346d680..5a35b28442 100644
--- a/packages/indentation_buffer/indentation_buffer.v0.18~preview.130.55+197/opam
+++ b/packages/indentation_buffer/indentation_buffer.v0.18~preview.130.74+175/opam
@@ -12,8 +12,8 @@ build: [
 ]
 depends: [
   "ocaml"    {>= "5.1.0"}
-  "core"     {= "v0.18~preview.130.55+197"}
-  "ppx_jane" {= "v0.18~preview.130.55+197"}
+  "core"     {= "v0.18~preview.130.74+175"}
+  "ppx_jane" {= "v0.18~preview.130.74+175"}
   "dune"     {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/insertion_ordered_map/insertion_ordered_map.v0.18~preview.130.55+197/opam b/packages/insertion_ordered_map/insertion_ordered_map.v0.18~preview.130.74+175/opam
similarity index 88%
rename from packages/insertion_ordered_map/insertion_ordered_map.v0.18~preview.130.55+197/opam
rename to packages/insertion_ordered_map/insertion_ordered_map.v0.18~preview.130.74+175/opam
index ad8aca8657..e189e16bad 100644
--- a/packages/insertion_ordered_map/insertion_ordered_map.v0.18~preview.130.55+197/opam
+++ b/packages/insertion_ordered_map/insertion_ordered_map.v0.18~preview.130.74+175/opam
@@ -12,9 +12,9 @@ build: [
 ]
 depends: [
   "ocaml"    {>= "5.1.0"}
-  "core"     {= "v0.18~preview.130.55+197"}
-  "ppx_jane" {= "v0.18~preview.130.55+197"}
-  "sexplib"  {= "v0.18~preview.130.55+197"}
+  "core"     {= "v0.18~preview.130.74+175"}
+  "ppx_jane" {= "v0.18~preview.130.74+175"}
+  "sexplib"  {= "v0.18~preview.130.74+175"}
   "dune"     {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/int_repr/int_repr.v0.18~preview.130.55+197/opam b/packages/int_repr/int_repr.v0.18~preview.130.74+175/opam
similarity index 90%
rename from packages/int_repr/int_repr.v0.18~preview.130.55+197/opam
rename to packages/int_repr/int_repr.v0.18~preview.130.74+175/opam
index 4e5a1723ac..bbd5483aad 100644
--- a/packages/int_repr/int_repr.v0.18~preview.130.55+197/opam
+++ b/packages/int_repr/int_repr.v0.18~preview.130.74+175/opam
@@ -11,8 +11,8 @@ build: [
 ]
 depends: [
   "ocaml"    {>= "5.1.0"}
-  "base"     {= "v0.18~preview.130.55+197"}
-  "ppx_jane" {= "v0.18~preview.130.55+197"}
+  "base"     {= "v0.18~preview.130.74+175"}
+  "ppx_jane" {= "v0.18~preview.130.74+175"}
   "dune"     {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/jane-street-headers/jane-street-headers.v0.18~preview.130.55+197/opam b/packages/jane-street-headers/jane-street-headers.v0.18~preview.130.74+175/opam
similarity index 100%
rename from packages/jane-street-headers/jane-street-headers.v0.18~preview.130.55+197/opam
rename to packages/jane-street-headers/jane-street-headers.v0.18~preview.130.74+175/opam
diff --git a/packages/jane_rope/jane_rope.v0.18~preview.130.55+197/opam b/packages/jane_rope/jane_rope.v0.18~preview.130.74+175/opam
similarity index 90%
rename from packages/jane_rope/jane_rope.v0.18~preview.130.55+197/opam
rename to packages/jane_rope/jane_rope.v0.18~preview.130.74+175/opam
index 6d8a9234a9..4e4155a4df 100644
--- a/packages/jane_rope/jane_rope.v0.18~preview.130.55+197/opam
+++ b/packages/jane_rope/jane_rope.v0.18~preview.130.74+175/opam
@@ -12,8 +12,8 @@ build: [
 ]
 depends: [
   "ocaml"    {>= "5.1.0"}
-  "base"     {= "v0.18~preview.130.55+197"}
-  "ppx_jane" {= "v0.18~preview.130.55+197"}
+  "base"     {= "v0.18~preview.130.74+175"}
+  "ppx_jane" {= "v0.18~preview.130.74+175"}
   "dune"     {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/janestreet_cpuid/janestreet_cpuid.v0.18~preview.130.55+197/opam b/packages/janestreet_cpuid/janestreet_cpuid.v0.18~preview.130.74+175/opam
similarity index 71%
rename from packages/janestreet_cpuid/janestreet_cpuid.v0.18~preview.130.55+197/opam
rename to packages/janestreet_cpuid/janestreet_cpuid.v0.18~preview.130.74+175/opam
index 8309baa2c3..1eee948fb5 100644
--- a/packages/janestreet_cpuid/janestreet_cpuid.v0.18~preview.130.55+197/opam
+++ b/packages/janestreet_cpuid/janestreet_cpuid.v0.18~preview.130.74+175/opam
@@ -12,9 +12,9 @@ build: [
 ]
 depends: [
   "ocaml"       {>= "5.1.0"}
-  "core"        {= "v0.18~preview.130.55+197"}
-  "core_kernel" {= "v0.18~preview.130.55+197"}
-  "ppx_jane"    {= "v0.18~preview.130.55+197"}
+  "core"        {= "v0.18~preview.130.74+175"}
+  "core_kernel" {= "v0.18~preview.130.74+175"}
+  "ppx_jane"    {= "v0.18~preview.130.74+175"}
   "dune"        {>= "3.17.0"}
 ]
 synopsis:
@@ -26,7 +26,7 @@ capabilities.
 available: (arch = "x86_64" | arch = "arm64") & os = "linux"
 url {
   src:
-    "https://github.com/janestreet/janestreet_cpuid/archive/cb232e38cd6bf38164b24037871e82eca1ae317f.tar.gz"
+    "https://github.com/janestreet/janestreet_cpuid/archive/a36eee1faeb3dff1d4bed6595555ba4ee1f3bbb8.tar.gz"
   checksum:
-    "sha256=d7d707105d52a6050ac1f8a6fcfd8b6b3da3eaafac56b7e9b0e8593b0502a3f3"
+    "sha256=2976aeefb6aa1a3dc4d3af8aa36439285cfc1a93c2b2256bd292c9366ce414a1"
 }
diff --git a/packages/janestreet_csv/janestreet_csv.v0.18~preview.130.55+197/opam b/packages/janestreet_csv/janestreet_csv.v0.18~preview.130.55+197/opam
deleted file mode 100644
index a684556fa1..0000000000
--- a/packages/janestreet_csv/janestreet_csv.v0.18~preview.130.55+197/opam
+++ /dev/null
@@ -1,45 +0,0 @@
-opam-version: "2.0"
-maintainer: "Jane Street developers"
-authors: ["Jane Street Group, LLC"]
-homepage: "https://github.com/janestreet/janestreet_csv"
-bug-reports: "https://github.com/janestreet/janestreet_csv/issues"
-dev-repo: "git+https://github.com/janestreet/janestreet_csv.git"
-doc:
-  "https://ocaml.janestreet.com/ocaml-core/latest/doc/janestreet_csv/index.html"
-license: "MIT"
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-]
-depends: [
-  "ocaml"             {>= "5.1.0"}
-  "async"             {= "v0.18~preview.130.55+197"}
-  "base"              {= "v0.18~preview.130.55+197"}
-  "bignum"            {= "v0.18~preview.130.55+197"}
-  "core"              {= "v0.18~preview.130.55+197"}
-  "core_extended"     {= "v0.18~preview.130.55+197"}
-  "core_kernel"       {= "v0.18~preview.130.55+197"}
-  "core_unix"         {= "v0.18~preview.130.55+197"}
-  "csvfields"         {= "v0.18~preview.130.55+197"}
-  "delimited_parsing" {= "v0.18~preview.130.55+197"}
-  "fieldslib"         {= "v0.18~preview.130.55+197"}
-  "numeric_string"    {= "v0.18~preview.130.55+197"}
-  "ppx_jane"          {= "v0.18~preview.130.55+197"}
-  "re2"               {= "v0.18~preview.130.55+197"}
-  "textutils"         {= "v0.18~preview.130.55+197"}
-  "dune"              {>= "3.17.0"}
-  "pcre"
-  "tyxml"             {>= "4.3.0"}
-]
-available: arch != "arm32" & arch != "x86_32"
-synopsis: "Tools for working with CSVs on the command line"
-description: """
-A suite of tools for working with CSVs from the command line.  It
-contains subcommands for pretty printing, selecting, and combining
-CSVs, as well as some conversions to other formats.
-"""
-url {
-  src:
-    "https://github.com/janestreet/janestreet_csv/archive/0c201081fe24427c6b8df9b59f4fe490711365ae.tar.gz"
-  checksum:
-    "sha256=fdf57adb298e4b4cfadf57f562b344dd5568bc7d328965de36d1d2bc394eb393"
-}
diff --git a/packages/janestreet_csv/janestreet_csv.v0.18~preview.130.74+175/opam b/packages/janestreet_csv/janestreet_csv.v0.18~preview.130.74+175/opam
new file mode 100644
index 0000000000..54846fbaac
--- /dev/null
+++ b/packages/janestreet_csv/janestreet_csv.v0.18~preview.130.74+175/opam
@@ -0,0 +1,45 @@
+opam-version: "2.0"
+maintainer: "Jane Street developers"
+authors: ["Jane Street Group, LLC"]
+homepage: "https://github.com/janestreet/janestreet_csv"
+bug-reports: "https://github.com/janestreet/janestreet_csv/issues"
+dev-repo: "git+https://github.com/janestreet/janestreet_csv.git"
+doc:
+  "https://ocaml.janestreet.com/ocaml-core/latest/doc/janestreet_csv/index.html"
+license: "MIT"
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+]
+depends: [
+  "ocaml"             {>= "5.1.0"}
+  "async"             {= "v0.18~preview.130.74+175"}
+  "base"              {= "v0.18~preview.130.74+175"}
+  "bignum"            {= "v0.18~preview.130.74+175"}
+  "core"              {= "v0.18~preview.130.74+175"}
+  "core_extended"     {= "v0.18~preview.130.74+175"}
+  "core_kernel"       {= "v0.18~preview.130.74+175"}
+  "core_unix"         {= "v0.18~preview.130.74+175"}
+  "csvfields"         {= "v0.18~preview.130.74+175"}
+  "delimited_parsing" {= "v0.18~preview.130.74+175"}
+  "fieldslib"         {= "v0.18~preview.130.74+175"}
+  "numeric_string"    {= "v0.18~preview.130.74+175"}
+  "ppx_jane"          {= "v0.18~preview.130.74+175"}
+  "re2"               {= "v0.18~preview.130.74+175"}
+  "textutils"         {= "v0.18~preview.130.74+175"}
+  "dune"              {>= "3.17.0"}
+  "pcre"
+  "tyxml"             {>= "4.3.0"}
+]
+available: arch != "arm32" & arch != "x86_32"
+synopsis: "Tools for working with CSVs on the command line"
+description: """
+A suite of tools for working with CSVs from the command line.  It
+contains subcommands for pretty printing, selecting, and combining
+CSVs, as well as some conversions to other formats.
+"""
+url {
+  src:
+    "https://github.com/janestreet/janestreet_csv/archive/2ad0cfcfdf12abd5a1dcaaeda412150ad7edb566.tar.gz"
+  checksum:
+    "sha256=9e1844cc52041a1081c379e15ba0af750265ea548854686e8af5bd3022a7995d"
+}
diff --git a/packages/janestreet_lru_cache/janestreet_lru_cache.v0.18~preview.130.55+197/opam b/packages/janestreet_lru_cache/janestreet_lru_cache.v0.18~preview.130.74+175/opam
similarity index 91%
rename from packages/janestreet_lru_cache/janestreet_lru_cache.v0.18~preview.130.55+197/opam
rename to packages/janestreet_lru_cache/janestreet_lru_cache.v0.18~preview.130.74+175/opam
index e5783dc6ff..6197176044 100644
--- a/packages/janestreet_lru_cache/janestreet_lru_cache.v0.18~preview.130.55+197/opam
+++ b/packages/janestreet_lru_cache/janestreet_lru_cache.v0.18~preview.130.74+175/opam
@@ -12,8 +12,8 @@ build: [
 ]
 depends: [
   "ocaml"    {>= "5.1.0"}
-  "core"     {= "v0.18~preview.130.55+197"}
-  "ppx_jane" {= "v0.18~preview.130.55+197"}
+  "core"     {= "v0.18~preview.130.74+175"}
+  "ppx_jane" {= "v0.18~preview.130.74+175"}
   "dune"     {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/janestreet_shims/janestreet_shims.v0.18~preview.130.55+197/opam b/packages/janestreet_shims/janestreet_shims.v0.18~preview.130.74+175/opam
similarity index 100%
rename from packages/janestreet_shims/janestreet_shims.v0.18~preview.130.55+197/opam
rename to packages/janestreet_shims/janestreet_shims.v0.18~preview.130.74+175/opam
diff --git a/packages/js_of_ocaml-compiler/js_of_ocaml-compiler.6.0.1+ox/files/js_of_ocaml-5.2.0-compiler-changes.patch b/packages/js_of_ocaml-compiler/js_of_ocaml-compiler.6.0.1+ox/files/js_of_ocaml-5.2.0-compiler-changes.patch
index 2ad0a64b33..963ee6f716 100644
--- a/packages/js_of_ocaml-compiler/js_of_ocaml-compiler.6.0.1+ox/files/js_of_ocaml-5.2.0-compiler-changes.patch
+++ b/packages/js_of_ocaml-compiler/js_of_ocaml-compiler.6.0.1+ox/files/js_of_ocaml-5.2.0-compiler-changes.patch
@@ -335,7 +335,7 @@
 +
 +//Provides: caml_is_null
 +function caml_is_null(o) {
-+  return o === null;
++  return o === null ? 1 : 0;
 +}
 --- a/runtime/wasm/compare.wat
 +++ b/runtime/wasm/compare.wat
diff --git a/packages/js_of_ocaml-compiler/js_of_ocaml-compiler.6.0.1+ox/files/js_of_ocaml-iarray-primitives.patch b/packages/js_of_ocaml-compiler/js_of_ocaml-compiler.6.0.1+ox/files/js_of_ocaml-iarray-primitives.patch
index 8c851caefb..f6ba1a17da 100644
--- a/packages/js_of_ocaml-compiler/js_of_ocaml-compiler.6.0.1+ox/files/js_of_ocaml-iarray-primitives.patch
+++ b/packages/js_of_ocaml-compiler/js_of_ocaml-compiler.6.0.1+ox/files/js_of_ocaml-iarray-primitives.patch
@@ -1,6 +1,6 @@
 --- a/runtime/js/array.js
 +++ b/runtime/js/array.js
-@@ -198,6 +198,16 @@ function caml_array_make(len, init) {
+@@ -198,6 +198,16 @@
    return b;
  }
 
diff --git a/packages/js_of_ocaml-compiler/js_of_ocaml-compiler.6.0.1+ox/files/js_of_ocaml-magic_number.ml.patch b/packages/js_of_ocaml-compiler/js_of_ocaml-compiler.6.0.1+ox/files/js_of_ocaml-magic_number.ml.patch
index 24ec30b5bb..40ed5f1906 100644
--- a/packages/js_of_ocaml-compiler/js_of_ocaml-compiler.6.0.1+ox/files/js_of_ocaml-magic_number.ml.patch
+++ b/packages/js_of_ocaml-compiler/js_of_ocaml-compiler.6.0.1+ox/files/js_of_ocaml-magic_number.ml.patch
@@ -6,7 +6,7 @@
 
 -let v =
 -  let current = Ocaml_version.current in
-+let v = 568
++let v = 569
 +  (* let current = Ocaml_version.current in
    match current with
    | 4 :: 08 :: _ -> 25
diff --git a/packages/js_of_ocaml-compiler/js_of_ocaml-compiler.6.0.1+ox/files/js_of_ocaml-ocaml_version-ppx.patch b/packages/js_of_ocaml-compiler/js_of_ocaml-compiler.6.0.1+ox/files/js_of_ocaml-ocaml_version-ppx.patch
new file mode 100644
index 0000000000..d82b9d1fb8
--- /dev/null
+++ b/packages/js_of_ocaml-compiler/js_of_ocaml-compiler.6.0.1+ox/files/js_of_ocaml-ocaml_version-ppx.patch
@@ -0,0 +1,24 @@
+--- a/toplevel/lib/jsooTop.ml
++++ b/toplevel/lib/jsooTop.ml
+@@ -65,6 +65,7 @@
+     p := !p + len'';
+     len''
+
++[%%if ocaml_version < (4, 14, 0)]
+ let use ffp content =
+   let fname, oc =
+     Filename.open_temp_file ~mode:[ Open_binary ] "jsoo_toplevel" "fake_stdin"
+@@ -78,10 +79,11 @@
+   with e ->
+     Sys.remove fname;
+     raise e
+-[@@if ocaml_version < (4, 14, 0)]
++[%%endif]
+
++[%%if ocaml_version >= (4, 14, 0)]
+ let use ffp content = Toploop.use_silently ffp (String content)
+-[@@if ocaml_version >= (4, 14, 0)]
++[%%endif]
+
+ let execute printval ?pp_code ?highlight_location pp_answer s =
+   let lb = Lexing.from_function (refill_lexbuf s (ref 0) pp_code) in
diff --git a/packages/js_of_ocaml-compiler/js_of_ocaml-compiler.6.0.1+ox/opam b/packages/js_of_ocaml-compiler/js_of_ocaml-compiler.6.0.1+ox/opam
index b5cc53267f..7a22043e3e 100644
--- a/packages/js_of_ocaml-compiler/js_of_ocaml-compiler.6.0.1+ox/opam
+++ b/packages/js_of_ocaml-compiler/js_of_ocaml-compiler.6.0.1+ox/opam
@@ -20,7 +20,7 @@ depends: [
   "ppxlib"     {= "0.33.0+ox"}
   "re"         {with-test & = "1.14.0+ox"}
   "cmdliner"   {>= "1.1.0"}
-  "sedlex"     {= "3.3+ox"}
+  "sedlex"     {= "3.6+ox"}
   "qcheck"     {with-test}
   "menhir"
   "menhirLib"
@@ -52,6 +52,7 @@ patches: [
   "js_of_ocaml-add-unboxed-and-float-block.patch"
   "js_of_ocaml-ident-is_global.patch"
   "js_of_ocaml-remove-float-externals.patch"
+  "js_of_ocaml-ocaml_version-ppx.patch"
   "js_of_ocaml-test-diffs-caused-by-build-differences.patch"
   "js_of_ocaml-fix-build_fs.patch"
   "js_of_ocaml-iarray-primitives.patch"
@@ -94,7 +95,7 @@ patches: [
 extra-files: [
   [
     "js_of_ocaml-magic_number.ml.patch"
-    "sha256=05e204eac0338a76ca02db89ebb9505d80a7e268b93b746408356be913e219e6"
+    "sha256=aa69b6b6414a6a320e3a5102f24f3bd14199c317b9fd7b3e40ace94deee905e2"
   ]
   [
     "js_of_ocaml-compilation_unit-name.patch"
@@ -120,6 +121,10 @@ extra-files: [
     "js_of_ocaml-remove-float-externals.patch"
     "sha256=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
   ]
+  [
+    "js_of_ocaml-ocaml_version-ppx.patch"
+    "sha256=df6bcb6da8aa3dfd6bd0a178679987d41c400ec1803f4a66659cfc822d1b280f"
+  ]
   [
     "js_of_ocaml-test-diffs-caused-by-build-differences.patch"
     "sha256=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
@@ -130,7 +135,7 @@ extra-files: [
   ]
   [
     "js_of_ocaml-iarray-primitives.patch"
-    "sha256=8c320fb413daad0393347bf6a22ca31fe6f1d3dd34f58e313aa44cd060fc56f8"
+    "sha256=6f7805c3876229168ac8b023783c75226bf57e1a2bc2ded04d0adb9e46def515"
   ]
   [
     "js_of_ocaml-important-config-changes.patch"
@@ -198,7 +203,7 @@ extra-files: [
   ]
   [
     "js_of_ocaml-5.2.0-compiler-changes.patch"
-    "sha256=12626322e63a8eaf68d4c8a1a1d3f428832869fae7020588e0fe40bbd8fd8cf8"
+    "sha256=e6a88c1c3af53b07f273cf6b37ce980042efdc3aca8a371aba8cfdfc3914d97e"
   ]
   [
     "js_of_ocaml-5.3-tests-runtime.patch"
diff --git a/packages/js_of_ocaml-ppx/js_of_ocaml-ppx.6.0.1+ox/files/js_of_ocaml-5.2.0-compiler-changes.patch b/packages/js_of_ocaml-ppx/js_of_ocaml-ppx.6.0.1+ox/files/js_of_ocaml-5.2.0-compiler-changes.patch
index 2ad0a64b33..963ee6f716 100644
--- a/packages/js_of_ocaml-ppx/js_of_ocaml-ppx.6.0.1+ox/files/js_of_ocaml-5.2.0-compiler-changes.patch
+++ b/packages/js_of_ocaml-ppx/js_of_ocaml-ppx.6.0.1+ox/files/js_of_ocaml-5.2.0-compiler-changes.patch
@@ -335,7 +335,7 @@
 +
 +//Provides: caml_is_null
 +function caml_is_null(o) {
-+  return o === null;
++  return o === null ? 1 : 0;
 +}
 --- a/runtime/wasm/compare.wat
 +++ b/runtime/wasm/compare.wat
diff --git a/packages/js_of_ocaml-ppx/js_of_ocaml-ppx.6.0.1+ox/files/js_of_ocaml-iarray-primitives.patch b/packages/js_of_ocaml-ppx/js_of_ocaml-ppx.6.0.1+ox/files/js_of_ocaml-iarray-primitives.patch
index 8c851caefb..f6ba1a17da 100644
--- a/packages/js_of_ocaml-ppx/js_of_ocaml-ppx.6.0.1+ox/files/js_of_ocaml-iarray-primitives.patch
+++ b/packages/js_of_ocaml-ppx/js_of_ocaml-ppx.6.0.1+ox/files/js_of_ocaml-iarray-primitives.patch
@@ -1,6 +1,6 @@
 --- a/runtime/js/array.js
 +++ b/runtime/js/array.js
-@@ -198,6 +198,16 @@ function caml_array_make(len, init) {
+@@ -198,6 +198,16 @@
    return b;
  }
 
diff --git a/packages/js_of_ocaml-ppx/js_of_ocaml-ppx.6.0.1+ox/files/js_of_ocaml-magic_number.ml.patch b/packages/js_of_ocaml-ppx/js_of_ocaml-ppx.6.0.1+ox/files/js_of_ocaml-magic_number.ml.patch
index 24ec30b5bb..40ed5f1906 100644
--- a/packages/js_of_ocaml-ppx/js_of_ocaml-ppx.6.0.1+ox/files/js_of_ocaml-magic_number.ml.patch
+++ b/packages/js_of_ocaml-ppx/js_of_ocaml-ppx.6.0.1+ox/files/js_of_ocaml-magic_number.ml.patch
@@ -6,7 +6,7 @@
 
 -let v =
 -  let current = Ocaml_version.current in
-+let v = 568
++let v = 569
 +  (* let current = Ocaml_version.current in
    match current with
    | 4 :: 08 :: _ -> 25
diff --git a/packages/js_of_ocaml-ppx/js_of_ocaml-ppx.6.0.1+ox/files/js_of_ocaml-ocaml_version-ppx.patch b/packages/js_of_ocaml-ppx/js_of_ocaml-ppx.6.0.1+ox/files/js_of_ocaml-ocaml_version-ppx.patch
new file mode 100644
index 0000000000..d82b9d1fb8
--- /dev/null
+++ b/packages/js_of_ocaml-ppx/js_of_ocaml-ppx.6.0.1+ox/files/js_of_ocaml-ocaml_version-ppx.patch
@@ -0,0 +1,24 @@
+--- a/toplevel/lib/jsooTop.ml
++++ b/toplevel/lib/jsooTop.ml
+@@ -65,6 +65,7 @@
+     p := !p + len'';
+     len''
+
++[%%if ocaml_version < (4, 14, 0)]
+ let use ffp content =
+   let fname, oc =
+     Filename.open_temp_file ~mode:[ Open_binary ] "jsoo_toplevel" "fake_stdin"
+@@ -78,10 +79,11 @@
+   with e ->
+     Sys.remove fname;
+     raise e
+-[@@if ocaml_version < (4, 14, 0)]
++[%%endif]
+
++[%%if ocaml_version >= (4, 14, 0)]
+ let use ffp content = Toploop.use_silently ffp (String content)
+-[@@if ocaml_version >= (4, 14, 0)]
++[%%endif]
+
+ let execute printval ?pp_code ?highlight_location pp_answer s =
+   let lb = Lexing.from_function (refill_lexbuf s (ref 0) pp_code) in
diff --git a/packages/js_of_ocaml-ppx/js_of_ocaml-ppx.6.0.1+ox/opam b/packages/js_of_ocaml-ppx/js_of_ocaml-ppx.6.0.1+ox/opam
index d8f9bba981..b396486e4f 100644
--- a/packages/js_of_ocaml-ppx/js_of_ocaml-ppx.6.0.1+ox/opam
+++ b/packages/js_of_ocaml-ppx/js_of_ocaml-ppx.6.0.1+ox/opam
@@ -42,6 +42,7 @@ patches: [
   "js_of_ocaml-add-unboxed-and-float-block.patch"
   "js_of_ocaml-ident-is_global.patch"
   "js_of_ocaml-remove-float-externals.patch"
+  "js_of_ocaml-ocaml_version-ppx.patch"
   "js_of_ocaml-test-diffs-caused-by-build-differences.patch"
   "js_of_ocaml-fix-build_fs.patch"
   "js_of_ocaml-iarray-primitives.patch"
@@ -84,7 +85,7 @@ patches: [
 extra-files: [
   [
     "js_of_ocaml-magic_number.ml.patch"
-    "sha256=05e204eac0338a76ca02db89ebb9505d80a7e268b93b746408356be913e219e6"
+    "sha256=aa69b6b6414a6a320e3a5102f24f3bd14199c317b9fd7b3e40ace94deee905e2"
   ]
   [
     "js_of_ocaml-compilation_unit-name.patch"
@@ -110,6 +111,10 @@ extra-files: [
     "js_of_ocaml-remove-float-externals.patch"
     "sha256=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
   ]
+  [
+    "js_of_ocaml-ocaml_version-ppx.patch"
+    "sha256=df6bcb6da8aa3dfd6bd0a178679987d41c400ec1803f4a66659cfc822d1b280f"
+  ]
   [
     "js_of_ocaml-test-diffs-caused-by-build-differences.patch"
     "sha256=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
@@ -120,7 +125,7 @@ extra-files: [
   ]
   [
     "js_of_ocaml-iarray-primitives.patch"
-    "sha256=8c320fb413daad0393347bf6a22ca31fe6f1d3dd34f58e313aa44cd060fc56f8"
+    "sha256=6f7805c3876229168ac8b023783c75226bf57e1a2bc2ded04d0adb9e46def515"
   ]
   [
     "js_of_ocaml-important-config-changes.patch"
@@ -188,7 +193,7 @@ extra-files: [
   ]
   [
     "js_of_ocaml-5.2.0-compiler-changes.patch"
-    "sha256=12626322e63a8eaf68d4c8a1a1d3f428832869fae7020588e0fe40bbd8fd8cf8"
+    "sha256=e6a88c1c3af53b07f273cf6b37ce980042efdc3aca8a371aba8cfdfc3914d97e"
   ]
   [
     "js_of_ocaml-5.3-tests-runtime.patch"
diff --git a/packages/js_of_ocaml-toplevel/js_of_ocaml-toplevel.6.0.1+ox/files/js_of_ocaml-5.2.0-compiler-changes.patch b/packages/js_of_ocaml-toplevel/js_of_ocaml-toplevel.6.0.1+ox/files/js_of_ocaml-5.2.0-compiler-changes.patch
index 2ad0a64b33..963ee6f716 100644
--- a/packages/js_of_ocaml-toplevel/js_of_ocaml-toplevel.6.0.1+ox/files/js_of_ocaml-5.2.0-compiler-changes.patch
+++ b/packages/js_of_ocaml-toplevel/js_of_ocaml-toplevel.6.0.1+ox/files/js_of_ocaml-5.2.0-compiler-changes.patch
@@ -335,7 +335,7 @@
 +
 +//Provides: caml_is_null
 +function caml_is_null(o) {
-+  return o === null;
++  return o === null ? 1 : 0;
 +}
 --- a/runtime/wasm/compare.wat
 +++ b/runtime/wasm/compare.wat
diff --git a/packages/js_of_ocaml-toplevel/js_of_ocaml-toplevel.6.0.1+ox/files/js_of_ocaml-iarray-primitives.patch b/packages/js_of_ocaml-toplevel/js_of_ocaml-toplevel.6.0.1+ox/files/js_of_ocaml-iarray-primitives.patch
index 8c851caefb..f6ba1a17da 100644
--- a/packages/js_of_ocaml-toplevel/js_of_ocaml-toplevel.6.0.1+ox/files/js_of_ocaml-iarray-primitives.patch
+++ b/packages/js_of_ocaml-toplevel/js_of_ocaml-toplevel.6.0.1+ox/files/js_of_ocaml-iarray-primitives.patch
@@ -1,6 +1,6 @@
 --- a/runtime/js/array.js
 +++ b/runtime/js/array.js
-@@ -198,6 +198,16 @@ function caml_array_make(len, init) {
+@@ -198,6 +198,16 @@
    return b;
  }
 
diff --git a/packages/js_of_ocaml-toplevel/js_of_ocaml-toplevel.6.0.1+ox/files/js_of_ocaml-magic_number.ml.patch b/packages/js_of_ocaml-toplevel/js_of_ocaml-toplevel.6.0.1+ox/files/js_of_ocaml-magic_number.ml.patch
index 24ec30b5bb..40ed5f1906 100644
--- a/packages/js_of_ocaml-toplevel/js_of_ocaml-toplevel.6.0.1+ox/files/js_of_ocaml-magic_number.ml.patch
+++ b/packages/js_of_ocaml-toplevel/js_of_ocaml-toplevel.6.0.1+ox/files/js_of_ocaml-magic_number.ml.patch
@@ -6,7 +6,7 @@
 
 -let v =
 -  let current = Ocaml_version.current in
-+let v = 568
++let v = 569
 +  (* let current = Ocaml_version.current in
    match current with
    | 4 :: 08 :: _ -> 25
diff --git a/packages/js_of_ocaml-toplevel/js_of_ocaml-toplevel.6.0.1+ox/files/js_of_ocaml-ocaml_version-ppx.patch b/packages/js_of_ocaml-toplevel/js_of_ocaml-toplevel.6.0.1+ox/files/js_of_ocaml-ocaml_version-ppx.patch
new file mode 100644
index 0000000000..d82b9d1fb8
--- /dev/null
+++ b/packages/js_of_ocaml-toplevel/js_of_ocaml-toplevel.6.0.1+ox/files/js_of_ocaml-ocaml_version-ppx.patch
@@ -0,0 +1,24 @@
+--- a/toplevel/lib/jsooTop.ml
++++ b/toplevel/lib/jsooTop.ml
+@@ -65,6 +65,7 @@
+     p := !p + len'';
+     len''
+
++[%%if ocaml_version < (4, 14, 0)]
+ let use ffp content =
+   let fname, oc =
+     Filename.open_temp_file ~mode:[ Open_binary ] "jsoo_toplevel" "fake_stdin"
+@@ -78,10 +79,11 @@
+   with e ->
+     Sys.remove fname;
+     raise e
+-[@@if ocaml_version < (4, 14, 0)]
++[%%endif]
+
++[%%if ocaml_version >= (4, 14, 0)]
+ let use ffp content = Toploop.use_silently ffp (String content)
+-[@@if ocaml_version >= (4, 14, 0)]
++[%%endif]
+
+ let execute printval ?pp_code ?highlight_location pp_answer s =
+   let lb = Lexing.from_function (refill_lexbuf s (ref 0) pp_code) in
diff --git a/packages/js_of_ocaml-toplevel/js_of_ocaml-toplevel.6.0.1+ox/opam b/packages/js_of_ocaml-toplevel/js_of_ocaml-toplevel.6.0.1+ox/opam
index 32860174d3..7bb4973c5b 100644
--- a/packages/js_of_ocaml-toplevel/js_of_ocaml-toplevel.6.0.1+ox/opam
+++ b/packages/js_of_ocaml-toplevel/js_of_ocaml-toplevel.6.0.1+ox/opam
@@ -45,6 +45,7 @@ patches: [
   "js_of_ocaml-add-unboxed-and-float-block.patch"
   "js_of_ocaml-ident-is_global.patch"
   "js_of_ocaml-remove-float-externals.patch"
+  "js_of_ocaml-ocaml_version-ppx.patch"
   "js_of_ocaml-test-diffs-caused-by-build-differences.patch"
   "js_of_ocaml-fix-build_fs.patch"
   "js_of_ocaml-iarray-primitives.patch"
@@ -87,7 +88,7 @@ patches: [
 extra-files: [
   [
     "js_of_ocaml-magic_number.ml.patch"
-    "sha256=05e204eac0338a76ca02db89ebb9505d80a7e268b93b746408356be913e219e6"
+    "sha256=aa69b6b6414a6a320e3a5102f24f3bd14199c317b9fd7b3e40ace94deee905e2"
   ]
   [
     "js_of_ocaml-compilation_unit-name.patch"
@@ -113,6 +114,10 @@ extra-files: [
     "js_of_ocaml-remove-float-externals.patch"
     "sha256=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
   ]
+  [
+    "js_of_ocaml-ocaml_version-ppx.patch"
+    "sha256=df6bcb6da8aa3dfd6bd0a178679987d41c400ec1803f4a66659cfc822d1b280f"
+  ]
   [
     "js_of_ocaml-test-diffs-caused-by-build-differences.patch"
     "sha256=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
@@ -123,7 +128,7 @@ extra-files: [
   ]
   [
     "js_of_ocaml-iarray-primitives.patch"
-    "sha256=8c320fb413daad0393347bf6a22ca31fe6f1d3dd34f58e313aa44cd060fc56f8"
+    "sha256=6f7805c3876229168ac8b023783c75226bf57e1a2bc2ded04d0adb9e46def515"
   ]
   [
     "js_of_ocaml-important-config-changes.patch"
@@ -191,7 +196,7 @@ extra-files: [
   ]
   [
     "js_of_ocaml-5.2.0-compiler-changes.patch"
-    "sha256=12626322e63a8eaf68d4c8a1a1d3f428832869fae7020588e0fe40bbd8fd8cf8"
+    "sha256=e6a88c1c3af53b07f273cf6b37ce980042efdc3aca8a371aba8cfdfc3914d97e"
   ]
   [
     "js_of_ocaml-5.3-tests-runtime.patch"
diff --git a/packages/js_of_ocaml/js_of_ocaml.6.0.1+ox/files/js_of_ocaml-5.2.0-compiler-changes.patch b/packages/js_of_ocaml/js_of_ocaml.6.0.1+ox/files/js_of_ocaml-5.2.0-compiler-changes.patch
index 2ad0a64b33..963ee6f716 100644
--- a/packages/js_of_ocaml/js_of_ocaml.6.0.1+ox/files/js_of_ocaml-5.2.0-compiler-changes.patch
+++ b/packages/js_of_ocaml/js_of_ocaml.6.0.1+ox/files/js_of_ocaml-5.2.0-compiler-changes.patch
@@ -335,7 +335,7 @@
 +
 +//Provides: caml_is_null
 +function caml_is_null(o) {
-+  return o === null;
++  return o === null ? 1 : 0;
 +}
 --- a/runtime/wasm/compare.wat
 +++ b/runtime/wasm/compare.wat
diff --git a/packages/js_of_ocaml/js_of_ocaml.6.0.1+ox/files/js_of_ocaml-iarray-primitives.patch b/packages/js_of_ocaml/js_of_ocaml.6.0.1+ox/files/js_of_ocaml-iarray-primitives.patch
index 8c851caefb..f6ba1a17da 100644
--- a/packages/js_of_ocaml/js_of_ocaml.6.0.1+ox/files/js_of_ocaml-iarray-primitives.patch
+++ b/packages/js_of_ocaml/js_of_ocaml.6.0.1+ox/files/js_of_ocaml-iarray-primitives.patch
@@ -1,6 +1,6 @@
 --- a/runtime/js/array.js
 +++ b/runtime/js/array.js
-@@ -198,6 +198,16 @@ function caml_array_make(len, init) {
+@@ -198,6 +198,16 @@
    return b;
  }
 
diff --git a/packages/js_of_ocaml/js_of_ocaml.6.0.1+ox/files/js_of_ocaml-magic_number.ml.patch b/packages/js_of_ocaml/js_of_ocaml.6.0.1+ox/files/js_of_ocaml-magic_number.ml.patch
index 24ec30b5bb..40ed5f1906 100644
--- a/packages/js_of_ocaml/js_of_ocaml.6.0.1+ox/files/js_of_ocaml-magic_number.ml.patch
+++ b/packages/js_of_ocaml/js_of_ocaml.6.0.1+ox/files/js_of_ocaml-magic_number.ml.patch
@@ -6,7 +6,7 @@
 
 -let v =
 -  let current = Ocaml_version.current in
-+let v = 568
++let v = 569
 +  (* let current = Ocaml_version.current in
    match current with
    | 4 :: 08 :: _ -> 25
diff --git a/packages/js_of_ocaml/js_of_ocaml.6.0.1+ox/files/js_of_ocaml-ocaml_version-ppx.patch b/packages/js_of_ocaml/js_of_ocaml.6.0.1+ox/files/js_of_ocaml-ocaml_version-ppx.patch
new file mode 100644
index 0000000000..d82b9d1fb8
--- /dev/null
+++ b/packages/js_of_ocaml/js_of_ocaml.6.0.1+ox/files/js_of_ocaml-ocaml_version-ppx.patch
@@ -0,0 +1,24 @@
+--- a/toplevel/lib/jsooTop.ml
++++ b/toplevel/lib/jsooTop.ml
+@@ -65,6 +65,7 @@
+     p := !p + len'';
+     len''
+
++[%%if ocaml_version < (4, 14, 0)]
+ let use ffp content =
+   let fname, oc =
+     Filename.open_temp_file ~mode:[ Open_binary ] "jsoo_toplevel" "fake_stdin"
+@@ -78,10 +79,11 @@
+   with e ->
+     Sys.remove fname;
+     raise e
+-[@@if ocaml_version < (4, 14, 0)]
++[%%endif]
+
++[%%if ocaml_version >= (4, 14, 0)]
+ let use ffp content = Toploop.use_silently ffp (String content)
+-[@@if ocaml_version >= (4, 14, 0)]
++[%%endif]
+
+ let execute printval ?pp_code ?highlight_location pp_answer s =
+   let lb = Lexing.from_function (refill_lexbuf s (ref 0) pp_code) in
diff --git a/packages/js_of_ocaml/js_of_ocaml.6.0.1+ox/opam b/packages/js_of_ocaml/js_of_ocaml.6.0.1+ox/opam
index 050e89c447..5850e78776 100644
--- a/packages/js_of_ocaml/js_of_ocaml.6.0.1+ox/opam
+++ b/packages/js_of_ocaml/js_of_ocaml.6.0.1+ox/opam
@@ -42,6 +42,7 @@ patches: [
   "js_of_ocaml-add-unboxed-and-float-block.patch"
   "js_of_ocaml-ident-is_global.patch"
   "js_of_ocaml-remove-float-externals.patch"
+  "js_of_ocaml-ocaml_version-ppx.patch"
   "js_of_ocaml-test-diffs-caused-by-build-differences.patch"
   "js_of_ocaml-fix-build_fs.patch"
   "js_of_ocaml-iarray-primitives.patch"
@@ -84,7 +85,7 @@ patches: [
 extra-files: [
   [
     "js_of_ocaml-magic_number.ml.patch"
-    "sha256=05e204eac0338a76ca02db89ebb9505d80a7e268b93b746408356be913e219e6"
+    "sha256=aa69b6b6414a6a320e3a5102f24f3bd14199c317b9fd7b3e40ace94deee905e2"
   ]
   [
     "js_of_ocaml-compilation_unit-name.patch"
@@ -110,6 +111,10 @@ extra-files: [
     "js_of_ocaml-remove-float-externals.patch"
     "sha256=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
   ]
+  [
+    "js_of_ocaml-ocaml_version-ppx.patch"
+    "sha256=df6bcb6da8aa3dfd6bd0a178679987d41c400ec1803f4a66659cfc822d1b280f"
+  ]
   [
     "js_of_ocaml-test-diffs-caused-by-build-differences.patch"
     "sha256=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
@@ -120,7 +125,7 @@ extra-files: [
   ]
   [
     "js_of_ocaml-iarray-primitives.patch"
-    "sha256=8c320fb413daad0393347bf6a22ca31fe6f1d3dd34f58e313aa44cd060fc56f8"
+    "sha256=6f7805c3876229168ac8b023783c75226bf57e1a2bc2ded04d0adb9e46def515"
   ]
   [
     "js_of_ocaml-important-config-changes.patch"
@@ -188,7 +193,7 @@ extra-files: [
   ]
   [
     "js_of_ocaml-5.2.0-compiler-changes.patch"
-    "sha256=12626322e63a8eaf68d4c8a1a1d3f428832869fae7020588e0fe40bbd8fd8cf8"
+    "sha256=e6a88c1c3af53b07f273cf6b37ce980042efdc3aca8a371aba8cfdfc3914d97e"
   ]
   [
     "js_of_ocaml-5.3-tests-runtime.patch"
diff --git a/packages/js_of_ocaml_patches/js_of_ocaml_patches.v0.18~preview.130.55+197/opam b/packages/js_of_ocaml_patches/js_of_ocaml_patches.v0.18~preview.130.74+175/opam
similarity index 100%
rename from packages/js_of_ocaml_patches/js_of_ocaml_patches.v0.18~preview.130.55+197/opam
rename to packages/js_of_ocaml_patches/js_of_ocaml_patches.v0.18~preview.130.74+175/opam
diff --git a/packages/jsonaf/jsonaf.v0.18~preview.130.55+197/opam b/packages/jsonaf/jsonaf.v0.18~preview.130.74+175/opam
similarity index 74%
rename from packages/jsonaf/jsonaf.v0.18~preview.130.55+197/opam
rename to packages/jsonaf/jsonaf.v0.18~preview.130.74+175/opam
index 40dc4b6d27..7c286fc857 100644
--- a/packages/jsonaf/jsonaf.v0.18~preview.130.55+197/opam
+++ b/packages/jsonaf/jsonaf.v0.18~preview.130.74+175/opam
@@ -11,8 +11,8 @@ build: [
 ]
 depends: [
   "ocaml"       {>= "5.1.0"}
-  "base"        {= "v0.18~preview.130.55+197"}
-  "ppx_jane"    {= "v0.18~preview.130.55+197"}
+  "base"        {= "v0.18~preview.130.74+175"}
+  "ppx_jane"    {= "v0.18~preview.130.74+175"}
   "angstrom"    {>= "0.15.0"}
   "bigstringaf"
   "dune"        {>= "3.17.0"}
@@ -26,7 +26,7 @@ A library for parsing, manipulating, and serializing data structured as JSON.
 """
 url {
   src:
-    "https://github.com/janestreet/jsonaf/archive/c4c9054b7ba0800baa2095c188f0541e88b0ee76.tar.gz"
+    "https://github.com/janestreet/jsonaf/archive/5ce5cedfe828c06ae4ecb05f36c4fa59b7c19ac0.tar.gz"
   checksum:
-    "sha256=e96f7cd3b156cc71f95579951610e23b40c2825e81ffef11b2e21fd319e4dd65"
+    "sha256=98d5af58f4d9f8a07cc21c841acaeda4a19aaae216d2771e154d815249adf3be"
 }
diff --git a/packages/jst-config/jst-config.v0.18~preview.130.55+197/opam b/packages/jst-config/jst-config.v0.18~preview.130.74+175/opam
similarity index 91%
rename from packages/jst-config/jst-config.v0.18~preview.130.55+197/opam
rename to packages/jst-config/jst-config.v0.18~preview.130.74+175/opam
index 5333ce265d..065d637aeb 100644
--- a/packages/jst-config/jst-config.v0.18~preview.130.55+197/opam
+++ b/packages/jst-config/jst-config.v0.18~preview.130.74+175/opam
@@ -12,8 +12,8 @@ build: [
 ]
 depends: [
   "ocaml"             {>= "5.1.0"}
-  "base"              {= "v0.18~preview.130.55+197"}
-  "ppx_assert"        {= "v0.18~preview.130.55+197"}
+  "base"              {= "v0.18~preview.130.74+175"}
+  "ppx_assert"        {= "v0.18~preview.130.74+175"}
   "dune"              {>= "3.17.0"}
   "dune-configurator"
 ]
diff --git a/packages/legacy_diffable/legacy_diffable.v0.18~preview.130.55+197/opam b/packages/legacy_diffable/legacy_diffable.v0.18~preview.130.74+175/opam
similarity index 80%
rename from packages/legacy_diffable/legacy_diffable.v0.18~preview.130.55+197/opam
rename to packages/legacy_diffable/legacy_diffable.v0.18~preview.130.74+175/opam
index ac155db85f..dbf2be2973 100644
--- a/packages/legacy_diffable/legacy_diffable.v0.18~preview.130.55+197/opam
+++ b/packages/legacy_diffable/legacy_diffable.v0.18~preview.130.74+175/opam
@@ -12,10 +12,10 @@ build: [
 ]
 depends: [
   "ocaml"           {>= "5.1.0"}
-  "core"            {= "v0.18~preview.130.55+197"}
-  "ppx_jane"        {= "v0.18~preview.130.55+197"}
-  "stored_reversed" {= "v0.18~preview.130.55+197"}
-  "streamable"      {= "v0.18~preview.130.55+197"}
+  "core"            {= "v0.18~preview.130.74+175"}
+  "ppx_jane"        {= "v0.18~preview.130.74+175"}
+  "stored_reversed" {= "v0.18~preview.130.74+175"}
+  "streamable"      {= "v0.18~preview.130.74+175"}
   "dune"            {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/line-up-words/line-up-words.v0.18~preview.130.55+197/opam b/packages/line-up-words/line-up-words.v0.18~preview.130.74+175/opam
similarity index 80%
rename from packages/line-up-words/line-up-words.v0.18~preview.130.55+197/opam
rename to packages/line-up-words/line-up-words.v0.18~preview.130.74+175/opam
index cf69673d26..cab6118a6c 100644
--- a/packages/line-up-words/line-up-words.v0.18~preview.130.55+197/opam
+++ b/packages/line-up-words/line-up-words.v0.18~preview.130.74+175/opam
@@ -12,11 +12,11 @@ build: [
 ]
 depends: [
   "ocaml"         {>= "5.1.0"}
-  "core"          {= "v0.18~preview.130.55+197"}
-  "core_unix"     {= "v0.18~preview.130.55+197"}
-  "patience_diff" {= "v0.18~preview.130.55+197"}
-  "ppx_jane"      {= "v0.18~preview.130.55+197"}
-  "re2"           {= "v0.18~preview.130.55+197"}
+  "core"          {= "v0.18~preview.130.74+175"}
+  "core_unix"     {= "v0.18~preview.130.74+175"}
+  "patience_diff" {= "v0.18~preview.130.74+175"}
+  "ppx_jane"      {= "v0.18~preview.130.74+175"}
+  "re2"           {= "v0.18~preview.130.74+175"}
   "dune"          {>= "3.17.0"}
   "pcre"
 ]
diff --git a/packages/lsp_rpc/lsp_rpc.v0.18~preview.130.55+197/opam b/packages/lsp_rpc/lsp_rpc.v0.18~preview.130.74+175/opam
similarity index 79%
rename from packages/lsp_rpc/lsp_rpc.v0.18~preview.130.55+197/opam
rename to packages/lsp_rpc/lsp_rpc.v0.18~preview.130.74+175/opam
index 646d3753f9..3eee215508 100644
--- a/packages/lsp_rpc/lsp_rpc.v0.18~preview.130.55+197/opam
+++ b/packages/lsp_rpc/lsp_rpc.v0.18~preview.130.74+175/opam
@@ -11,12 +11,12 @@ build: [
 ]
 depends: [
   "ocaml"           {>= "4.14.0"}
-  "async"           {= "v0.18~preview.130.55+197"}
-  "core"            {= "v0.18~preview.130.55+197"}
-  "core_kernel"     {= "v0.18~preview.130.55+197"}
-  "core_unix"       {= "v0.18~preview.130.55+197"}
-  "ppx_jane"        {= "v0.18~preview.130.55+197"}
-  "ppx_yojson_conv" {= "v0.18~preview.130.55+197"}
+  "async"           {= "v0.18~preview.130.74+175"}
+  "core"            {= "v0.18~preview.130.74+175"}
+  "core_kernel"     {= "v0.18~preview.130.74+175"}
+  "core_unix"       {= "v0.18~preview.130.74+175"}
+  "ppx_jane"        {= "v0.18~preview.130.74+175"}
+  "ppx_yojson_conv" {= "v0.18~preview.130.74+175"}
   "dune"            {>= "3.17.0"}
   "jsonrpc"         {= "1.19.0+ox"}
   "lsp"             {= "1.19.0+ox"}
diff --git a/packages/man_in_the_middle_debugger/man_in_the_middle_debugger.v0.18~preview.130.55+197/opam b/packages/man_in_the_middle_debugger/man_in_the_middle_debugger.v0.18~preview.130.74+175/opam
similarity index 77%
rename from packages/man_in_the_middle_debugger/man_in_the_middle_debugger.v0.18~preview.130.55+197/opam
rename to packages/man_in_the_middle_debugger/man_in_the_middle_debugger.v0.18~preview.130.74+175/opam
index fb25e6c0a2..e253b158e5 100644
--- a/packages/man_in_the_middle_debugger/man_in_the_middle_debugger.v0.18~preview.130.55+197/opam
+++ b/packages/man_in_the_middle_debugger/man_in_the_middle_debugger.v0.18~preview.130.74+175/opam
@@ -13,9 +13,9 @@ build: [
 ]
 depends: [
   "ocaml"          {>= "5.1.0"}
-  "async"          {= "v0.18~preview.130.55+197"}
-  "core"           {= "v0.18~preview.130.55+197"}
-  "ppx_jane"       {= "v0.18~preview.130.55+197"}
+  "async"          {= "v0.18~preview.130.74+175"}
+  "core"           {= "v0.18~preview.130.74+175"}
+  "ppx_jane"       {= "v0.18~preview.130.74+175"}
   "angstrom"       {>= "0.15.0"}
   "angstrom-async" {>= "0.15.0"}
   "dune"           {>= "3.17.0"}
@@ -28,7 +28,7 @@ protocol by capturing the traffic that passes between them.
 """
 url {
   src:
-    "https://github.com/janestreet/man_in_the_middle_debugger/archive/7cdc3af2c1687e06f2e91b89eb19b31497d82238.tar.gz"
+    "https://github.com/janestreet/man_in_the_middle_debugger/archive/8239b3dc48dc88659af9f559b1419a648d4fd6a5.tar.gz"
   checksum:
-    "sha256=340dc41284561a94274abd7792cec052b4e7c00316de3c69023a6779575aec14"
+    "sha256=2fbc6d02cb2c0be268586f732f73baa559a246092958886b424dc8e24f52b6c5"
 }
diff --git a/packages/maybe_pushback/maybe_pushback.v0.18~preview.130.55+197/opam b/packages/maybe_pushback/maybe_pushback.v0.18~preview.130.74+175/opam
similarity index 89%
rename from packages/maybe_pushback/maybe_pushback.v0.18~preview.130.55+197/opam
rename to packages/maybe_pushback/maybe_pushback.v0.18~preview.130.74+175/opam
index ae64a36957..b03bb79c52 100644
--- a/packages/maybe_pushback/maybe_pushback.v0.18~preview.130.55+197/opam
+++ b/packages/maybe_pushback/maybe_pushback.v0.18~preview.130.74+175/opam
@@ -12,9 +12,9 @@ build: [
 ]
 depends: [
   "ocaml"        {>= "5.1.0"}
-  "async_kernel" {= "v0.18~preview.130.55+197"}
-  "core"         {= "v0.18~preview.130.55+197"}
-  "ppx_jane"     {= "v0.18~preview.130.55+197"}
+  "async_kernel" {= "v0.18~preview.130.74+175"}
+  "core"         {= "v0.18~preview.130.74+175"}
+  "ppx_jane"     {= "v0.18~preview.130.74+175"}
   "dune"         {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/memtrace_viewer/memtrace_viewer.v0.18~preview.130.55+197/opam b/packages/memtrace_viewer/memtrace_viewer.v0.18~preview.130.55+197/opam
deleted file mode 100644
index f397b0a233..0000000000
--- a/packages/memtrace_viewer/memtrace_viewer.v0.18~preview.130.55+197/opam
+++ /dev/null
@@ -1,57 +0,0 @@
-opam-version: "2.0"
-maintainer: "Jane Street developers"
-authors: ["Jane Street Group, LLC"]
-homepage: "https://github.com/janestreet/memtrace_viewer"
-bug-reports: "https://github.com/janestreet/memtrace_viewer/issues"
-dev-repo: "git+https://github.com/janestreet/memtrace_viewer.git"
-doc:
-  "https://ocaml.janestreet.com/ocaml-core/latest/doc/memtrace_viewer/index.html"
-license: "MIT"
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-]
-depends: [
-  "ocaml"                 {>= "5.1.0"}
-  "async"                 {= "v0.18~preview.130.55+197"}
-  "async_js"              {= "v0.18~preview.130.55+197"}
-  "async_kernel"          {= "v0.18~preview.130.55+197"}
-  "async_rpc_kernel"      {= "v0.18~preview.130.55+197"}
-  "async_rpc_websocket"   {= "v0.18~preview.130.55+197"}
-  "async_unix"            {= "v0.18~preview.130.55+197"}
-  "bonsai"                {= "v0.18~preview.130.55+197"}
-  "bonsai_web"            {= "v0.18~preview.130.55+197"}
-  "bonsai_web_components" {= "v0.18~preview.130.55+197"}
-  "codicons"              {= "v0.18~preview.130.55+197"}
-  "core"                  {= "v0.18~preview.130.55+197"}
-  "core_kernel"           {= "v0.18~preview.130.55+197"}
-  "core_unix"             {= "v0.18~preview.130.55+197"}
-  "incr_dom"              {= "v0.18~preview.130.55+197"}
-  "incr_map"              {= "v0.18~preview.130.55+197"}
-  "ocaml-embed-file"      {= "v0.18~preview.130.55+197"}
-  "ppx_css"               {= "v0.18~preview.130.55+197"}
-  "ppx_jane"              {= "v0.18~preview.130.55+197"}
-  "ppx_pattern_bind"      {= "v0.18~preview.130.55+197"}
-  "textutils"             {= "v0.18~preview.130.55+197"}
-  "virtual_dom"           {= "v0.18~preview.130.55+197"}
-  "cohttp"                {>= "2.5.6"}
-  "cohttp-async"          {>= "2.5.7" & < "3.0.0" | >= "5.1.1" & < "6.0.0"}
-  "dune"                  {>= "3.17.0"}
-  "js_of_ocaml"           {= "6.0.1+ox"}
-  "js_of_ocaml-ppx"       {= "6.0.1+ox"}
-  "memtrace"              {>= "0.2.1.2"}
-  "uri"                   {>= "3.0.0"}
-]
-available: arch != "arm32" & arch != "x86_32"
-synopsis: "Interactive memory profiler based on Memtrace"
-description: """
-Processes traces produced by the Memtrace library and displays the
-top allocators in a table or flame graph. To help find space leaks,
-events can be filtered by lifetime, showing only allocations of
-objects that are still live at peak memory usage.
-"""
-url {
-  src:
-    "https://github.com/janestreet/memtrace_viewer/archive/9a65972a537feb006362d6e58b4882f26c0704f5.tar.gz"
-  checksum:
-    "sha256=e48edc0941b1187ac7ab3a35092f7887863080805125f3e0387d722dc353d199"
-}
diff --git a/packages/memtrace_viewer/memtrace_viewer.v0.18~preview.130.74+175/opam b/packages/memtrace_viewer/memtrace_viewer.v0.18~preview.130.74+175/opam
new file mode 100644
index 0000000000..af1dbce1d1
--- /dev/null
+++ b/packages/memtrace_viewer/memtrace_viewer.v0.18~preview.130.74+175/opam
@@ -0,0 +1,57 @@
+opam-version: "2.0"
+maintainer: "Jane Street developers"
+authors: ["Jane Street Group, LLC"]
+homepage: "https://github.com/janestreet/memtrace_viewer"
+bug-reports: "https://github.com/janestreet/memtrace_viewer/issues"
+dev-repo: "git+https://github.com/janestreet/memtrace_viewer.git"
+doc:
+  "https://ocaml.janestreet.com/ocaml-core/latest/doc/memtrace_viewer/index.html"
+license: "MIT"
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+]
+depends: [
+  "ocaml"                 {>= "5.1.0"}
+  "async"                 {= "v0.18~preview.130.74+175"}
+  "async_js"              {= "v0.18~preview.130.74+175"}
+  "async_kernel"          {= "v0.18~preview.130.74+175"}
+  "async_rpc_kernel"      {= "v0.18~preview.130.74+175"}
+  "async_rpc_websocket"   {= "v0.18~preview.130.74+175"}
+  "async_unix"            {= "v0.18~preview.130.74+175"}
+  "bonsai"                {= "v0.18~preview.130.74+175"}
+  "bonsai_web"            {= "v0.18~preview.130.74+175"}
+  "bonsai_web_components" {= "v0.18~preview.130.74+175"}
+  "codicons"              {= "v0.18~preview.130.74+175"}
+  "core"                  {= "v0.18~preview.130.74+175"}
+  "core_kernel"           {= "v0.18~preview.130.74+175"}
+  "core_unix"             {= "v0.18~preview.130.74+175"}
+  "incr_dom"              {= "v0.18~preview.130.74+175"}
+  "incr_map"              {= "v0.18~preview.130.74+175"}
+  "ocaml-embed-file"      {= "v0.18~preview.130.74+175"}
+  "ppx_css"               {= "v0.18~preview.130.74+175"}
+  "ppx_jane"              {= "v0.18~preview.130.74+175"}
+  "ppx_pattern_bind"      {= "v0.18~preview.130.74+175"}
+  "textutils"             {= "v0.18~preview.130.74+175"}
+  "virtual_dom"           {= "v0.18~preview.130.74+175"}
+  "cohttp"                {>= "2.5.6"}
+  "cohttp-async"          {>= "2.5.7" & < "3.0.0" | >= "5.1.1" & < "6.0.0"}
+  "dune"                  {>= "3.17.0"}
+  "js_of_ocaml"           {= "6.0.1+ox"}
+  "js_of_ocaml-ppx"       {= "6.0.1+ox"}
+  "memtrace"              {>= "0.2.1.2"}
+  "uri"                   {>= "3.0.0"}
+]
+available: arch != "arm32" & arch != "x86_32"
+synopsis: "Interactive memory profiler based on Memtrace"
+description: """
+Processes traces produced by the Memtrace library and displays the
+top allocators in a table or flame graph. To help find space leaks,
+events can be filtered by lifetime, showing only allocations of
+objects that are still live at peak memory usage.
+"""
+url {
+  src:
+    "https://github.com/janestreet/memtrace_viewer/archive/8db8e0c7ef3894d4d025c3f73dd189834bada277.tar.gz"
+  checksum:
+    "sha256=7e58cd644b1443200973828e0470526c31b3894bc434723ed3d2789cec0fdea7"
+}
diff --git a/packages/mlt_parser/mlt_parser.v0.18~preview.130.55+197/opam b/packages/mlt_parser/mlt_parser.v0.18~preview.130.74+175/opam
similarity index 88%
rename from packages/mlt_parser/mlt_parser.v0.18~preview.130.55+197/opam
rename to packages/mlt_parser/mlt_parser.v0.18~preview.130.74+175/opam
index 89d0bc53ac..c6133d864f 100644
--- a/packages/mlt_parser/mlt_parser.v0.18~preview.130.55+197/opam
+++ b/packages/mlt_parser/mlt_parser.v0.18~preview.130.74+175/opam
@@ -12,9 +12,9 @@ build: [
 ]
 depends: [
   "ocaml"      {>= "5.1.0"}
-  "core"       {= "v0.18~preview.130.55+197"}
-  "ppx_expect" {= "v0.18~preview.130.55+197"}
-  "ppx_jane"   {= "v0.18~preview.130.55+197"}
+  "core"       {= "v0.18~preview.130.74+175"}
+  "ppx_expect" {= "v0.18~preview.130.74+175"}
+  "ppx_jane"   {= "v0.18~preview.130.74+175"}
   "dune"       {>= "3.17.0"}
   "ppxlib"     {= "0.33.0+ox"}
 ]
diff --git a/packages/n_ary/n_ary.v0.18~preview.130.55+197/opam b/packages/n_ary/n_ary.v0.18~preview.130.74+175/opam
similarity index 66%
rename from packages/n_ary/n_ary.v0.18~preview.130.55+197/opam
rename to packages/n_ary/n_ary.v0.18~preview.130.74+175/opam
index 23d94fdda2..9e1bd532aa 100644
--- a/packages/n_ary/n_ary.v0.18~preview.130.55+197/opam
+++ b/packages/n_ary/n_ary.v0.18~preview.130.74+175/opam
@@ -11,14 +11,14 @@ build: [
 ]
 depends: [
   "ocaml"                    {>= "5.1.0"}
-  "base"                     {= "v0.18~preview.130.55+197"}
-  "expect_test_helpers_core" {= "v0.18~preview.130.55+197"}
-  "ppx_compare"              {= "v0.18~preview.130.55+197"}
-  "ppx_enumerate"            {= "v0.18~preview.130.55+197"}
-  "ppx_hash"                 {= "v0.18~preview.130.55+197"}
-  "ppx_jane"                 {= "v0.18~preview.130.55+197"}
-  "ppx_sexp_conv"            {= "v0.18~preview.130.55+197"}
-  "ppx_sexp_message"         {= "v0.18~preview.130.55+197"}
+  "base"                     {= "v0.18~preview.130.74+175"}
+  "expect_test_helpers_core" {= "v0.18~preview.130.74+175"}
+  "ppx_compare"              {= "v0.18~preview.130.74+175"}
+  "ppx_enumerate"            {= "v0.18~preview.130.74+175"}
+  "ppx_hash"                 {= "v0.18~preview.130.74+175"}
+  "ppx_jane"                 {= "v0.18~preview.130.74+175"}
+  "ppx_sexp_conv"            {= "v0.18~preview.130.74+175"}
+  "ppx_sexp_message"         {= "v0.18~preview.130.74+175"}
   "dune"                     {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/netsnmp/netsnmp.v0.18~preview.130.55+197/opam b/packages/netsnmp/netsnmp.v0.18~preview.130.74+175/opam
similarity index 87%
rename from packages/netsnmp/netsnmp.v0.18~preview.130.55+197/opam
rename to packages/netsnmp/netsnmp.v0.18~preview.130.74+175/opam
index 3b96414a98..631ef7e908 100644
--- a/packages/netsnmp/netsnmp.v0.18~preview.130.55+197/opam
+++ b/packages/netsnmp/netsnmp.v0.18~preview.130.74+175/opam
@@ -11,9 +11,9 @@ build: [
 ]
 depends: [
   "ocaml"        {>= "5.1.0"}
-  "async"        {= "v0.18~preview.130.55+197"}
-  "core"         {= "v0.18~preview.130.55+197"}
-  "ppx_jane"     {= "v0.18~preview.130.55+197"}
+  "async"        {= "v0.18~preview.130.74+175"}
+  "core"         {= "v0.18~preview.130.74+175"}
+  "ppx_jane"     {= "v0.18~preview.130.74+175"}
   "conf-netsnmp" {>= "1.0.0"}
   "dune"         {>= "3.17.0"}
   "re"           {= "1.14.0+ox"}
diff --git a/packages/nonempty_interval_lib/nonempty_interval_lib.v0.18~preview.130.55+197/opam b/packages/nonempty_interval_lib/nonempty_interval_lib.v0.18~preview.130.74+175/opam
similarity index 68%
rename from packages/nonempty_interval_lib/nonempty_interval_lib.v0.18~preview.130.55+197/opam
rename to packages/nonempty_interval_lib/nonempty_interval_lib.v0.18~preview.130.74+175/opam
index e4ac2d753d..dcc0377478 100644
--- a/packages/nonempty_interval_lib/nonempty_interval_lib.v0.18~preview.130.55+197/opam
+++ b/packages/nonempty_interval_lib/nonempty_interval_lib.v0.18~preview.130.74+175/opam
@@ -11,12 +11,11 @@ build: [
   ["dune" "build" "-p" name "-j" jobs]
 ]
 depends: [
-  "ocaml"       {>= "5.1.0"}
-  "core"        {= "v0.18~preview.130.55+197"}
-  "core_kernel" {= "v0.18~preview.130.55+197"}
-  "core_unix"   {= "v0.18~preview.130.55+197"}
-  "ppx_jane"    {= "v0.18~preview.130.55+197"}
-  "dune"        {>= "3.17.0"}
+  "ocaml"     {>= "5.1.0"}
+  "core"      {= "v0.18~preview.130.74+175"}
+  "core_unix" {= "v0.18~preview.130.74+175"}
+  "ppx_jane"  {= "v0.18~preview.130.74+175"}
+  "dune"      {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
 synopsis: "An Interval_lib.Interval but with empty intervals disallowed."
@@ -25,7 +24,7 @@ An interval with an extra layer of safety and more convenient accessors that ret
 """
 url {
   src:
-    "https://github.com/janestreet/nonempty_interval_lib/archive/a15089ff4844e7bc5f6716635d325c05dd6046d3.tar.gz"
+    "https://github.com/janestreet/nonempty_interval_lib/archive/caba5c5f0c231295d4898a33d3093ee778e50962.tar.gz"
   checksum:
-    "sha256=5ee546a17dba8a637142acb0d059affafc9c9c8f14fc97bd2645e2204e85d2bd"
+    "sha256=44f4115067b0f34ae1996256b3f67568176efd17d11727dabbc6635464fdb185"
 }
diff --git a/packages/notty-community/notty-community.0.2.4+ox/files/notty-ctrl_backspace.patch b/packages/notty-community/notty-community.0.2.4+ox/files/notty-ctrl_backspace.patch
new file mode 100644
index 0000000000..b774fe3a56
--- /dev/null
+++ b/packages/notty-community/notty-community.0.2.4+ox/files/notty-ctrl_backspace.patch
@@ -0,0 +1,12 @@
+--- a/src/notty.ml
++++ b/src/notty.ml
+@@ -734,7 +734,8 @@ module Unescape = struct
+     | Uchar u -> Some (`Key (`Uchar u, []))
+ 
+     | C0 '\x1b'        -> key `Escape []
+-    | C0 ('\b'|'\x7f') -> key `Backspace []
++    | C0 '\b'          -> key `Backspace [ `Ctrl ]
++    | C0 '\x7f'        -> key `Backspace []
+     | C0 '\n'          -> key `Enter []
+     | C0 '\t'          -> key `Tab []
+ 
diff --git a/packages/notty-community/notty-community.0.2.4+ox/files/notty-defensively-ignore-corrupted-x10-vscode-mouse-codes.patch b/packages/notty-community/notty-community.0.2.4+ox/files/notty-defensively-ignore-corrupted-x10-vscode-mouse-codes.patch
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/notty-community/notty-community.0.2.4+ox/files/notty-different_kinds_of_cursors.patch b/packages/notty-community/notty-community.0.2.4+ox/files/notty-different_kinds_of_cursors.patch
new file mode 100644
index 0000000000..40de6aed90
--- /dev/null
+++ b/packages/notty-community/notty-community.0.2.4+ox/files/notty-different_kinds_of_cursors.patch
@@ -0,0 +1,130 @@
+--- a/examples/cursor.ml
++++ b/examples/cursor.ml
+@@ -5,12 +5,13 @@ open Notty
+ open Common
+ 
+ let rec main t (x, y as pos) =
++  let cursor = (x, y, `Bar) in
+   let img =
+     let dot = I.string A.(bg lightred ++ fg black) "✓" |> I.pad ~l:x ~t:y
+     and txt = I.strf ~attr:A.(fg lightblack) "@(%d, %d)" x y in
+     I.(txt </> dot) in
+   Term.image t img;
+-  Term.cursor t (Some pos);
++  Term.cursor t (Some cursor);
+   match Term.event t with
+   | `End | `Key (`Escape, []) | `Key (`ASCII 'C', [`Ctrl]) -> ()
+   | `Resize _ -> main t pos
+--- a/src/notty.ml
++++ b/src/notty.ml
+@@ -493,6 +493,15 @@ module Cap = struct
+ 
+   let (&) op1 op2 buf = op1 buf; op2 buf
+ 
++  type cursor =
++    [ `Bar
++    | `Bar_blinking
++    | `Block
++    | `Block_blinking
++    | `Underline
++    | `Underline_blinking
++    ]
++
+   type t = {
+     skip    : int -> op
+   ; sgr     : A.t -> op
+@@ -500,6 +509,7 @@ module Cap = struct
+   ; clreol  : op
+   ; cursvis : bool -> op
+   ; cursat  : int -> int -> op
++  ; cursor_kind : cursor -> op
+   ; cubcuf  : int -> op
+   ; cuucud  : int -> op
+   ; cr      : op
+@@ -546,7 +556,19 @@ module Cap = struct
+     ; cuucud  = (fun y b -> b <| "\x1b["; b <! abs y; b <. if y < 0 then 'A' else 'B')
+     ; cr      = (fun b -> b <| "\x1b[1G")
+     ; clreol  = (fun b -> b <| "\x1b[K")
+     ; cursvis = (fun x b -> b <| if x then "\x1b[34h\x1b[?25h" else "\x1b[?25l")
++    ; cursor_kind = (fun kind b -> 
++                      let n =
++                        match kind with
++                        | `Bar -> "6"
++                        | `Bar_blinking -> "5"
++                        | `Block -> "2"
++                        | `Block_blinking -> "1"
++                        | `Underline -> "4"
++                        | `Underline_blinking -> "3"
++                      in
++                      let code = "\x1b[" ^ n ^ " q" in
++                      b <| code)
+     ; mouse   = (fun x b -> b <| if x then "\x1b[?1000;1002;1005;1015;1006h"
+                                       else "\x1b[?1000;1002;1005;1015;1006l")
+     ; bpaste  = (fun x b -> b <| if x then "\x1b[?2004h" else "\x1b[?2004l")
+@@ -566,6 +588,7 @@ module Cap = struct
+     ; cr      = no0
+     ; clreol  = no0
+     ; cursvis = no1
++    ; cursor_kind = no1
+     ; sgr     = no1
+     ; mouse   = no1
+     ; bpaste  = no1
+@@ -849,7 +872,7 @@ module Tmachine = struct
+   type t = {
+     cap           : Cap.t
+   ; mutable write : Buffer.t -> unit
+-  ; mutable curs  : (int * int) option
++  ; mutable curs  : (int * int * Cap.cursor) option
+   ; mutable dim   : (int * int)
+   ; mutable image : I.t
+   ; mutable dead  : bool
+@@ -862,7 +885,7 @@ module Tmachine = struct
+ 
+   let cursor cap = function
+     | None        -> cap.cursvis false
+-    | Some (w, h) -> cap.cursvis true & cursat0 cap w h
++    | Some (w, h, cursor_kind) -> cap.cursvis true & cursat0 cap w h & cap.cursor_kind cursor_kind
+ 
+   let create ~mouse ~bpaste cap = {
+       cap
+--- a/src/notty.mli
++++ b/src/notty.mli
+@@ -621,8 +621,17 @@ module Tmachine : sig
+   val release : t -> bool
+   val output  : t -> Buffer.t -> unit
+ 
++  type cursor :=
++    [ `Bar
++    | `Bar_blinking
++    | `Block
++    | `Block_blinking
++    | `Underline
++    | `Underline_blinking
++    ]
++
+   val refresh  : t -> unit
+-  val cursor   : t -> (int * int) option -> unit
++  val cursor   : t -> (int * int * cursor) option -> unit
+   val image    : t -> image -> unit
+ 
+   val set_size : t -> int * int -> unit
+--- a/src-unix/notty_unix.mli
++++ b/src-unix/notty_unix.mli
+@@ -73,7 +73,16 @@ module Term : sig
+ 
+       Useful if the output might have become garbled. *)
+ 
+-  val cursor : t -> (int * int) option -> unit
++  type cursor :=
++    [ `Bar
++    | `Bar_blinking
++    | `Block
++    | `Block_blinking
++    | `Underline
++    | `Underline_blinking
++    ]
++
++  val cursor : t -> (int * int * cursor) option -> unit
+   (** [cursor t pos] sets and redraws the cursor.
+ 
+       [None] hides it. [Some (x, y)] places it at column [x] and row [y], with
diff --git a/packages/notty-community/notty-community.0.2.4+ox/files/notty-disable_unsafe_multidomain.patch b/packages/notty-community/notty-community.0.2.4+ox/files/notty-disable_unsafe_multidomain.patch
new file mode 100644
index 0000000000..da3d4f7273
--- /dev/null
+++ b/packages/notty-community/notty-community.0.2.4+ox/files/notty-disable_unsafe_multidomain.patch
@@ -0,0 +1,13 @@
+--- a/src-unix/notty_unix.ml
++++ b/src-unix/notty_unix.ml
+@@ -35,8 +35,8 @@ module Private = struct
+ 
+   let set_winch_handler f =
+     let signum = winch_number () in
+-    let old_hdl = Sys.(signal signum (Signal_handle (fun _ -> f ()))) in
+-    `Revert (once @@ fun () -> Sys.set_signal signum old_hdl)
++    let old_hdl = Sys.(Safe.signal signum (Signal_handle (fun _ -> f ()))) in
++    `Revert (once @@ fun () -> Sys.Safe.set_signal signum old_hdl)
+ 
+   module Gen_output (O : sig
+     type fd
diff --git a/packages/notty-community/notty-community.0.2.4+ox/files/notty-do_not_send_clear_eol_on_full_lines.patch b/packages/notty-community/notty-community.0.2.4+ox/files/notty-do_not_send_clear_eol_on_full_lines.patch
new file mode 100644
index 0000000000..7cf5585636
--- /dev/null
+++ b/packages/notty-community/notty-community.0.2.4+ox/files/notty-do_not_send_clear_eol_on_full_lines.patch
@@ -0,0 +1,36 @@
+--- a/src/notty.ml
++++ b/src/notty.ml
+@@ -606,19 +606,25 @@ module Render = struct
+   let skip_op cap buf n = cap.skip n buf
+   let text_op cap buf a x = cap.sgr a buf; Text.to_buffer buf x
+ 
+-  let rec line cap buf = function
+-    End              -> erase cap buf
++  let rec line ~screen_width ~line_width cap buf = function
++  | End              
++  | Skip (0,    End) ->
++    (* NOTE: If we are at the end of a line, we do not call [erase] (which sends cleareol)
++       as terminal emulators behave differently when a fully filled column receives a
++       "cleareol" at the end of the line. e.g. notty and vim's [:term] will reset the last
++       column. *)
++    if screen_width = line_width then () else (erase cap buf)
+   | Skip (n,    End) -> erase cap buf; skip_op cap buf n
+-  | Skip (n,    ops) -> skip_op cap buf n; line cap buf ops
+-  | Text (a, x, ops) -> text_op cap buf a x; line cap buf ops
++  | Skip (n,    ops) -> skip_op cap buf n; line ~screen_width ~line_width:(line_width + n) cap buf ops
++  | Text (a, x, ops) -> text_op cap buf a x; line ~screen_width ~line_width:(line_width + Text.width x) cap buf ops
+ 
+-  let rec lines cap buf = function
++  let rec lines ~screen_width cap buf = function
+     []      -> ()
+-  | [ln]    -> line cap buf ln; cap.sgr A.empty buf
+-  | ln::lns -> line cap buf ln; cap.newline buf; lines cap buf lns
++  | [ln]    -> line ~screen_width ~line_width:0 cap buf ln; cap.sgr A.empty buf
++  | ln::lns -> line ~screen_width ~line_width:0 cap buf ln; cap.newline buf; lines ~screen_width cap buf lns
+ 
+   let to_buffer buf cap off dim img =
+-    Operation.of_image off dim img |> lines cap buf
++    Operation.of_image off dim img |> lines ~screen_width:(fst dim) cap buf
+ 
+   let pp cap ppf img =
+     let open Format in
diff --git a/packages/notty-community/notty-community.0.2.4+ox/files/notty-expose_fast_tty_width.patch b/packages/notty-community/notty-community.0.2.4+ox/files/notty-expose_fast_tty_width.patch
new file mode 100644
index 0000000000..81c33b4943
--- /dev/null
+++ b/packages/notty-community/notty-community.0.2.4+ox/files/notty-expose_fast_tty_width.patch
@@ -0,0 +1,22 @@
+--- a/src/notty.ml
++++ b/src/notty.ml
+@@ -934,3 +934,7 @@ module Infix = struct
+   let ((<->), (<|>), (</>)) = I.((<->), (<|>), (</>))
+   let (++) = A.(++)
+ end
++
++module Tty_width_hint = struct
++  let tty_width_hint = Notty_uucp.tty_width_hint
++end
+--- a/src/notty.mli
++++ b/src/notty.mli
+@@ -971,3 +971,9 @@ let wrap2 width img =
+        be more important.}}
+ 
+ *)
++
++module Tty_width_hint : sig
++  (** [tty_width_hint] is exposed as the same function that notty uses to compute unicode
++      string widths. It is faster than directly calling [Uucp_break.tty_width_hint]. *)
++  val tty_width_hint : Uchar.t -> int
++end
diff --git a/packages/notty-community/notty-community.0.2.4+ox/files/notty-line_based_diffing_and_patching.patch b/packages/notty-community/notty-community.0.2.4+ox/files/notty-line_based_diffing_and_patching.patch
new file mode 100644
index 0000000000..790cd07ef3
--- /dev/null
+++ b/packages/notty-community/notty-community.0.2.4+ox/files/notty-line_based_diffing_and_patching.patch
@@ -0,0 +1,155 @@
+--- a/src/notty.ml
++++ b/src/notty.ml
+@@ -75,9 +75,13 @@ module Text = struct
+   let err_ctrl u = invalid_arg "Notty: control char: U+%02X, %S" (Char.code u)
+   let err_malformed = invalid_arg "Notty: malformed UTF-8: %s, %S"
+ 
+-  type t =
+-    | Ascii of string * int * int
+-    | Utf8  of string * int array * int * int
++  include struct
++    open! Base
++
++    type t =
++      | Ascii of string * int * int
++      | Utf8  of string * int array * int * int [@@deriving equal]
++  end
+ 
+   let equal t1 t2 = match (t1, t2) with
+     | (Utf8 (s1, _, i1, n1), Utf8 (s2, _, i2, n2))
+@@ -163,9 +167,13 @@ end
+ 
+ module A = struct
+ 
+-  type color = int
+-  type style = int
+-  type t = { fg : color; bg : color; st : style }
++  include struct
++    open! Base
++
++    type color = int [@@deriving equal]
++    type style = int [@@deriving equal]
++    type t = { fg : color; bg : color; st : style } [@@deriving equal]
++  end
+ 
+   let equal t1 t2 = t1.fg = t2.fg && t1.bg = t2.bg && t1.st = t2.st
+ 
+@@ -427,10 +435,14 @@ end
+ 
+ module Operation = struct
+ 
+-  type t =
+-    End
+-  | Skip of int * t
+-  | Text of A.t * Text.t * t
++  include struct
++    open! Base
++
++    type t =
++      End
++    | Skip of int * t
++    | Text of A.t * Text.t * t [@@deriving equal]
++  end
+ 
+   let skip n k = if n = 0 then k else match k with
+       End         -> End
+@@ -517,6 +529,7 @@ module Cap = struct
+   ; altscr  : bool -> op
+   ; mouse   : bool -> op
+   ; bpaste  : bool -> op
++  ; cursor_nextline  : op
+   }
+ 
+   let ((<|), (<.), (<!)) = Buffer.(add_string, add_char, add_decimal)
+@@ -551,6 +564,7 @@ module Cap = struct
+   let ansi = {
+       skip    = (fun n b -> b <| "\x1b[0m"; Buffer.add_chars b ' ' n)
+     ; newline = (fun b -> b <| "\n")
++    ; cursor_nextline = (fun b -> b <| "\x1b[E")
+     ; altscr  = (fun x b -> b <| if x then "\x1b[?1049h" else "\x1b[?1049l")
+     ; cursat  = (fun w h b -> b <| "\x1b["; b <! h; b <. ';'; b <! w; b <. 'H')
+     ; cubcuf  = (fun x b -> b <| "\x1b["; b <! abs x; b <. if x < 0 then 'D' else 'C')
+@@ -588,6 +602,7 @@ module Cap = struct
+     ; cubcuf  = no1
+     ; cuucud  = no1
+     ; cr      = no0
++    ; cursor_nextline = no0
+     ; clreol  = no0
+     ; cursvis = no1
+     ; cursor_kind = no1
+@@ -625,8 +640,41 @@ module Render = struct
+   | [ln]    -> line ~screen_width ~line_width:0 cap buf ln; cap.sgr A.empty buf
+   | ln::lns -> line ~screen_width ~line_width:0 cap buf ln; cap.newline buf; lines ~screen_width cap buf lns
+ 
++
++  let line_diffed ~screen_width ~line_width ~on_draw cap buf (prev_operation, operation) = 
++    match [%equal: Operation.t] prev_operation operation with
++    | true -> cap.cursor_nextline buf
++    | false -> line ~screen_width ~line_width cap buf operation; on_draw ()
++  ;;
++
++  let rec lines_diffed ~screen_width cap buf = function
++    []      -> ()
++  | [ln]    ->
++    line_diffed ~screen_width ~line_width:0 cap buf ln ~on_draw:(fun () -> cap.sgr A.empty buf)
++  | ln::lns ->
++    line_diffed ~screen_width ~line_width:0 cap buf ln ~on_draw:(fun () -> cap.newline buf);
++    lines_diffed ~screen_width cap buf lns
++  ;;
++
++  let to_buffer' ~buf ~cap ~dim ~previous_operations ~operations =
++    match previous_operations with
++    | None -> lines ~screen_width:(fst dim) cap buf operations 
++    | Some previous_operations ->
++      let is_same_height =
++        List.length operations = List.length previous_operations
++      in
++      (match is_same_height with
++        | false -> 
++          lines ~screen_width:(fst dim) cap buf operations 
++        | true ->
++          lines_diffed ~screen_width:(fst dim) cap buf (Base.List.zip_exn previous_operations operations ) 
++      )
++  ;;
++
+   let to_buffer buf cap off dim img =
+-    Operation.of_image off dim img |> lines ~screen_width:(fst dim) cap buf
++    let operations = Operation.of_image off dim img in
++    to_buffer' ~buf ~cap ~dim ~operations ~previous_operations:None
++  ;;
+ 
+   let pp cap ppf img =
+     let open Format in
+@@ -885,6 +933,7 @@ module Tmachine = struct
+   ; mutable dim   : (int * int)
+   ; mutable image : I.t
+   ; mutable dead  : bool
++  ; mutable previous_lines : Operation.t list option
+   }
+ 
+   let emit t op =
+@@ -906,6 +955,7 @@ module Tmachine = struct
+     ; dead  = false
+     ; write =
+         cap.altscr true & cursor cap None & cap.mouse mouse & cap.bpaste bpaste
++    ; previous_lines = None
+     }
+ 
+   let release t =
+@@ -918,8 +968,14 @@ module Tmachine = struct
+   let output t buf = t.write buf; t.write <- ignore
+ 
+   let refresh ({ dim; image; _ } as t) =
+-    emit t ( cursor t.cap None & cursat0 t.cap 0 0 &
+-             (fun buf -> Render.to_buffer buf t.cap (0, 0) dim image) &
++    emit t ( 
++      cursor t.cap None &
++      cursat0 t.cap 0 0 &
++             (fun buf -> 
++                let operations = Operation.of_image (0, 0) dim image in
++                Render.to_buffer' ~buf ~cap:t.cap ~dim ~previous_operations:t.previous_lines ~operations;
++                t.previous_lines <- (Some operations);
++             ) &
+              cursor t.cap t.curs )
+ 
+   let set_size t dim = t.dim <- dim
diff --git a/packages/notty-community/notty-community.0.2.4+ox/files/notty-portabilize_notty_unix.patch b/packages/notty-community/notty-community.0.2.4+ox/files/notty-portabilize_notty_unix.patch
new file mode 100644
index 0000000000..3f9529d0ff
--- /dev/null
+++ b/packages/notty-community/notty-community.0.2.4+ox/files/notty-portabilize_notty_unix.patch
@@ -0,0 +1,126 @@
+--- a/src-unix/notty_unix.ml
++++ b/src-unix/notty_unix.ml
+@@ -3,7 +3,7 @@
+ 
+ open Notty
+ 
+-external c_winsize : Unix.file_descr -> int = "caml_notty_winsize" [@@noalloc]
++external c_winsize : Unix.file_descr -> int  @@ portable = "caml_notty_winsize" [@@noalloc]
+ external winch_number : unit -> int = "caml_notty_winch_number" [@@noalloc]
+ 
+ let iter f = function Some x -> f x | _ -> ()
+@@ -80,14 +80,34 @@ module Term = struct
+ 
+   module Winch = struct
+ 
+-    let h  = Hashtbl.create 3
++    let h : (int, unit -> unit) Portable_lockfree_htbl.t =
++      Portable_lockfree_htbl.create (module Int)
++
+     and id = ref 0
+ 
+     let add fd f =
+       let n = !id in
+-      set_winch_handler (fun () -> Hashtbl.iter (fun _ f -> f ()) h) |> ignore;
+-      Hashtbl.add h n (fun () -> winsize fd |> iter f); incr id;
+-      `Revert (fun () -> Hashtbl.remove h n)
++      set_winch_handler (fun () ->
++        Portable_lockfree_htbl.to_alist h
++        |> List.iter (fun (_, f) -> f ())
++        ) |> ignore;
++      let () =
++        match
++          Portable_lockfree_htbl.add h ~key:n ~data:(fun () -> winsize fd |> iter f);
++        with
++        | Null -> ()
++        | This _ -> ()
++      in
++      incr id;
++      `Revert (fun () ->
++        let () =
++          match
++            Portable_lockfree_htbl.remove h n
++          with
++          | Null -> ()
++          | This _ -> ()
++        in
++        ())
+   end
+ 
+   module Input = struct
+@@ -122,7 +142,7 @@ module Term = struct
+   ; input    : Input.t
+   ; fds      : Unix.file_descr * Unix.file_descr
+   ; unwinch  : (unit -> unit) Lazy.t
+-  ; mutable winched : bool
++  ; mutable winched : (int * int) list [@atomic]
+   }
+ 
+   let write t =
+@@ -150,10 +170,14 @@ module Term = struct
+       ; buf     = Buffer.create 4096
+       ; input   = Input.create ~nosig input
+       ; fds     = (input, output)
+-      ; winched = false
++      ; winched = []
+       ; unwinch = lazy (
+-          let `Revert f = Winch.add output @@ fun dim ->
+-            Buffer.reset t.buf; t.winched <- true; set_size t dim in f)
++          let winched = [%atomic.loc t.winched] in
++          let `Revert f =
++            Winch.add output @@ fun dim ->
++              Portable.Atomic.Loc.update winched ~pure_f:(fun l -> l @ [dim]);
++          in
++          f)
+     } in
+     winsize output |> iter (set_size t);
+     (Lazy.force t.unwinch |> ignore) [@ocaml.warning "-5"];
+@@ -163,12 +187,25 @@ module Term = struct
+ 
+   let rec event = function
+     | t when Tmachine.dead t.trm -> `End
+-    | t when t.winched -> t.winched <- false; `Resize (size t)
+-    | t -> Unix.(try Input.event t.input with Unix_error (EINTR, _, _) -> event t)
++    | t ->
++      let winch_event = ref None in
++      let winched = [%atomic.loc t.winched] in
++      Portable.Atomic.Loc.update winched ~pure_f:(function [] -> winch_event := None; [] | hd :: tl ->
++        winch_event:= Some hd;
++        tl);
++      (match !winch_event with
++       | None ->
++          Unix.(try Input.event t.input with Unix_error (EINTR, _, _) -> event t)
++       | Some dim ->
++          Buffer.reset t.buf;
++          set_size t dim;
++          `Resize (size t)
++      )
++  ;;
+ 
+   let pending t =
+     not (Tmachine.dead t.trm) &&
+-    (t.winched || Unescape.pending t.input.Input.flt)
++    (not (List.is_empty t.winched) || Unescape.pending t.input.Input.flt)
+ 
+   let fds t = t.fds
+ end
+--- a/src-unix/notty_unix.mli
++++ b/src-unix/notty_unix.mli
+@@ -130,7 +130,7 @@ module Term : sig
+       listeners without conflicting with the rest of the machinery. *)
+   module Winch : sig
+ 
+-    val add : Unix.file_descr -> ((int * int) -> unit) -> [`Revert of unit -> unit]
++    val add : Unix.file_descr -> ((int * int) -> unit) @ portable  -> [`Revert of unit -> unit]
+     (** [add fd f] registers a [SIGWINCH] handler. Every time the signal is
+         delivered, [f] is called with the current size of the tty backing [fd].
+         If [fd] is not a tty, [f] is never called.
+@@ -213,7 +213,7 @@ module Private : sig
+ 
+   val cap_for_fd        : Unix.file_descr -> Cap.t
+   val setup_tcattr      : nosig:bool -> Unix.file_descr -> [ `Revert of (unit -> unit) ]
+-  val set_winch_handler : (unit -> unit) -> [ `Revert of (unit -> unit) ]
++  val set_winch_handler : (unit -> unit) @ portable -> [ `Revert of (unit -> unit) ]
+ 
+   module Gen_output (O : sig
+     type fd
diff --git a/packages/notty-community/notty-community.0.2.4+ox/files/notty-reset-cursor-on-release.patch b/packages/notty-community/notty-community.0.2.4+ox/files/notty-reset-cursor-on-release.patch
new file mode 100644
index 0000000000..f463df8be4
--- /dev/null
+++ b/packages/notty-community/notty-community.0.2.4+ox/files/notty-reset-cursor-on-release.patch
@@ -0,0 +1,61 @@
+--- a/src/notty.ml
++++ b/src/notty.ml
+@@ -494,7 +494,8 @@ module Cap = struct
+   let (&) op1 op2 buf = op1 buf; op2 buf
+ 
+   type cursor =
+-    [ `Bar
++    [ `Default
++    | `Bar
+     | `Bar_blinking
+     | `Block
+     | `Block_blinking
+@@ -560,6 +561,7 @@ module Cap = struct
+     ; cursor_kind = (fun kind b -> 
+                       let n =
+                         match kind with
++                        | `Default -> "0"
+                         | `Bar -> "6"
+                         | `Bar_blinking -> "5"
+                         | `Block -> "2"
+@@ -894,6 +896,8 @@ module Tmachine = struct
+     | None        -> cap.cursvis false
+     | Some (w, h, cursor_kind) -> cap.cursvis true & cursat0 cap w h & cap.cursor_kind cursor_kind
+ 
++  let reset_cursor cap = cap.cursvis true & cap.cursor_kind `Default
++
+   let create ~mouse ~bpaste cap = {
+       cap
+     ; curs  = None
+@@ -908,6 +912,7 @@ module Tmachine = struct
+     if t.dead then false else
+       ( emit t ( t.cap.altscr false & t.cap.cursvis true &
+                  t.cap.mouse false & t.cap.bpaste false );
++        emit t (reset_cursor t.cap);
+         t.dead <- true; true )
+ 
+   let output t buf = t.write buf; t.write <- ignore
+--- a/src/notty.mli
++++ b/src/notty.mli
+@@ -622,7 +622,8 @@ module Tmachine : sig
+   val output  : t -> Buffer.t -> unit
+ 
+   type cursor :=
+-    [ `Bar
++    [ `Default
++    | `Bar
+     | `Bar_blinking
+     | `Block
+     | `Block_blinking
+--- a/src-unix/notty_unix.mli
++++ b/src-unix/notty_unix.mli
+@@ -74,7 +74,8 @@ module Term : sig
+       Useful if the output might have become garbled. *)
+ 
+   type cursor :=
+-    [ `Bar
++    [ `Default
++    | `Bar
+     | `Bar_blinking
+     | `Block
+     | `Block_blinking
diff --git a/packages/notty-community/notty-community.0.2.4+ox/files/notty-use_correct_newline_escape_code_and_stop_clearing_the_last_text_element_of_a_line.patch b/packages/notty-community/notty-community.0.2.4+ox/files/notty-use_correct_newline_escape_code_and_stop_clearing_the_last_text_element_of_a_line.patch
new file mode 100644
index 0000000000..558d48717a
--- /dev/null
+++ b/packages/notty-community/notty-community.0.2.4+ox/files/notty-use_correct_newline_escape_code_and_stop_clearing_the_last_text_element_of_a_line.patch
@@ -0,0 +1,19 @@
+--- a/src/notty.ml
++++ b/src/notty.ml
+@@ -539,7 +539,7 @@ module Cap = struct
+ 
+   let ansi = {
+       skip    = (fun n b -> b <| "\x1b[0m"; Buffer.add_chars b ' ' n)
+-    ; newline = (fun b -> b <| "\x1bE")
++    ; newline = (fun b -> b <| "\x1b[E")
+     ; altscr  = (fun x b -> b <| if x then "\x1b[?1049h" else "\x1b[?1049l")
+     ; cursat  = (fun w h b -> b <| "\x1b["; b <! h; b <. ';'; b <! w; b <. 'H')
+     ; cubcuf  = (fun x b -> b <| "\x1b["; b <! abs x; b <. if x < 0 then 'D' else 'C')
+@@ -586,7 +586,6 @@ module Render = struct
+   let rec line cap buf = function
+     End              -> erase cap buf
+   | Skip (n,    End) -> erase cap buf; skip_op cap buf n
+-  | Text (a, x, End) -> erase cap buf; text_op cap buf a x
+   | Skip (n,    ops) -> skip_op cap buf n; line cap buf ops
+   | Text (a, x, ops) -> text_op cap buf a x; line cap buf ops
+ 
diff --git a/packages/notty-community/notty-community.0.2.4+ox/files/notty-use_newline_instead_of_cursor_nextline_for_emacs_support.patch b/packages/notty-community/notty-community.0.2.4+ox/files/notty-use_newline_instead_of_cursor_nextline_for_emacs_support.patch
new file mode 100644
index 0000000000..d28fadc8b0
--- /dev/null
+++ b/packages/notty-community/notty-community.0.2.4+ox/files/notty-use_newline_instead_of_cursor_nextline_for_emacs_support.patch
@@ -0,0 +1,11 @@
+--- a/src/notty.ml
++++ b/src/notty.ml
+@@ -539,7 +539,7 @@ module Cap = struct
+ 
+   let ansi = {
+       skip    = (fun n b -> b <| "\x1b[0m"; Buffer.add_chars b ' ' n)
+-    ; newline = (fun b -> b <| "\x1b[E")
++    ; newline = (fun b -> b <| "\n")
+     ; altscr  = (fun x b -> b <| if x then "\x1b[?1049h" else "\x1b[?1049l")
+     ; cursat  = (fun w h b -> b <| "\x1b["; b <! h; b <. ';'; b <! w; b <. 'H')
+     ; cubcuf  = (fun x b -> b <| "\x1b["; b <! abs x; b <. if x < 0 then 'D' else 'C')
diff --git a/packages/notty-community/notty-community.0.2.4+ox/opam b/packages/notty-community/notty-community.0.2.4+ox/opam
new file mode 100644
index 0000000000..f1fdf29d8b
--- /dev/null
+++ b/packages/notty-community/notty-community.0.2.4+ox/opam
@@ -0,0 +1,114 @@
+opam-version: "2.0"
+version: "0.2.4+ox"
+name: "notty-community"
+synopsis: "Declaring terminals"
+description: """\
+Notty is a declarative terminal library for OCaml structured around a notion
+of composable images. It tries to abstract away the basic terminal
+programming model, providing something simpler and more expressive.
+
+This is a branch from the original notty, maintained by the community."""
+maintainer: [
+  "Ali Caglayan <alizter@gmail.com>"
+  "Antonin Décimo <antonin@tarides.com>"
+  "Romain Calascibetta <romain.calascibetta@gmail.com>"
+]
+authors: "David Kaloper <dk505@cam.ac.uk>"
+license: "ISC"
+homepage: "https://github.com/ocaml-community/notty-community"
+bug-reports: "https://github.com/ocaml-community/notty-community/issues"
+depends: [
+  "dune"  {>= "3.0"}
+  "ocaml" {>= "4.08.0"}
+  "cppo"  {build & >= "1.1.0"}
+  "uutf"  {= "1.0.3+ox"}
+  "uucp"  {with-dev-setup}
+  "lwt"   {with-test}
+  "odoc"  {with-doc}
+]
+depopts: ["lwt"]
+conflicts: [
+  "lwt" {< "2.6.0"}
+]
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+]
+dev-repo: "git+https://github.com/ocaml-community/notty-community.git"
+url {
+  src:
+    "https://github.com/ocaml-community/notty-community/releases/download/v0.2.4/notty-community-0.2.4.tar.gz"
+  checksum: [
+    "md5=b8cb51edb37d28d9d53e98ac52848677"
+    "sha512=8922a190a412790285603ba7ab37f9f58202d9406ebc9e6d3329189eac7fda5c25316264c27b6f7decb8f25f0d78801873b9f16c40e90f020e2c06ab9d058686"
+  ]
+}
+patches: [
+  "notty-disable_unsafe_multidomain.patch"
+  "notty-use_correct_newline_escape_code_and_stop_clearing_the_last_text_element_of_a_line.patch"
+  "notty-different_kinds_of_cursors.patch"
+  "notty-use_newline_instead_of_cursor_nextline_for_emacs_support.patch"
+  "notty-expose_fast_tty_width.patch"
+  "notty-do_not_send_clear_eol_on_full_lines.patch"
+  "notty-ctrl_backspace.patch"
+  "notty-reset-cursor-on-release.patch"
+  "notty-line_based_diffing_and_patching.patch"
+  "notty-defensively-ignore-corrupted-x10-vscode-mouse-codes.patch"
+  "notty-portabilize_notty_unix.patch"
+]
+extra-files: [
+  [
+    "notty-disable_unsafe_multidomain.patch"
+    "sha256=9f2375daf72fc72ef54c157c0ea15ca9d8e03a2dabdbbd9c61df9fc601a2ac9a"
+  ]
+  [
+    "notty-use_correct_newline_escape_code_and_stop_clearing_the_last_text_element_of_a_line.patch"
+    "sha256=586d0b0412413e74275a43bfc5f3b0754c6076c27bc897b2e2419b4134a6e0be"
+  ]
+  [
+    "notty-different_kinds_of_cursors.patch"
+    "sha256=f84cd46b104919820189725f61925d1c744f98f95e0cb46c609f957426966144"
+  ]
+  [
+    "notty-use_newline_instead_of_cursor_nextline_for_emacs_support.patch"
+    "sha256=bf5f176af43f101f81b97247537ff3da9a66dc82412aff0ac138a43c45d75565"
+  ]
+  [
+    "notty-expose_fast_tty_width.patch"
+    "sha256=dfe8963de63661c082c784220cfd84b0199367b6f34ffa9f6087ae252e884a5d"
+  ]
+  [
+    "notty-do_not_send_clear_eol_on_full_lines.patch"
+    "sha256=0d80d415d48ba2aafc87fd1170153abe430747e3b726b8faf49c78c9e446d1e4"
+  ]
+  [
+    "notty-ctrl_backspace.patch"
+    "sha256=93389970433ab36ee647d90e08e16ad936579c1a3f27e99485137469fc125c55"
+  ]
+  [
+    "notty-reset-cursor-on-release.patch"
+    "sha256=1023e0d6ea6cbfba264bdf54b8fab7c442bcd44e4cb1c5449302b7825fefd955"
+  ]
+  [
+    "notty-line_based_diffing_and_patching.patch"
+    "sha256=a20d71bb36fd79452bd2a40d338ed45fe8d04612099b2520cec4ac3cc95658ab"
+  ]
+  [
+    "notty-defensively-ignore-corrupted-x10-vscode-mouse-codes.patch"
+    "sha256=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
+  ]
+  [
+    "notty-portabilize_notty_unix.patch"
+    "sha256=a4af0acc3ca0759f77c4ed3af69e6a1d401263f294dc98b905bd3042e1a93f56"
+  ]
+]
diff --git a/packages/notty_async/notty_async.v0.18~preview.130.55+197/opam b/packages/notty_async/notty_async.v0.18~preview.130.74+175/opam
similarity index 63%
rename from packages/notty_async/notty_async.v0.18~preview.130.55+197/opam
rename to packages/notty_async/notty_async.v0.18~preview.130.74+175/opam
index 65c257e180..0543ab874b 100644
--- a/packages/notty_async/notty_async.v0.18~preview.130.55+197/opam
+++ b/packages/notty_async/notty_async.v0.18~preview.130.74+175/opam
@@ -11,12 +11,12 @@ build: [
   ["dune" "build" "-p" name "-j" jobs]
 ]
 depends: [
-  "ocaml"     {>= "5.1.0"}
-  "async"     {= "v0.18~preview.130.55+197"}
-  "core_unix" {= "v0.18~preview.130.55+197"}
-  "ppx_jane"  {= "v0.18~preview.130.55+197"}
-  "dune"      {>= "3.17.0"}
-  "notty"     {>= "0.2.1"}
+  "ocaml"           {>= "5.1.0"}
+  "async"           {= "v0.18~preview.130.74+175"}
+  "core_unix"       {= "v0.18~preview.130.74+175"}
+  "ppx_jane"        {= "v0.18~preview.130.74+175"}
+  "dune"            {>= "3.17.0"}
+  "notty-community" {= "0.2.4+ox"}
 ]
 available: arch != "arm32" & arch != "x86_32"
 synopsis: "An Async driver for Notty"
@@ -27,7 +27,7 @@ Async for managing concurrency.
 """
 url {
   src:
-    "https://github.com/janestreet/notty_async/archive/d5f10f4f0611add8d99588c71a3b0247e230b591.tar.gz"
+    "https://github.com/janestreet/notty_async/archive/d2de3d451bae3157566ca616004dbbe0e8c4011f.tar.gz"
   checksum:
-    "sha256=c66a6eb42c0af28e59b98b84dd22a0ea7cfee2f8070fc32af151f00404dfe6f2"
+    "sha256=67b03965af9735b0bcf70962812504743baec4029e4c78e4bf3cd20741711323"
 }
diff --git a/packages/numeric_string/numeric_string.v0.18~preview.130.55+197/opam b/packages/numeric_string/numeric_string.v0.18~preview.130.74+175/opam
similarity index 83%
rename from packages/numeric_string/numeric_string.v0.18~preview.130.55+197/opam
rename to packages/numeric_string/numeric_string.v0.18~preview.130.74+175/opam
index 0a41438cad..1be13ac578 100644
--- a/packages/numeric_string/numeric_string.v0.18~preview.130.55+197/opam
+++ b/packages/numeric_string/numeric_string.v0.18~preview.130.74+175/opam
@@ -12,8 +12,8 @@ build: [
 ]
 depends: [
   "ocaml"    {>= "5.1.0"}
-  "base"     {= "v0.18~preview.130.55+197"}
-  "ppx_jane" {= "v0.18~preview.130.55+197"}
+  "base"     {= "v0.18~preview.130.74+175"}
+  "ppx_jane" {= "v0.18~preview.130.74+175"}
   "dune"     {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -37,7 +37,7 @@ or punctuation, etc.)
 """
 url {
   src:
-    "https://github.com/janestreet/numeric_string/archive/1bfbe630c04d7db16b37e392a70f277bd7c6b01b.tar.gz"
+    "https://github.com/janestreet/numeric_string/archive/0c5203be27f65bc20756d659a6cd92f3f03b0f8c.tar.gz"
   checksum:
-    "sha256=d5f65bd8efd806a1b156bf803aa8714aae011ae7b452c020a687e0896e1aa468"
+    "sha256=dea20fa968e30a0f27da08453d6e5be7ef1501d03bfe234b0751d8f1b20a62a6"
 }
diff --git a/packages/ocaml-embed-file/ocaml-embed-file.v0.18~preview.130.55+197/opam b/packages/ocaml-embed-file/ocaml-embed-file.v0.18~preview.130.74+175/opam
similarity index 62%
rename from packages/ocaml-embed-file/ocaml-embed-file.v0.18~preview.130.55+197/opam
rename to packages/ocaml-embed-file/ocaml-embed-file.v0.18~preview.130.74+175/opam
index cd5754d6d1..b8215eae41 100644
--- a/packages/ocaml-embed-file/ocaml-embed-file.v0.18~preview.130.55+197/opam
+++ b/packages/ocaml-embed-file/ocaml-embed-file.v0.18~preview.130.74+175/opam
@@ -12,12 +12,12 @@ build: [
 ]
 depends: [
   "ocaml"        {>= "5.1.0"}
-  "async"        {= "v0.18~preview.130.55+197"}
-  "async_kernel" {= "v0.18~preview.130.55+197"}
-  "async_unix"   {= "v0.18~preview.130.55+197"}
-  "core"         {= "v0.18~preview.130.55+197"}
-  "core_unix"    {= "v0.18~preview.130.55+197"}
-  "ppx_jane"     {= "v0.18~preview.130.55+197"}
+  "async"        {= "v0.18~preview.130.74+175"}
+  "async_kernel" {= "v0.18~preview.130.74+175"}
+  "async_unix"   {= "v0.18~preview.130.74+175"}
+  "core"         {= "v0.18~preview.130.74+175"}
+  "core_unix"    {= "v0.18~preview.130.74+175"}
+  "ppx_jane"     {= "v0.18~preview.130.74+175"}
   "dune"         {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -28,7 +28,7 @@ defining string constants containing the contents of those files.
 """
 url {
   src:
-    "https://github.com/janestreet/ocaml-embed-file/archive/2a85b42a92ef12d4efe986babecb785451dc576a.tar.gz"
+    "https://github.com/janestreet/ocaml-embed-file/archive/7ac1d0952c5071754cacb8c91f1ad2d1e63e12cc.tar.gz"
   checksum:
-    "sha256=9e379825370b934926f8ae140afe50880667bfd735e63a62166e9f1e9f32ce23"
+    "sha256=de9ed4f9ea28947c28950d5776d0ee39c30c4e6e6edd1fa021cb1e9573b05ef3"
 }
diff --git a/packages/ocaml-probes/ocaml-probes.v0.18~preview.130.55+197/opam b/packages/ocaml-probes/ocaml-probes.v0.18~preview.130.74+175/opam
similarity index 81%
rename from packages/ocaml-probes/ocaml-probes.v0.18~preview.130.55+197/opam
rename to packages/ocaml-probes/ocaml-probes.v0.18~preview.130.74+175/opam
index e86be61dd0..b1b3270129 100644
--- a/packages/ocaml-probes/ocaml-probes.v0.18~preview.130.55+197/opam
+++ b/packages/ocaml-probes/ocaml-probes.v0.18~preview.130.74+175/opam
@@ -24,7 +24,7 @@ depexts: ["linux-headers"] {os-family = "alpine"}
 available: (arch = "x86_64" | arch = "arm64") & os = "linux"
 url {
   src:
-    "https://github.com/janestreet/ocaml-probes/archive/6f4f0de23397e29fcda5b5f2811e882051c92fec.tar.gz"
+    "https://github.com/janestreet/ocaml-probes/archive/e2474dd9e8f5d091b10507461fa7ce145e7966f0.tar.gz"
   checksum:
-    "sha256=389e7364eb280ca0d7b7d208c87e66430ac967ff50eda3c71bc5d55e88f385d7"
+    "sha256=13a748efb5c7b325a9441e6b8bb6cb7a6d10fb905e364f33efa7cdb32668ef3d"
 }
diff --git a/packages/ocaml-variants/ocaml-variants.5.2.0+ox/opam b/packages/ocaml-variants/ocaml-variants.5.2.0+ox/opam
index 11bb684b18..5d3145dc95 100644
--- a/packages/ocaml-variants/ocaml-variants.5.2.0+ox/opam
+++ b/packages/ocaml-variants/ocaml-variants.5.2.0+ox/opam
@@ -93,9 +93,9 @@ extra-source "init-menhir.tar.gz" {
 }
 url {
   src:
-    "https://github.com/oxcaml/oxcaml/archive/refs/tags/5.2.0minus-19-opam.tar.gz"
+    "https://github.com/oxcaml/oxcaml/archive/refs/tags/5.2.0minus-23-opam.tar.gz"
   checksum:
-    "sha256=30c9030e82cc282058bece5759dcf5b208dd5f1423e9a2c013933d6226c344b6"
+    "sha256=2409416446ca9cc72bb9583e73c1e60cd5105b85b8c73ed75a711df38a77ce41"
 }
 patches: ["ignore-opam.patch"]
 extra-files: [
@@ -123,6 +123,7 @@ conflicts: [
   "mdx" {!= "2.5.0+ox"}
   "merlin" {!= "5.2.1-502+ox"}
   "merlin-lib" {!= "5.2.1-502+ox"}
+  "notty-community" {!= "0.2.4+ox"}
   "ocaml-compiler-libs" {!= "v0.17.0+ox"}
   "ocaml-index" {!= "1.1+ox"}
   "ocaml-lsp-server" {!= "1.19.0+ox"}
@@ -133,7 +134,7 @@ conflicts: [
   "ppxlib" {!= "0.33.0+ox"}
   "ppxlib_ast" {!= "0.33.0+ox"}
   "re" {!= "1.14.0+ox"}
-  "sedlex" {!= "3.3+ox"}
+  "sedlex" {!= "3.6+ox"}
   "spawn" {!= "v0.15.1+ox"}
   "topkg" {!= "1.0.8+ox"}
   "uTop" {!= "2.16.0+ox"}
diff --git a/packages/ocaml_intrinsics/ocaml_intrinsics.v0.18~preview.130.55+197/opam b/packages/ocaml_intrinsics/ocaml_intrinsics.v0.18~preview.130.74+175/opam
similarity index 77%
rename from packages/ocaml_intrinsics/ocaml_intrinsics.v0.18~preview.130.55+197/opam
rename to packages/ocaml_intrinsics/ocaml_intrinsics.v0.18~preview.130.74+175/opam
index c0fd979fa6..def24e88c8 100644
--- a/packages/ocaml_intrinsics/ocaml_intrinsics.v0.18~preview.130.55+197/opam
+++ b/packages/ocaml_intrinsics/ocaml_intrinsics.v0.18~preview.130.74+175/opam
@@ -12,7 +12,7 @@ build: [
 ]
 depends: [
   "ocaml"                   {>= "5.1.0"}
-  "ocaml_intrinsics_kernel" {= "v0.18~preview.130.55+197"}
+  "ocaml_intrinsics_kernel" {= "v0.18~preview.130.74+175"}
   "dune"                    {>= "3.17.0"}
   "dune-configurator"
 ]
@@ -24,7 +24,7 @@ Provides functions to invoke amd64 instructions (such as clz,popcnt,rdtsc,rdpmc)
 available: (arch = "x86_64" | arch = "arm64") & os != "win32"
 url {
   src:
-    "https://github.com/janestreet/ocaml_intrinsics/archive/b7b99d3284dd310400af346abd6b5dfff0192216.tar.gz"
+    "https://github.com/janestreet/ocaml_intrinsics/archive/e3787eba3c5988ba0aeb915b75ac953c8701bb7f.tar.gz"
   checksum:
-    "sha256=8e9bb506c76f8f7acd732ae6d87fb288fc76e181f886899fa5a84676f90429b4"
+    "sha256=f3e30e073033482582bccc7311e818f252f369f75d2d617d5ea0b21fbfdaaee8"
 }
diff --git a/packages/ocaml_intrinsics_kernel/ocaml_intrinsics_kernel.v0.18~preview.130.55+197/opam b/packages/ocaml_intrinsics_kernel/ocaml_intrinsics_kernel.v0.18~preview.130.74+175/opam
similarity index 100%
rename from packages/ocaml_intrinsics_kernel/ocaml_intrinsics_kernel.v0.18~preview.130.55+197/opam
rename to packages/ocaml_intrinsics_kernel/ocaml_intrinsics_kernel.v0.18~preview.130.74+175/opam
diff --git a/packages/ocaml_openapi_generator/ocaml_openapi_generator.v0.18~preview.130.55+197/opam b/packages/ocaml_openapi_generator/ocaml_openapi_generator.v0.18~preview.130.74+175/opam
similarity index 59%
rename from packages/ocaml_openapi_generator/ocaml_openapi_generator.v0.18~preview.130.55+197/opam
rename to packages/ocaml_openapi_generator/ocaml_openapi_generator.v0.18~preview.130.74+175/opam
index 40bc71ccd2..2096f8cd74 100644
--- a/packages/ocaml_openapi_generator/ocaml_openapi_generator.v0.18~preview.130.55+197/opam
+++ b/packages/ocaml_openapi_generator/ocaml_openapi_generator.v0.18~preview.130.74+175/opam
@@ -12,15 +12,15 @@ build: [
 ]
 depends: [
   "ocaml"            {>= "5.1.0"}
-  "async"            {= "v0.18~preview.130.55+197"}
-  "base"             {= "v0.18~preview.130.55+197"}
-  "core"             {= "v0.18~preview.130.55+197"}
-  "core_kernel"      {= "v0.18~preview.130.55+197"}
-  "core_unix"        {= "v0.18~preview.130.55+197"}
-  "jsonaf"           {= "v0.18~preview.130.55+197"}
-  "ocaml-embed-file" {= "v0.18~preview.130.55+197"}
-  "ppx_jane"         {= "v0.18~preview.130.55+197"}
-  "ppx_jsonaf_conv"  {= "v0.18~preview.130.55+197"}
+  "async"            {= "v0.18~preview.130.74+175"}
+  "base"             {= "v0.18~preview.130.74+175"}
+  "core"             {= "v0.18~preview.130.74+175"}
+  "core_kernel"      {= "v0.18~preview.130.74+175"}
+  "core_unix"        {= "v0.18~preview.130.74+175"}
+  "jsonaf"           {= "v0.18~preview.130.74+175"}
+  "ocaml-embed-file" {= "v0.18~preview.130.74+175"}
+  "ppx_jane"         {= "v0.18~preview.130.74+175"}
+  "ppx_jsonaf_conv"  {= "v0.18~preview.130.74+175"}
   "dune"             {>= "3.17.0"}
   "httpaf"           {>= "0.7.1"}
   "jingoo"           {>= "1.4.4" & < "1.5.0"}
@@ -32,7 +32,7 @@ An OpenAPI 3 to OCaml client generator.
 """
 url {
   src:
-    "https://github.com/janestreet/ocaml_openapi_generator/archive/85ac63241ebff41e70cc1f05a4844d8fdd046b60.tar.gz"
+    "https://github.com/janestreet/ocaml_openapi_generator/archive/95755aa17c7a9867de2b1e45a51f9704d7e80e7c.tar.gz"
   checksum:
-    "sha256=c63546623a2060454b761177dd311255311e622d733593cd4b8ff9508ba82b0d"
+    "sha256=dd344b21878d2ab659af227aa4762664dc23dbb7377830091cb1499fc7a217ff"
 }
diff --git a/packages/ocaml_simd/ocaml_simd.v0.18~preview.130.55+197/opam b/packages/ocaml_simd/ocaml_simd.v0.18~preview.130.74+175/opam
similarity index 55%
rename from packages/ocaml_simd/ocaml_simd.v0.18~preview.130.55+197/opam
rename to packages/ocaml_simd/ocaml_simd.v0.18~preview.130.74+175/opam
index cbe88e96d3..db7ca12a8d 100644
--- a/packages/ocaml_simd/ocaml_simd.v0.18~preview.130.55+197/opam
+++ b/packages/ocaml_simd/ocaml_simd.v0.18~preview.130.74+175/opam
@@ -12,14 +12,14 @@ build: [
 ]
 depends: [
   "ocaml"            {>= "5.2.0"}
-  "base"             {= "v0.18~preview.130.55+197"}
-  "core"             {= "v0.18~preview.130.55+197"}
-  "ocaml_intrinsics" {= "v0.18~preview.130.55+197"}
-  "ppx_jane"         {= "v0.18~preview.130.55+197"}
-  "ppx_template"     {= "v0.18~preview.130.55+197"}
-  "sexplib"          {= "v0.18~preview.130.55+197"}
-  "unboxed"          {= "v0.18~preview.130.55+197"}
-  "vec"              {= "v0.18~preview.130.55+197"}
+  "base"             {= "v0.18~preview.130.74+175"}
+  "core"             {= "v0.18~preview.130.74+175"}
+  "ocaml_intrinsics" {= "v0.18~preview.130.74+175"}
+  "ppx_jane"         {= "v0.18~preview.130.74+175"}
+  "ppx_template"     {= "v0.18~preview.130.74+175"}
+  "sexplib"          {= "v0.18~preview.130.74+175"}
+  "unboxed"          {= "v0.18~preview.130.74+175"}
+  "vec"              {= "v0.18~preview.130.74+175"}
   "dune"             {>= "3.17.0"}
   "ppxlib"           {= "0.33.0+ox"}
 ]
@@ -30,7 +30,7 @@ description: """
 """
 url {
   src:
-    "https://github.com/janestreet/ocaml_simd/archive/97a46879ef79427d97596ced718ae693f4cf046f.tar.gz"
+    "https://github.com/janestreet/ocaml_simd/archive/f3f8313ea1049e4516a4c6fd9c601833ea706cf1.tar.gz"
   checksum:
-    "sha256=6ef92bba933d324091d6795992f58427f5c6710eb30aad71f9578d5d13e8e04b"
+    "sha256=06b7e771200602d0bffffdf42c88ea24b5de2d7840e8d64fc86eec733a7c71eb"
 }
diff --git a/packages/of_json/of_json.v0.18~preview.130.55+197/opam b/packages/of_json/of_json.v0.18~preview.130.74+175/opam
similarity index 83%
rename from packages/of_json/of_json.v0.18~preview.130.55+197/opam
rename to packages/of_json/of_json.v0.18~preview.130.74+175/opam
index 3cf7ae4f69..57037e49a2 100644
--- a/packages/of_json/of_json.v0.18~preview.130.55+197/opam
+++ b/packages/of_json/of_json.v0.18~preview.130.74+175/opam
@@ -11,10 +11,10 @@ build: [
 ]
 depends: [
   "ocaml"         {>= "5.1.0"}
-  "core"          {= "v0.18~preview.130.55+197"}
-  "core_extended" {= "v0.18~preview.130.55+197"}
-  "jsonaf"        {= "v0.18~preview.130.55+197"}
-  "ppx_jane"      {= "v0.18~preview.130.55+197"}
+  "core"          {= "v0.18~preview.130.74+175"}
+  "core_extended" {= "v0.18~preview.130.74+175"}
+  "jsonaf"        {= "v0.18~preview.130.74+175"}
+  "ppx_jane"      {= "v0.18~preview.130.74+175"}
   "dune"          {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/oklab/oklab.v0.18~preview.130.55+197/opam b/packages/oklab/oklab.v0.18~preview.130.74+175/opam
similarity index 90%
rename from packages/oklab/oklab.v0.18~preview.130.55+197/opam
rename to packages/oklab/oklab.v0.18~preview.130.74+175/opam
index 6e0451cfa1..2faa3be5fb 100644
--- a/packages/oklab/oklab.v0.18~preview.130.55+197/opam
+++ b/packages/oklab/oklab.v0.18~preview.130.74+175/opam
@@ -11,8 +11,8 @@ build: [
 ]
 depends: [
   "ocaml"    {>= "5.1.0"}
-  "base"     {= "v0.18~preview.130.55+197"}
-  "ppx_jane" {= "v0.18~preview.130.55+197"}
+  "base"     {= "v0.18~preview.130.74+175"}
+  "ppx_jane" {= "v0.18~preview.130.74+175"}
   "dune"     {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/ordinal_abbreviation/ordinal_abbreviation.v0.18~preview.130.55+197/opam b/packages/ordinal_abbreviation/ordinal_abbreviation.v0.18~preview.130.74+175/opam
similarity index 91%
rename from packages/ordinal_abbreviation/ordinal_abbreviation.v0.18~preview.130.55+197/opam
rename to packages/ordinal_abbreviation/ordinal_abbreviation.v0.18~preview.130.74+175/opam
index 1c8de35895..c5a87f9c82 100644
--- a/packages/ordinal_abbreviation/ordinal_abbreviation.v0.18~preview.130.55+197/opam
+++ b/packages/ordinal_abbreviation/ordinal_abbreviation.v0.18~preview.130.74+175/opam
@@ -12,8 +12,8 @@ build: [
 ]
 depends: [
   "ocaml"    {>= "5.1.0"}
-  "base"     {= "v0.18~preview.130.55+197"}
-  "ppx_jane" {= "v0.18~preview.130.55+197"}
+  "base"     {= "v0.18~preview.130.74+175"}
+  "ppx_jane" {= "v0.18~preview.130.74+175"}
   "dune"     {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/oxcaml_effect/oxcaml_effect.v0.18~preview.130.55+197/opam b/packages/oxcaml_effect/oxcaml_effect.v0.18~preview.130.74+175/opam
similarity index 72%
rename from packages/oxcaml_effect/oxcaml_effect.v0.18~preview.130.55+197/opam
rename to packages/oxcaml_effect/oxcaml_effect.v0.18~preview.130.74+175/opam
index 53acccf99c..a714446446 100644
--- a/packages/oxcaml_effect/oxcaml_effect.v0.18~preview.130.55+197/opam
+++ b/packages/oxcaml_effect/oxcaml_effect.v0.18~preview.130.74+175/opam
@@ -12,8 +12,8 @@ build: [
 ]
 depends: [
   "ocaml"    {>= "5.1.0"}
-  "base"     {= "v0.18~preview.130.55+197"}
-  "basement" {= "v0.18~preview.130.55+197"}
+  "base"     {= "v0.18~preview.130.74+175"}
+  "basement" {= "v0.18~preview.130.74+175"}
   "dune"     {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -24,7 +24,7 @@ Effect provides a type-safe wrapper for algebraic effects
 """
 url {
   src:
-    "https://github.com/janestreet/oxcaml_effect/archive/d926132f7c5be96987f397126451e811787d4bb0.tar.gz"
+    "https://github.com/janestreet/oxcaml_effect/archive/a48b0bdacfcfdc39ff2a325dcb2282b660942051.tar.gz"
   checksum:
-    "sha256=48010e4807dcd211efa887359936f946b2e7b1bc5d56271dc902219c2cdc3651"
+    "sha256=d99d6d3a9036f4e213d619567d17a1c78ac6bf8af8ef5165b599ec550d441fc8"
 }
diff --git a/packages/pam/pam.v0.18~preview.130.55+197/opam b/packages/pam/pam.v0.18~preview.130.74+175/opam
similarity index 92%
rename from packages/pam/pam.v0.18~preview.130.55+197/opam
rename to packages/pam/pam.v0.18~preview.130.74+175/opam
index e3f3e3b152..9c5b455b3e 100644
--- a/packages/pam/pam.v0.18~preview.130.55+197/opam
+++ b/packages/pam/pam.v0.18~preview.130.74+175/opam
@@ -11,8 +11,8 @@ build: [
 ]
 depends: [
   "ocaml"    {>= "5.1.0"}
-  "core"     {= "v0.18~preview.130.55+197"}
-  "ppx_jane" {= "v0.18~preview.130.55+197"}
+  "core"     {= "v0.18~preview.130.74+175"}
+  "ppx_jane" {= "v0.18~preview.130.74+175"}
   "conf-pam"
   "dune"     {>= "3.17.0"}
 ]
diff --git a/packages/parallel/parallel.v0.18~preview.130.55+197/opam b/packages/parallel/parallel.v0.18~preview.130.55+197/opam
deleted file mode 100644
index 23673de699..0000000000
--- a/packages/parallel/parallel.v0.18~preview.130.55+197/opam
+++ /dev/null
@@ -1,43 +0,0 @@
-opam-version: "2.0"
-maintainer: "Jane Street developers"
-authors: ["Jane Street Group, LLC"]
-homepage: "https://github.com/janestreet/parallel"
-bug-reports: "https://github.com/janestreet/parallel/issues"
-dev-repo: "git+https://github.com/janestreet/parallel.git"
-doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/parallel/index.html"
-license: "MIT"
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-]
-depends: [
-  "ocaml"                    {>= "5.2.0"}
-  "await"                    {= "v0.18~preview.130.55+197"}
-  "base"                     {= "v0.18~preview.130.55+197"}
-  "base_bigstring"           {= "v0.18~preview.130.55+197"}
-  "concurrent"               {= "v0.18~preview.130.55+197"}
-  "core"                     {= "v0.18~preview.130.55+197"}
-  "expect_test_helpers_core" {= "v0.18~preview.130.55+197"}
-  "int_repr"                 {= "v0.18~preview.130.55+197"}
-  "oxcaml_effect"            {= "v0.18~preview.130.55+197"}
-  "portable"                 {= "v0.18~preview.130.55+197"}
-  "portable_ws_deque"        {= "v0.18~preview.130.55+197"}
-  "ppx_fuelproof"            {= "v0.18~preview.130.55+197"}
-  "ppx_jane"                 {= "v0.18~preview.130.55+197"}
-  "stdio"                    {= "v0.18~preview.130.55+197"}
-  "unboxed"                  {= "v0.18~preview.130.55+197"}
-  "unique"                   {= "v0.18~preview.130.55+197"}
-  "vec"                      {= "v0.18~preview.130.55+197"}
-  "base-threads"
-  "dune"                     {>= "3.17.0"}
-]
-available: arch != "arm32" & arch != "x86_32"
-synopsis: "OxCaml Parallelism"
-description: """
- Parallelism infrastructure.
-"""
-url {
-  src:
-    "https://github.com/janestreet/parallel/archive/fa624f8283de0f178ab955d322aafc8969f23e46.tar.gz"
-  checksum:
-    "sha256=9b7aaa4898c161809a647918dc91b17bd2a979f193c3333abf1d2a0992fface1"
-}
diff --git a/packages/parallel/parallel.v0.18~preview.130.74+175/opam b/packages/parallel/parallel.v0.18~preview.130.74+175/opam
new file mode 100644
index 0000000000..a9fd20915f
--- /dev/null
+++ b/packages/parallel/parallel.v0.18~preview.130.74+175/opam
@@ -0,0 +1,45 @@
+opam-version: "2.0"
+maintainer: "Jane Street developers"
+authors: ["Jane Street Group, LLC"]
+homepage: "https://github.com/janestreet/parallel"
+bug-reports: "https://github.com/janestreet/parallel/issues"
+dev-repo: "git+https://github.com/janestreet/parallel.git"
+doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/parallel/index.html"
+license: "MIT"
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+]
+depends: [
+  "ocaml"                    {>= "5.2.0"}
+  "async_kernel"             {= "v0.18~preview.130.74+175"}
+  "await"                    {= "v0.18~preview.130.74+175"}
+  "base"                     {= "v0.18~preview.130.74+175"}
+  "base_bigstring"           {= "v0.18~preview.130.74+175"}
+  "bignum"                   {= "v0.18~preview.130.74+175"}
+  "concurrent"               {= "v0.18~preview.130.74+175"}
+  "core"                     {= "v0.18~preview.130.74+175"}
+  "expect_test_helpers_core" {= "v0.18~preview.130.74+175"}
+  "ocaml_simd"               {= "v0.18~preview.130.74+175"}
+  "oxcaml_effect"            {= "v0.18~preview.130.74+175"}
+  "portable"                 {= "v0.18~preview.130.74+175"}
+  "portable_ws_deque"        {= "v0.18~preview.130.74+175"}
+  "ppx_fuelproof"            {= "v0.18~preview.130.74+175"}
+  "ppx_jane"                 {= "v0.18~preview.130.74+175"}
+  "stdio"                    {= "v0.18~preview.130.74+175"}
+  "unboxed"                  {= "v0.18~preview.130.74+175"}
+  "unique"                   {= "v0.18~preview.130.74+175"}
+  "vec"                      {= "v0.18~preview.130.74+175"}
+  "base-threads"
+  "dune"                     {>= "3.17.0"}
+]
+available: arch != "arm32" & arch != "x86_32"
+synopsis: "OxCaml Parallelism"
+description: """
+ Parallelism infrastructure.
+"""
+url {
+  src:
+    "https://github.com/janestreet/parallel/archive/b3f25be1bcb81c4d752590dd6e44d960885fe09b.tar.gz"
+  checksum:
+    "sha256=d18c04b65290671370ac54becbad46e49c52538b84c05bfd1ffb9dc2893137d7"
+}
diff --git a/packages/parsexp/parsexp.v0.18~preview.130.55+197/opam b/packages/parsexp/parsexp.v0.18~preview.130.74+175/opam
similarity index 77%
rename from packages/parsexp/parsexp.v0.18~preview.130.55+197/opam
rename to packages/parsexp/parsexp.v0.18~preview.130.74+175/opam
index 1910b231d9..23f6dba35b 100644
--- a/packages/parsexp/parsexp.v0.18~preview.130.55+197/opam
+++ b/packages/parsexp/parsexp.v0.18~preview.130.74+175/opam
@@ -11,11 +11,11 @@ build: [
 ]
 depends: [
   "ocaml"         {>= "5.1.0"}
-  "basement"      {= "v0.18~preview.130.55+197"}
-  "ppx_js_style"  {= "v0.18~preview.130.55+197"}
-  "ppx_sexp_conv" {= "v0.18~preview.130.55+197"}
-  "sexplib0"      {= "v0.18~preview.130.55+197"}
-  "unique"        {= "v0.18~preview.130.55+197"}
+  "basement"      {= "v0.18~preview.130.74+175"}
+  "ppx_js_style"  {= "v0.18~preview.130.74+175"}
+  "ppx_sexp_conv" {= "v0.18~preview.130.74+175"}
+  "sexplib0"      {= "v0.18~preview.130.74+175"}
+  "unique"        {= "v0.18~preview.130.74+175"}
   "dune"          {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -43,7 +43,7 @@ parsexp_io.
 """
 url {
   src:
-    "https://github.com/janestreet/parsexp/archive/d3fca09d82ab3fd3572de5e5f8849a6bd6f86878.tar.gz"
+    "https://github.com/janestreet/parsexp/archive/1ad52f181a54d124c4607df89fcdfe6cfc79efe8.tar.gz"
   checksum:
-    "sha256=ea1cebc7d001fe884b31b989b8a517774f23c52f57dd3d1d08731f93fdaf17a0"
+    "sha256=bbd6ed2235a7666817ad67730ba1a9eaa3433926811aae8a732c1d0b871f4688"
 }
diff --git a/packages/parsexp_io/parsexp_io.v0.18~preview.130.55+197/opam b/packages/parsexp_io/parsexp_io.v0.18~preview.130.74+175/opam
similarity index 82%
rename from packages/parsexp_io/parsexp_io.v0.18~preview.130.55+197/opam
rename to packages/parsexp_io/parsexp_io.v0.18~preview.130.74+175/opam
index c7ff986363..d78188b9ec 100644
--- a/packages/parsexp_io/parsexp_io.v0.18~preview.130.55+197/opam
+++ b/packages/parsexp_io/parsexp_io.v0.18~preview.130.74+175/opam
@@ -12,10 +12,10 @@ build: [
 ]
 depends: [
   "ocaml"        {>= "5.1.0"}
-  "base"         {= "v0.18~preview.130.55+197"}
-  "parsexp"      {= "v0.18~preview.130.55+197"}
-  "ppx_js_style" {= "v0.18~preview.130.55+197"}
-  "stdio"        {= "v0.18~preview.130.55+197"}
+  "base"         {= "v0.18~preview.130.74+175"}
+  "parsexp"      {= "v0.18~preview.130.74+175"}
+  "ppx_js_style" {= "v0.18~preview.130.74+175"}
+  "stdio"        {= "v0.18~preview.130.74+175"}
   "dune"         {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/parsexp_prefix/parsexp_prefix.v0.18~preview.130.55+197/opam b/packages/parsexp_prefix/parsexp_prefix.v0.18~preview.130.74+175/opam
similarity index 65%
rename from packages/parsexp_prefix/parsexp_prefix.v0.18~preview.130.55+197/opam
rename to packages/parsexp_prefix/parsexp_prefix.v0.18~preview.130.74+175/opam
index 8a92cb01d3..75522c90d0 100644
--- a/packages/parsexp_prefix/parsexp_prefix.v0.18~preview.130.55+197/opam
+++ b/packages/parsexp_prefix/parsexp_prefix.v0.18~preview.130.74+175/opam
@@ -12,15 +12,15 @@ build: [
 ]
 depends: [
   "ocaml"                      {>= "4.14.0"}
-  "parsexp"                    {= "v0.18~preview.130.55+197"}
-  "parsexp_symbolic_automaton" {= "v0.18~preview.130.55+197"}
-  "ppx_compare"                {= "v0.18~preview.130.55+197"}
-  "ppx_enumerate"              {= "v0.18~preview.130.55+197"}
-  "ppx_hash"                   {= "v0.18~preview.130.55+197"}
-  "ppx_js_style"               {= "v0.18~preview.130.55+197"}
-  "ppx_sexp_conv"              {= "v0.18~preview.130.55+197"}
-  "ppx_variants_conv"          {= "v0.18~preview.130.55+197"}
-  "sexplib0"                   {= "v0.18~preview.130.55+197"}
+  "parsexp"                    {= "v0.18~preview.130.74+175"}
+  "parsexp_symbolic_automaton" {= "v0.18~preview.130.74+175"}
+  "ppx_compare"                {= "v0.18~preview.130.74+175"}
+  "ppx_enumerate"              {= "v0.18~preview.130.74+175"}
+  "ppx_hash"                   {= "v0.18~preview.130.74+175"}
+  "ppx_js_style"               {= "v0.18~preview.130.74+175"}
+  "ppx_sexp_conv"              {= "v0.18~preview.130.74+175"}
+  "ppx_variants_conv"          {= "v0.18~preview.130.74+175"}
+  "sexplib0"                   {= "v0.18~preview.130.74+175"}
   "dune"                       {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/parsexp_symbolic_automaton/parsexp_symbolic_automaton.v0.18~preview.130.55+197/opam b/packages/parsexp_symbolic_automaton/parsexp_symbolic_automaton.v0.18~preview.130.74+175/opam
similarity index 92%
rename from packages/parsexp_symbolic_automaton/parsexp_symbolic_automaton.v0.18~preview.130.55+197/opam
rename to packages/parsexp_symbolic_automaton/parsexp_symbolic_automaton.v0.18~preview.130.74+175/opam
index 3d8ad4db84..2c46e93c7b 100644
--- a/packages/parsexp_symbolic_automaton/parsexp_symbolic_automaton.v0.18~preview.130.55+197/opam
+++ b/packages/parsexp_symbolic_automaton/parsexp_symbolic_automaton.v0.18~preview.130.74+175/opam
@@ -13,8 +13,8 @@ build: [
 ]
 depends: [
   "ocaml"    {>= "4.14.0"}
-  "base"     {= "v0.18~preview.130.55+197"}
-  "ppx_jane" {= "v0.18~preview.130.55+197"}
+  "base"     {= "v0.18~preview.130.74+175"}
+  "ppx_jane" {= "v0.18~preview.130.74+175"}
   "dune"     {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/patdiff/patdiff.v0.18~preview.130.55+197/opam b/packages/patdiff/patdiff.v0.18~preview.130.74+175/opam
similarity index 54%
rename from packages/patdiff/patdiff.v0.18~preview.130.55+197/opam
rename to packages/patdiff/patdiff.v0.18~preview.130.74+175/opam
index 7263a02bc1..433b5b7ba4 100644
--- a/packages/patdiff/patdiff.v0.18~preview.130.55+197/opam
+++ b/packages/patdiff/patdiff.v0.18~preview.130.74+175/opam
@@ -11,13 +11,13 @@ build: [
 ]
 depends: [
   "ocaml"                    {>= "5.1.0"}
-  "base"                     {= "v0.18~preview.130.55+197"}
-  "core"                     {= "v0.18~preview.130.55+197"}
-  "core_kernel"              {= "v0.18~preview.130.55+197"}
-  "core_unix"                {= "v0.18~preview.130.55+197"}
-  "expect_test_helpers_core" {= "v0.18~preview.130.55+197"}
-  "patience_diff"            {= "v0.18~preview.130.55+197"}
-  "ppx_jane"                 {= "v0.18~preview.130.55+197"}
+  "base"                     {= "v0.18~preview.130.74+175"}
+  "core"                     {= "v0.18~preview.130.74+175"}
+  "core_kernel"              {= "v0.18~preview.130.74+175"}
+  "core_unix"                {= "v0.18~preview.130.74+175"}
+  "expect_test_helpers_core" {= "v0.18~preview.130.74+175"}
+  "patience_diff"            {= "v0.18~preview.130.74+175"}
+  "ppx_jane"                 {= "v0.18~preview.130.74+175"}
   "dune"                     {>= "3.17.0"}
   "re"                       {= "1.14.0+ox"}
   "uucp"
@@ -28,7 +28,7 @@ description: """
 """
 url {
   src:
-    "https://github.com/janestreet/patdiff/archive/ec9a4e62960e10e8f0e5625879b6211683ed2a9a.tar.gz"
+    "https://github.com/janestreet/patdiff/archive/3da85018862660ce4eb18af69f5a988fc510c779.tar.gz"
   checksum:
-    "sha256=2564427df2d648c00c6d5f64d59294186db6ee8c66a84a8a307649133e1f2589"
+    "sha256=fd2bbd8b6b8aa77537e4106ce7b842d2cfeda0d13552403dae540e503c072f2e"
 }
diff --git a/packages/patience_diff/patience_diff.v0.18~preview.130.55+197/opam b/packages/patience_diff/patience_diff.v0.18~preview.130.74+175/opam
similarity index 86%
rename from packages/patience_diff/patience_diff.v0.18~preview.130.55+197/opam
rename to packages/patience_diff/patience_diff.v0.18~preview.130.74+175/opam
index 3c34ab6480..fb8f0d2bd7 100644
--- a/packages/patience_diff/patience_diff.v0.18~preview.130.55+197/opam
+++ b/packages/patience_diff/patience_diff.v0.18~preview.130.74+175/opam
@@ -12,9 +12,9 @@ build: [
 ]
 depends: [
   "ocaml"    {>= "5.1.0"}
-  "base"     {= "v0.18~preview.130.55+197"}
-  "core"     {= "v0.18~preview.130.55+197"}
-  "ppx_jane" {= "v0.18~preview.130.55+197"}
+  "base"     {= "v0.18~preview.130.74+175"}
+  "core"     {= "v0.18~preview.130.74+175"}
+  "ppx_jane" {= "v0.18~preview.130.74+175"}
   "dune"     {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/pending_or_error/pending_or_error.v0.18~preview.130.55+197/opam b/packages/pending_or_error/pending_or_error.v0.18~preview.130.74+175/opam
similarity index 89%
rename from packages/pending_or_error/pending_or_error.v0.18~preview.130.55+197/opam
rename to packages/pending_or_error/pending_or_error.v0.18~preview.130.74+175/opam
index 50c5982fa1..7715bb9866 100644
--- a/packages/pending_or_error/pending_or_error.v0.18~preview.130.55+197/opam
+++ b/packages/pending_or_error/pending_or_error.v0.18~preview.130.74+175/opam
@@ -12,9 +12,9 @@ build: [
 ]
 depends: [
   "ocaml"    {>= "5.2.0"}
-  "core"     {= "v0.18~preview.130.55+197"}
-  "ppx_diff" {= "v0.18~preview.130.55+197"}
-  "ppx_jane" {= "v0.18~preview.130.55+197"}
+  "core"     {= "v0.18~preview.130.74+175"}
+  "ppx_diff" {= "v0.18~preview.130.74+175"}
+  "ppx_jane" {= "v0.18~preview.130.74+175"}
   "dune"     {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/pipe_with_writer_error/pipe_with_writer_error.v0.18~preview.130.55+197/opam b/packages/pipe_with_writer_error/pipe_with_writer_error.v0.18~preview.130.74+175/opam
similarity index 92%
rename from packages/pipe_with_writer_error/pipe_with_writer_error.v0.18~preview.130.55+197/opam
rename to packages/pipe_with_writer_error/pipe_with_writer_error.v0.18~preview.130.74+175/opam
index d3c32b2db1..fac3c5128d 100644
--- a/packages/pipe_with_writer_error/pipe_with_writer_error.v0.18~preview.130.55+197/opam
+++ b/packages/pipe_with_writer_error/pipe_with_writer_error.v0.18~preview.130.74+175/opam
@@ -12,9 +12,9 @@ build: [
 ]
 depends: [
   "ocaml"        {>= "5.1.0"}
-  "async_kernel" {= "v0.18~preview.130.55+197"}
-  "core"         {= "v0.18~preview.130.55+197"}
-  "ppx_jane"     {= "v0.18~preview.130.55+197"}
+  "async_kernel" {= "v0.18~preview.130.74+175"}
+  "core"         {= "v0.18~preview.130.74+175"}
+  "ppx_jane"     {= "v0.18~preview.130.74+175"}
   "dune"         {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/polling_state_rpc/polling_state_rpc.v0.18~preview.130.55+197/opam b/packages/polling_state_rpc/polling_state_rpc.v0.18~preview.130.74+175/opam
similarity index 60%
rename from packages/polling_state_rpc/polling_state_rpc.v0.18~preview.130.55+197/opam
rename to packages/polling_state_rpc/polling_state_rpc.v0.18~preview.130.74+175/opam
index 1d77858a4f..ecca8f85e6 100644
--- a/packages/polling_state_rpc/polling_state_rpc.v0.18~preview.130.55+197/opam
+++ b/packages/polling_state_rpc/polling_state_rpc.v0.18~preview.130.74+175/opam
@@ -12,13 +12,13 @@ build: [
 ]
 depends: [
   "ocaml"            {>= "5.1.0"}
-  "async_kernel"     {= "v0.18~preview.130.55+197"}
-  "async_rpc_kernel" {= "v0.18~preview.130.55+197"}
-  "babel"            {= "v0.18~preview.130.55+197"}
-  "core"             {= "v0.18~preview.130.55+197"}
-  "core_kernel"      {= "v0.18~preview.130.55+197"}
-  "ppx_diff"         {= "v0.18~preview.130.55+197"}
-  "ppx_jane"         {= "v0.18~preview.130.55+197"}
+  "async_kernel"     {= "v0.18~preview.130.74+175"}
+  "async_rpc_kernel" {= "v0.18~preview.130.74+175"}
+  "babel"            {= "v0.18~preview.130.74+175"}
+  "core"             {= "v0.18~preview.130.74+175"}
+  "core_kernel"      {= "v0.18~preview.130.74+175"}
+  "ppx_diff"         {= "v0.18~preview.130.74+175"}
+  "ppx_jane"         {= "v0.18~preview.130.74+175"}
   "dune"             {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -29,7 +29,7 @@ An RPC which tracks state on the client and server so it only needs to send diff
 """
 url {
   src:
-    "https://github.com/janestreet/polling_state_rpc/archive/ce68baf70a33bc529c69745b3c5e805a005e12ce.tar.gz"
+    "https://github.com/janestreet/polling_state_rpc/archive/f77608e3ca1ea500ba9bdfc3b12caa1d37a40cd1.tar.gz"
   checksum:
-    "sha256=c91f5d45d7d22425d413e9ed8d9dbffd3dbdf0ee35c57ecb29ed4e9fc4154d24"
+    "sha256=bce70ed218984896800efb4851e7d8afa1d9bbc9ea9463cb0cc242eb0e273004"
 }
diff --git a/packages/portable/portable.v0.18~preview.130.55+197/opam b/packages/portable/portable.v0.18~preview.130.74+175/opam
similarity index 59%
rename from packages/portable/portable.v0.18~preview.130.55+197/opam
rename to packages/portable/portable.v0.18~preview.130.74+175/opam
index 629a083a40..719221dac0 100644
--- a/packages/portable/portable.v0.18~preview.130.55+197/opam
+++ b/packages/portable/portable.v0.18~preview.130.74+175/opam
@@ -11,13 +11,13 @@ build: [
 ]
 depends: [
   "ocaml"           {>= "5.1.0"}
-  "base"            {= "v0.18~preview.130.55+197"}
-  "base_quickcheck" {= "v0.18~preview.130.55+197"}
-  "basement"        {= "v0.18~preview.130.55+197"}
-  "ppx_compare"     {= "v0.18~preview.130.55+197"}
-  "ppx_sexp_conv"   {= "v0.18~preview.130.55+197"}
-  "ppx_shorthand"   {= "v0.18~preview.130.55+197"}
-  "ppx_template"    {= "v0.18~preview.130.55+197"}
+  "base"            {= "v0.18~preview.130.74+175"}
+  "base_quickcheck" {= "v0.18~preview.130.74+175"}
+  "basement"        {= "v0.18~preview.130.74+175"}
+  "ppx_compare"     {= "v0.18~preview.130.74+175"}
+  "ppx_sexp_conv"   {= "v0.18~preview.130.74+175"}
+  "ppx_shorthand"   {= "v0.18~preview.130.74+175"}
+  "ppx_template"    {= "v0.18~preview.130.74+175"}
   "dune"            {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -29,7 +29,7 @@ programming using OCaml and OxCaml
 """
 url {
   src:
-    "https://github.com/janestreet/portable/archive/bbd0db99999565564cc39c7ffee5959fcba8b316.tar.gz"
+    "https://github.com/janestreet/portable/archive/f41cfc339ebb959feee78cd2eecd4bdc32e584f4.tar.gz"
   checksum:
-    "sha256=69437dc6aaae3545f405a917a10729e222d36eff185b1faf81e07cdf1d54abe1"
+    "sha256=fa05acc2d7b5eb5efaf7021c6dda1119985c5dd02c25472977dcb19af66361e0"
 }
diff --git a/packages/portable_async/portable_async.v0.18~preview.130.55+197/opam b/packages/portable_async/portable_async.v0.18~preview.130.55+197/opam
deleted file mode 100644
index 3457cbdbbd..0000000000
--- a/packages/portable_async/portable_async.v0.18~preview.130.55+197/opam
+++ /dev/null
@@ -1,34 +0,0 @@
-opam-version: "2.0"
-maintainer: "Jane Street developers"
-authors: ["Jane Street Group, LLC"]
-homepage: "https://github.com/janestreet/portable_async"
-bug-reports: "https://github.com/janestreet/portable_async/issues"
-dev-repo: "git+https://github.com/janestreet/portable_async.git"
-doc:
-  "https://ocaml.janestreet.com/ocaml-core/latest/doc/portable_async/index.html"
-license: "MIT"
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-]
-depends: [
-  "ocaml"        {>= "5.1.0"}
-  "async_kernel" {= "v0.18~preview.130.55+197"}
-  "await"        {= "v0.18~preview.130.55+197"}
-  "concurrent"   {= "v0.18~preview.130.55+197"}
-  "core"         {= "v0.18~preview.130.55+197"}
-  "parallel"     {= "v0.18~preview.130.55+197"}
-  "ppx_jane"     {= "v0.18~preview.130.55+197"}
-  "dune"         {>= "3.17.0"}
-]
-available: arch != "arm32" & arch != "x86_32"
-synopsis: "Integration between Async and Parallel OxCaml"
-description: """
-Portable_async provides a compatibility layer between Async and parallelism for
-    OxCaml
-"""
-url {
-  src:
-    "https://github.com/janestreet/portable_async/archive/a3442a800b328a80162a8de7ac93f10bf8b1a06a.tar.gz"
-  checksum:
-    "sha256=49ddadd9072bd1e1b01662f1aa09afa06b8c0641c80877394966e7e11d8e584e"
-}
diff --git a/packages/portable_ws_deque/portable_ws_deque.v0.18~preview.130.55+197/opam b/packages/portable_ws_deque/portable_ws_deque.v0.18~preview.130.74+175/opam
similarity index 66%
rename from packages/portable_ws_deque/portable_ws_deque.v0.18~preview.130.55+197/opam
rename to packages/portable_ws_deque/portable_ws_deque.v0.18~preview.130.74+175/opam
index bb968e8776..799810ba37 100644
--- a/packages/portable_ws_deque/portable_ws_deque.v0.18~preview.130.55+197/opam
+++ b/packages/portable_ws_deque/portable_ws_deque.v0.18~preview.130.74+175/opam
@@ -12,10 +12,10 @@ build: [
 ]
 depends: [
   "ocaml"    {>= "5.1.0"}
-  "base"     {= "v0.18~preview.130.55+197"}
-  "basement" {= "v0.18~preview.130.55+197"}
-  "portable" {= "v0.18~preview.130.55+197"}
-  "uopt"     {= "v0.18~preview.130.55+197"}
+  "base"     {= "v0.18~preview.130.74+175"}
+  "basement" {= "v0.18~preview.130.74+175"}
+  "portable" {= "v0.18~preview.130.74+175"}
+  "uopt"     {= "v0.18~preview.130.74+175"}
   "dune"     {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -25,7 +25,7 @@ Portable lock-free chase-lev work-stealing deque for OxCaml
 """
 url {
   src:
-    "https://github.com/janestreet/portable_ws_deque/archive/b01e8d359cc6fa16a9034749725480e5edff6489.tar.gz"
+    "https://github.com/janestreet/portable_ws_deque/archive/2fe44bca9b0422152b934ff9cc8583da5b6ecca5.tar.gz"
   checksum:
-    "sha256=f4ccbca5e9e41391c9dc7b374eca5fa8d1438553f576250232120443ecbd4071"
+    "sha256=edcc10609b29bccde741ed5986dcf5243517d9e084eabe6db045523dc0759998"
 }
diff --git a/packages/posixat/posixat.v0.18~preview.130.55+197/opam b/packages/posixat/posixat.v0.18~preview.130.74+175/opam
similarity index 73%
rename from packages/posixat/posixat.v0.18~preview.130.55+197/opam
rename to packages/posixat/posixat.v0.18~preview.130.74+175/opam
index 8e0c2d6c8d..38fcc8f03f 100644
--- a/packages/posixat/posixat.v0.18~preview.130.55+197/opam
+++ b/packages/posixat/posixat.v0.18~preview.130.74+175/opam
@@ -11,9 +11,9 @@ build: [
 ]
 depends: [
   "ocaml"         {>= "5.1.0"}
-  "base"          {= "v0.18~preview.130.55+197"}
-  "ppx_optcomp"   {= "v0.18~preview.130.55+197"}
-  "ppx_sexp_conv" {= "v0.18~preview.130.55+197"}
+  "base"          {= "v0.18~preview.130.74+175"}
+  "ppx_optcomp"   {= "v0.18~preview.130.74+175"}
+  "ppx_sexp_conv" {= "v0.18~preview.130.74+175"}
   "dune"          {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -28,7 +28,7 @@ working directories inside the same process.
 """
 url {
   src:
-    "https://github.com/janestreet/posixat/archive/e6ff0d603f8f78baf8d4c7bcf417845b0bc93671.tar.gz"
+    "https://github.com/janestreet/posixat/archive/ee1229fc78cda236851c1a5f09531ff9c9d7c4b6.tar.gz"
   checksum:
-    "sha256=ec2ad8edc9d1423a20ce309d636880ad7f782ccd8666a4455c4197d860aa232e"
+    "sha256=c04e1f2bca80116e164af1f4d11b1a1b46bbe806bc778ce85bdb67efcdb9e38b"
 }
diff --git a/packages/postgres_async/postgres_async.v0.18~preview.130.55+197/opam b/packages/postgres_async/postgres_async.v0.18~preview.130.74+175/opam
similarity index 67%
rename from packages/postgres_async/postgres_async.v0.18~preview.130.55+197/opam
rename to packages/postgres_async/postgres_async.v0.18~preview.130.74+175/opam
index c3e531712e..00df6a1801 100644
--- a/packages/postgres_async/postgres_async.v0.18~preview.130.55+197/opam
+++ b/packages/postgres_async/postgres_async.v0.18~preview.130.74+175/opam
@@ -12,13 +12,13 @@ build: [
 ]
 depends: [
   "ocaml"        {>= "5.1.0"}
-  "async"        {= "v0.18~preview.130.55+197"}
-  "async_kernel" {= "v0.18~preview.130.55+197"}
-  "async_ssl"    {= "v0.18~preview.130.55+197"}
-  "async_unix"   {= "v0.18~preview.130.55+197"}
-  "core"         {= "v0.18~preview.130.55+197"}
-  "core_kernel"  {= "v0.18~preview.130.55+197"}
-  "ppx_jane"     {= "v0.18~preview.130.55+197"}
+  "async"        {= "v0.18~preview.130.74+175"}
+  "async_kernel" {= "v0.18~preview.130.74+175"}
+  "async_ssl"    {= "v0.18~preview.130.74+175"}
+  "async_unix"   {= "v0.18~preview.130.74+175"}
+  "core"         {= "v0.18~preview.130.74+175"}
+  "core_kernel"  {= "v0.18~preview.130.74+175"}
+  "ppx_jane"     {= "v0.18~preview.130.74+175"}
   "dune"         {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -33,7 +33,7 @@ for now, though in the future a layer on top may add convenience functions.
 """
 url {
   src:
-    "https://github.com/janestreet/postgres_async/archive/07d38313cd9ab9d6cfad498ecdac482de5f2e836.tar.gz"
+    "https://github.com/janestreet/postgres_async/archive/1ebd29e3ea983d461cb46a18226f1ff24f972ee6.tar.gz"
   checksum:
-    "sha256=dd90e777993fa87d6f70942fcb4b1bae6f8de00339a340146e35a8ac67370efb"
+    "sha256=c231731605c058dad2d6f80ce5ce17a4434448aa54bb967b3769ba69096b23d8"
 }
diff --git a/packages/ppx_accessor/ppx_accessor.v0.18~preview.130.55+197/opam b/packages/ppx_accessor/ppx_accessor.v0.18~preview.130.74+175/opam
similarity index 87%
rename from packages/ppx_accessor/ppx_accessor.v0.18~preview.130.55+197/opam
rename to packages/ppx_accessor/ppx_accessor.v0.18~preview.130.74+175/opam
index 126bd334dc..8591421da2 100644
--- a/packages/ppx_accessor/ppx_accessor.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_accessor/ppx_accessor.v0.18~preview.130.74+175/opam
@@ -12,9 +12,9 @@ build: [
 ]
 depends: [
   "ocaml"       {>= "5.1.0"}
-  "accessor"    {= "v0.18~preview.130.55+197"}
-  "base"        {= "v0.18~preview.130.55+197"}
-  "ppxlib_jane" {= "v0.18~preview.130.55+197"}
+  "accessor"    {= "v0.18~preview.130.74+175"}
+  "base"        {= "v0.18~preview.130.74+175"}
+  "ppxlib_jane" {= "v0.18~preview.130.74+175"}
   "dune"        {>= "3.17.0"}
   "ppxlib"      {= "0.33.0+ox"}
 ]
diff --git a/packages/ppx_anonymous_record/ppx_anonymous_record.v0.18~preview.130.55+197/opam b/packages/ppx_anonymous_record/ppx_anonymous_record.v0.18~preview.130.74+175/opam
similarity index 84%
rename from packages/ppx_anonymous_record/ppx_anonymous_record.v0.18~preview.130.55+197/opam
rename to packages/ppx_anonymous_record/ppx_anonymous_record.v0.18~preview.130.74+175/opam
index 1db2f9d64c..f28e7535d3 100644
--- a/packages/ppx_anonymous_record/ppx_anonymous_record.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_anonymous_record/ppx_anonymous_record.v0.18~preview.130.74+175/opam
@@ -12,10 +12,10 @@ build: [
 ]
 depends: [
   "ocaml"       {>= "5.1.0"}
-  "base"        {= "v0.18~preview.130.55+197"}
-  "ppx_jane"    {= "v0.18~preview.130.55+197"}
-  "ppx_string"  {= "v0.18~preview.130.55+197"}
-  "ppxlib_jane" {= "v0.18~preview.130.55+197"}
+  "base"        {= "v0.18~preview.130.74+175"}
+  "ppx_jane"    {= "v0.18~preview.130.74+175"}
+  "ppx_string"  {= "v0.18~preview.130.74+175"}
+  "ppxlib_jane" {= "v0.18~preview.130.74+175"}
   "dune"        {>= "3.17.0"}
   "ppxlib"      {= "0.33.0+ox"}
 ]
diff --git a/packages/ppx_array/ppx_array.v0.18~preview.130.55+197/opam b/packages/ppx_array/ppx_array.v0.18~preview.130.74+175/opam
similarity index 71%
rename from packages/ppx_array/ppx_array.v0.18~preview.130.55+197/opam
rename to packages/ppx_array/ppx_array.v0.18~preview.130.74+175/opam
index df904032e2..ae116915b7 100644
--- a/packages/ppx_array/ppx_array.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_array/ppx_array.v0.18~preview.130.74+175/opam
@@ -12,11 +12,11 @@ build: [
 ]
 depends: [
   "ocaml"          {>= "5.1.0"}
-  "base"           {= "v0.18~preview.130.55+197"}
-  "ppx_array_base" {= "v0.18~preview.130.55+197"}
-  "ppx_helpers"    {= "v0.18~preview.130.55+197"}
-  "ppx_template"   {= "v0.18~preview.130.55+197"}
-  "ppxlib_jane"    {= "v0.18~preview.130.55+197"}
+  "base"           {= "v0.18~preview.130.74+175"}
+  "ppx_array_base" {= "v0.18~preview.130.74+175"}
+  "ppx_helpers"    {= "v0.18~preview.130.74+175"}
+  "ppx_template"   {= "v0.18~preview.130.74+175"}
+  "ppxlib_jane"    {= "v0.18~preview.130.74+175"}
   "dune"           {>= "3.17.0"}
   "ppxlib"         {= "0.33.0+ox"}
 ]
@@ -28,7 +28,7 @@ This deriving PPX rewriter is used internally at Jane Street to allow unboxed ty
 """
 url {
   src:
-    "https://github.com/janestreet/ppx_array/archive/64b88c3ef7665a03bdc789526147b94d1757caca.tar.gz"
+    "https://github.com/janestreet/ppx_array/archive/007939238a8e0f82f4345b822db1e7ada3d719bf.tar.gz"
   checksum:
-    "sha256=fa100441348373e3e9f9d838dda4d8b01c5dbbcce00df7f6b188b6d7f4714e9b"
+    "sha256=48b52390c0e94c408067beef11a17c3da85a06e9a4133f6ffee4591ed177a86f"
 }
diff --git a/packages/ppx_array_base/ppx_array_base.v0.18~preview.130.55+197/opam b/packages/ppx_array_base/ppx_array_base.v0.18~preview.130.74+175/opam
similarity index 75%
rename from packages/ppx_array_base/ppx_array_base.v0.18~preview.130.55+197/opam
rename to packages/ppx_array_base/ppx_array_base.v0.18~preview.130.74+175/opam
index b9645e82f8..001fde5804 100644
--- a/packages/ppx_array_base/ppx_array_base.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_array_base/ppx_array_base.v0.18~preview.130.74+175/opam
@@ -12,8 +12,8 @@ build: [
 ]
 depends: [
   "ocaml"       {>= "5.1.0"}
-  "ppx_helpers" {= "v0.18~preview.130.55+197"}
-  "ppxlib_jane" {= "v0.18~preview.130.55+197"}
+  "ppx_helpers" {= "v0.18~preview.130.74+175"}
+  "ppxlib_jane" {= "v0.18~preview.130.74+175"}
   "dune"        {>= "3.17.0"}
   "ppxlib"      {= "0.33.0+ox"}
 ]
@@ -24,7 +24,7 @@ This PPX defines array functions used in [Base.Array] via attribute expansion. I
 """
 url {
   src:
-    "https://github.com/janestreet/ppx_array_base/archive/ef85534c1b41d02289f78c56b82fa7aacf364a40.tar.gz"
+    "https://github.com/janestreet/ppx_array_base/archive/e610ae3baed92bfdc160baf5d4325deb597cbafe.tar.gz"
   checksum:
-    "sha256=679aeeb2bb638a372683e09c9a15f0c8ca3bf443eadb674977727ed49d489c69"
+    "sha256=6c914ae237027479eb99f903e2ac0e965c64aa2e85fbd1edc6f0492414ad6ba4"
 }
diff --git a/packages/ppx_assert/ppx_assert.v0.18~preview.130.55+197/opam b/packages/ppx_assert/ppx_assert.v0.18~preview.130.74+175/opam
similarity index 61%
rename from packages/ppx_assert/ppx_assert.v0.18~preview.130.55+197/opam
rename to packages/ppx_assert/ppx_assert.v0.18~preview.130.74+175/opam
index 783b1f37dc..0bf2b0c223 100644
--- a/packages/ppx_assert/ppx_assert.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_assert/ppx_assert.v0.18~preview.130.74+175/opam
@@ -12,12 +12,12 @@ build: [
 ]
 depends: [
   "ocaml"         {>= "5.1.0"}
-  "base"          {= "v0.18~preview.130.55+197"}
-  "ppx_cold"      {= "v0.18~preview.130.55+197"}
-  "ppx_compare"   {= "v0.18~preview.130.55+197"}
-  "ppx_here"      {= "v0.18~preview.130.55+197"}
-  "ppx_sexp_conv" {= "v0.18~preview.130.55+197"}
-  "ppx_template"  {= "v0.18~preview.130.55+197"}
+  "base"          {= "v0.18~preview.130.74+175"}
+  "ppx_cold"      {= "v0.18~preview.130.74+175"}
+  "ppx_compare"   {= "v0.18~preview.130.74+175"}
+  "ppx_here"      {= "v0.18~preview.130.74+175"}
+  "ppx_sexp_conv" {= "v0.18~preview.130.74+175"}
+  "ppx_template"  {= "v0.18~preview.130.74+175"}
   "dune"          {>= "3.17.0"}
   "ppxlib"        {= "0.33.0+ox"}
 ]
@@ -28,7 +28,7 @@ Part of the Jane Street's PPX rewriters collection.
 """
 url {
   src:
-    "https://github.com/janestreet/ppx_assert/archive/74551c3aeea77c12078c068f28f32e72f2c1b2f5.tar.gz"
+    "https://github.com/janestreet/ppx_assert/archive/17ca41d7ea78f49464c376777a0c85427e4c4332.tar.gz"
   checksum:
-    "sha256=d74ade59641e3a3a6e8fe5d555b727886e6700894a4ae929861d86452ead8aca"
+    "sha256=81bd3ecc48b7acc020f337f4836ba82560cc15cc7aa4e933c179c3e455642e37"
 }
diff --git a/packages/ppx_base/ppx_base.v0.18~preview.130.55+197/opam b/packages/ppx_base/ppx_base.v0.18~preview.130.74+175/opam
similarity index 71%
rename from packages/ppx_base/ppx_base.v0.18~preview.130.55+197/opam
rename to packages/ppx_base/ppx_base.v0.18~preview.130.74+175/opam
index c9cf0561f3..f2cb4d2ae9 100644
--- a/packages/ppx_base/ppx_base.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_base/ppx_base.v0.18~preview.130.74+175/opam
@@ -11,14 +11,14 @@ build: [
 ]
 depends: [
   "ocaml"         {>= "5.1.0"}
-  "ppx_cold"      {= "v0.18~preview.130.55+197"}
-  "ppx_compare"   {= "v0.18~preview.130.55+197"}
-  "ppx_enumerate" {= "v0.18~preview.130.55+197"}
-  "ppx_globalize" {= "v0.18~preview.130.55+197"}
-  "ppx_hash"      {= "v0.18~preview.130.55+197"}
-  "ppx_sexp_conv" {= "v0.18~preview.130.55+197"}
-  "ppx_shorthand" {= "v0.18~preview.130.55+197"}
-  "ppx_template"  {= "v0.18~preview.130.55+197"}
+  "ppx_cold"      {= "v0.18~preview.130.74+175"}
+  "ppx_compare"   {= "v0.18~preview.130.74+175"}
+  "ppx_enumerate" {= "v0.18~preview.130.74+175"}
+  "ppx_globalize" {= "v0.18~preview.130.74+175"}
+  "ppx_hash"      {= "v0.18~preview.130.74+175"}
+  "ppx_sexp_conv" {= "v0.18~preview.130.74+175"}
+  "ppx_shorthand" {= "v0.18~preview.130.74+175"}
+  "ppx_template"  {= "v0.18~preview.130.74+175"}
   "dune"          {>= "3.17.0"}
   "ppxlib"        {= "0.33.0+ox"}
 ]
diff --git a/packages/ppx_bench/ppx_bench.v0.18~preview.130.55+197/opam b/packages/ppx_bench/ppx_bench.v0.18~preview.130.74+175/opam
similarity index 72%
rename from packages/ppx_bench/ppx_bench.v0.18~preview.130.55+197/opam
rename to packages/ppx_bench/ppx_bench.v0.18~preview.130.74+175/opam
index f25b38e605..5a9b335ff2 100644
--- a/packages/ppx_bench/ppx_bench.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_bench/ppx_bench.v0.18~preview.130.74+175/opam
@@ -12,8 +12,8 @@ build: [
 ]
 depends: [
   "ocaml"           {>= "5.1.0"}
-  "ppx_inline_test" {= "v0.18~preview.130.55+197"}
-  "ppxlib_jane"     {= "v0.18~preview.130.55+197"}
+  "ppx_inline_test" {= "v0.18~preview.130.74+175"}
+  "ppxlib_jane"     {= "v0.18~preview.130.74+175"}
   "dune"            {>= "3.17.0"}
   "ppxlib"          {= "0.33.0+ox"}
 ]
@@ -24,7 +24,7 @@ Part of the Jane Street's PPX rewriters collection.
 """
 url {
   src:
-    "https://github.com/janestreet/ppx_bench/archive/d6e83d847bcaf274536147b94efd17d505e75d25.tar.gz"
+    "https://github.com/janestreet/ppx_bench/archive/6f46dc381cd1eb8b8c7dd50a29848d1bd89f58e4.tar.gz"
   checksum:
-    "sha256=ef3a92a05ca51200c07dc3edc2e80c9b3a6b5b27521a20fbef7bf256d7d1b859"
+    "sha256=121f680c52b4d65813c8234c1b93f18d0394b6f07b832ac95f541c51500f42e6"
 }
diff --git a/packages/ppx_bin_prot/ppx_bin_prot.v0.18~preview.130.55+197/opam b/packages/ppx_bin_prot/ppx_bin_prot.v0.18~preview.130.74+175/opam
similarity index 66%
rename from packages/ppx_bin_prot/ppx_bin_prot.v0.18~preview.130.55+197/opam
rename to packages/ppx_bin_prot/ppx_bin_prot.v0.18~preview.130.74+175/opam
index 5080f0ef88..3bc27afd3e 100644
--- a/packages/ppx_bin_prot/ppx_bin_prot.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_bin_prot/ppx_bin_prot.v0.18~preview.130.74+175/opam
@@ -12,10 +12,10 @@ build: [
 ]
 depends: [
   "ocaml"               {>= "5.1.0"}
-  "base"                {= "v0.18~preview.130.55+197"}
-  "bin_prot"            {= "v0.18~preview.130.55+197"}
-  "ppx_here"            {= "v0.18~preview.130.55+197"}
-  "ppxlib_jane"         {= "v0.18~preview.130.55+197"}
+  "base"                {= "v0.18~preview.130.74+175"}
+  "bin_prot"            {= "v0.18~preview.130.74+175"}
+  "ppx_here"            {= "v0.18~preview.130.74+175"}
+  "ppxlib_jane"         {= "v0.18~preview.130.74+175"}
   "dune"                {>= "3.17.0"}
   "ocaml-compiler-libs" {= "v0.17.0+ox"}
   "ppxlib"              {= "0.33.0+ox"}
@@ -27,7 +27,7 @@ Part of the Jane Street's PPX rewriters collection.
 """
 url {
   src:
-    "https://github.com/janestreet/ppx_bin_prot/archive/171503d455621fb0c9384f7cba269b1b017523af.tar.gz"
+    "https://github.com/janestreet/ppx_bin_prot/archive/495423a2435b77aed5492e3e1f87cb0a5ad1e0f7.tar.gz"
   checksum:
-    "sha256=a427274d4e036c06fa5f7dfaed7f4316fbdf0543a58eb50c74262826212f5696"
+    "sha256=cd96e4466c04bf1b3680408afe745f94d62bcfbfa9444e94293981b50fd87a56"
 }
diff --git a/packages/ppx_box/ppx_box.v0.18~preview.130.55+197/opam b/packages/ppx_box/ppx_box.v0.18~preview.130.74+175/opam
similarity index 87%
rename from packages/ppx_box/ppx_box.v0.18~preview.130.55+197/opam
rename to packages/ppx_box/ppx_box.v0.18~preview.130.74+175/opam
index 4959cda480..646678a83a 100644
--- a/packages/ppx_box/ppx_box.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_box/ppx_box.v0.18~preview.130.74+175/opam
@@ -11,9 +11,9 @@ build: [
 ]
 depends: [
   "ocaml"        {>= "5.1.0"}
-  "ppx_helpers"  {= "v0.18~preview.130.55+197"}
-  "ppx_template" {= "v0.18~preview.130.55+197"}
-  "ppxlib_jane"  {= "v0.18~preview.130.55+197"}
+  "ppx_helpers"  {= "v0.18~preview.130.74+175"}
+  "ppx_template" {= "v0.18~preview.130.74+175"}
+  "ppxlib_jane"  {= "v0.18~preview.130.74+175"}
   "dune"         {>= "3.17.0"}
   "ppxlib"       {= "0.33.0+ox"}
 ]
diff --git a/packages/ppx_cold/ppx_cold.v0.18~preview.130.55+197/opam b/packages/ppx_cold/ppx_cold.v0.18~preview.130.74+175/opam
similarity index 100%
rename from packages/ppx_cold/ppx_cold.v0.18~preview.130.55+197/opam
rename to packages/ppx_cold/ppx_cold.v0.18~preview.130.74+175/opam
diff --git a/packages/ppx_compare/ppx_compare.v0.18~preview.130.55+197/opam b/packages/ppx_compare/ppx_compare.v0.18~preview.130.74+175/opam
similarity index 66%
rename from packages/ppx_compare/ppx_compare.v0.18~preview.130.55+197/opam
rename to packages/ppx_compare/ppx_compare.v0.18~preview.130.74+175/opam
index 2c4e0fbecd..a1eee41b3b 100644
--- a/packages/ppx_compare/ppx_compare.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_compare/ppx_compare.v0.18~preview.130.74+175/opam
@@ -12,10 +12,10 @@ build: [
 ]
 depends: [
   "ocaml"         {>= "5.1.0"}
-  "ppx_helpers"   {= "v0.18~preview.130.55+197"}
-  "ppx_shorthand" {= "v0.18~preview.130.55+197"}
-  "ppx_template"  {= "v0.18~preview.130.55+197"}
-  "ppxlib_jane"   {= "v0.18~preview.130.55+197"}
+  "ppx_helpers"   {= "v0.18~preview.130.74+175"}
+  "ppx_shorthand" {= "v0.18~preview.130.74+175"}
+  "ppx_template"  {= "v0.18~preview.130.74+175"}
+  "ppxlib_jane"   {= "v0.18~preview.130.74+175"}
   "dune"          {>= "3.17.0"}
   "ppxlib"        {= "0.33.0+ox"}
 ]
@@ -26,7 +26,7 @@ Part of the Jane Street's PPX rewriters collection.
 """
 url {
   src:
-    "https://github.com/janestreet/ppx_compare/archive/e9db622b91b8ef84edbf7974eb94e4f117a9b405.tar.gz"
+    "https://github.com/janestreet/ppx_compare/archive/965543143fc30cbe28763ee199e4d23f1dad8f76.tar.gz"
   checksum:
-    "sha256=106de00263d6bfb8b01080e7a59430b7ccf17eed0579e040ce5aac68216a5669"
+    "sha256=77a43e9339163f95e23e8e945a38f3aa18d907a8e5cc2c3c8bdff3e39d99c5b4"
 }
diff --git a/packages/ppx_conv_func/ppx_conv_func.v0.18~preview.130.55+197/opam b/packages/ppx_conv_func/ppx_conv_func.v0.18~preview.130.74+175/opam
similarity index 90%
rename from packages/ppx_conv_func/ppx_conv_func.v0.18~preview.130.55+197/opam
rename to packages/ppx_conv_func/ppx_conv_func.v0.18~preview.130.74+175/opam
index d34efbac9f..5bb3f7e671 100644
--- a/packages/ppx_conv_func/ppx_conv_func.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_conv_func/ppx_conv_func.v0.18~preview.130.74+175/opam
@@ -12,8 +12,8 @@ build: [
 ]
 depends: [
   "ocaml"       {>= "5.1.0"}
-  "base"        {= "v0.18~preview.130.55+197"}
-  "ppxlib_jane" {= "v0.18~preview.130.55+197"}
+  "base"        {= "v0.18~preview.130.74+175"}
+  "ppxlib_jane" {= "v0.18~preview.130.74+175"}
   "dune"        {>= "3.17.0"}
   "ppxlib"      {= "0.33.0+ox"}
 ]
diff --git a/packages/ppx_css/ppx_css.v0.18~preview.130.55+197/opam b/packages/ppx_css/ppx_css.v0.18~preview.130.74+175/opam
similarity index 50%
rename from packages/ppx_css/ppx_css.v0.18~preview.130.55+197/opam
rename to packages/ppx_css/ppx_css.v0.18~preview.130.74+175/opam
index 94d5e82393..cf74ec6f98 100644
--- a/packages/ppx_css/ppx_css.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_css/ppx_css.v0.18~preview.130.74+175/opam
@@ -11,27 +11,27 @@ build: [
 ]
 depends: [
   "ocaml"               {>= "5.1.0"}
-  "am_running_how_js"   {= "v0.18~preview.130.55+197"}
-  "core"                {= "v0.18~preview.130.55+197"}
-  "core_kernel"         {= "v0.18~preview.130.55+197"}
-  "core_unix"           {= "v0.18~preview.130.55+197"}
-  "file_path"           {= "v0.18~preview.130.55+197"}
-  "filesystem"          {= "v0.18~preview.130.55+197"}
-  "ppx_here"            {= "v0.18~preview.130.55+197"}
-  "ppx_jane"            {= "v0.18~preview.130.55+197"}
-  "ppx_let"             {= "v0.18~preview.130.55+197"}
-  "ppx_module_timer"    {= "v0.18~preview.130.55+197"}
-  "ppx_sexp_conv"       {= "v0.18~preview.130.55+197"}
-  "ppx_string"          {= "v0.18~preview.130.55+197"}
-  "ppxlib_jane"         {= "v0.18~preview.130.55+197"}
-  "virtual_dom"         {= "v0.18~preview.130.55+197"}
+  "am_running_how_js"   {= "v0.18~preview.130.74+175"}
+  "core"                {= "v0.18~preview.130.74+175"}
+  "core_kernel"         {= "v0.18~preview.130.74+175"}
+  "core_unix"           {= "v0.18~preview.130.74+175"}
+  "file_path"           {= "v0.18~preview.130.74+175"}
+  "filesystem"          {= "v0.18~preview.130.74+175"}
+  "ppx_here"            {= "v0.18~preview.130.74+175"}
+  "ppx_jane"            {= "v0.18~preview.130.74+175"}
+  "ppx_let"             {= "v0.18~preview.130.74+175"}
+  "ppx_module_timer"    {= "v0.18~preview.130.74+175"}
+  "ppx_sexp_conv"       {= "v0.18~preview.130.74+175"}
+  "ppx_string"          {= "v0.18~preview.130.74+175"}
+  "ppxlib_jane"         {= "v0.18~preview.130.74+175"}
+  "virtual_dom"         {= "v0.18~preview.130.74+175"}
   "dune"                {>= "3.17.0"}
   "js_of_ocaml"         {= "6.0.1+ox"}
   "js_of_ocaml-ppx"     {= "6.0.1+ox"}
   "ocaml-compiler-libs" {= "v0.17.0+ox"}
   "ocamlgraph"          {= "2.0.0"}
   "ppxlib"              {= "0.33.0+ox"}
-  "sedlex"              {= "3.3+ox"}
+  "sedlex"              {= "3.6+ox"}
 ]
 available: arch != "arm32" & arch != "x86_32"
 synopsis:
@@ -41,7 +41,7 @@ A ppx that takes in css strings and produces a module for accessing the unique n
 """
 url {
   src:
-    "https://github.com/janestreet/ppx_css/archive/b74abcba0486d782f73e6d27b7b581f867217cf2.tar.gz"
+    "https://github.com/janestreet/ppx_css/archive/098639ce53758595f240b9439cb80713e94a1f27.tar.gz"
   checksum:
-    "sha256=5a79ab68d0771acca7f1dcfe73ccab5f0afe56d955ffbe4adecc78ed8baa5290"
+    "sha256=ca08cd9de824d39a289ccaaec1d0fd3df0cf46c55c861a63ec6d0b2cf5820afa"
 }
diff --git a/packages/ppx_csv_conv/ppx_csv_conv.v0.18~preview.130.55+197/opam b/packages/ppx_csv_conv/ppx_csv_conv.v0.18~preview.130.74+175/opam
similarity index 82%
rename from packages/ppx_csv_conv/ppx_csv_conv.v0.18~preview.130.55+197/opam
rename to packages/ppx_csv_conv/ppx_csv_conv.v0.18~preview.130.74+175/opam
index a30fa00dd6..58458f1e33 100644
--- a/packages/ppx_csv_conv/ppx_csv_conv.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_csv_conv/ppx_csv_conv.v0.18~preview.130.74+175/opam
@@ -12,10 +12,10 @@ build: [
 ]
 depends: [
   "ocaml"           {>= "5.1.0"}
-  "base"            {= "v0.18~preview.130.55+197"}
-  "csvfields"       {= "v0.18~preview.130.55+197"}
-  "ppx_conv_func"   {= "v0.18~preview.130.55+197"}
-  "ppx_fields_conv" {= "v0.18~preview.130.55+197"}
+  "base"            {= "v0.18~preview.130.74+175"}
+  "csvfields"       {= "v0.18~preview.130.74+175"}
+  "ppx_conv_func"   {= "v0.18~preview.130.74+175"}
+  "ppx_fields_conv" {= "v0.18~preview.130.74+175"}
   "dune"            {>= "3.17.0"}
   "ppxlib"          {= "0.33.0+ox"}
 ]
diff --git a/packages/ppx_custom_printf/ppx_custom_printf.v0.18~preview.130.55+197/opam b/packages/ppx_custom_printf/ppx_custom_printf.v0.18~preview.130.74+175/opam
similarity index 73%
rename from packages/ppx_custom_printf/ppx_custom_printf.v0.18~preview.130.55+197/opam
rename to packages/ppx_custom_printf/ppx_custom_printf.v0.18~preview.130.74+175/opam
index dcdccb7abc..f9668daf90 100644
--- a/packages/ppx_custom_printf/ppx_custom_printf.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_custom_printf/ppx_custom_printf.v0.18~preview.130.74+175/opam
@@ -12,8 +12,8 @@ build: [
 ]
 depends: [
   "ocaml"         {>= "5.1.0"}
-  "base"          {= "v0.18~preview.130.55+197"}
-  "ppx_sexp_conv" {= "v0.18~preview.130.55+197"}
+  "base"          {= "v0.18~preview.130.74+175"}
+  "ppx_sexp_conv" {= "v0.18~preview.130.74+175"}
   "dune"          {>= "3.17.0"}
   "ppxlib"        {= "0.33.0+ox"}
 ]
@@ -24,7 +24,7 @@ Part of the Jane Street's PPX rewriters collection.
 """
 url {
   src:
-    "https://github.com/janestreet/ppx_custom_printf/archive/bcd742ae35f6999dabb5b56aaba9269a107cd96f.tar.gz"
+    "https://github.com/janestreet/ppx_custom_printf/archive/adf294b6bb325f524de27fffb18667d00ef144ef.tar.gz"
   checksum:
-    "sha256=45fdd79931fb49620bb882a5c60f78b147d2601f2e44759e28ef061516409d11"
+    "sha256=1bcc111554219bacdc4661cc6a82a5894ad458fe7b8b1477937691dce65becb7"
 }
diff --git a/packages/ppx_debug_assert/ppx_debug_assert.v0.18~preview.130.55+197/opam b/packages/ppx_debug_assert/ppx_debug_assert.v0.18~preview.130.74+175/opam
similarity index 100%
rename from packages/ppx_debug_assert/ppx_debug_assert.v0.18~preview.130.55+197/opam
rename to packages/ppx_debug_assert/ppx_debug_assert.v0.18~preview.130.74+175/opam
diff --git a/packages/ppx_demo/ppx_demo.v0.18~preview.130.55+197/opam b/packages/ppx_demo/ppx_demo.v0.18~preview.130.74+175/opam
similarity index 52%
rename from packages/ppx_demo/ppx_demo.v0.18~preview.130.55+197/opam
rename to packages/ppx_demo/ppx_demo.v0.18~preview.130.74+175/opam
index 72cb91b9ed..d0196abe87 100644
--- a/packages/ppx_demo/ppx_demo.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_demo/ppx_demo.v0.18~preview.130.74+175/opam
@@ -11,15 +11,14 @@ build: [
 ]
 depends: [
   "ocaml"                    {>= "5.1.0"}
-  "core"                     {= "v0.18~preview.130.55+197"}
-  "core_kernel"              {= "v0.18~preview.130.55+197"}
-  "dedent"                   {= "v0.18~preview.130.55+197"}
-  "expect_test_helpers_core" {= "v0.18~preview.130.55+197"}
-  "ppx_here"                 {= "v0.18~preview.130.55+197"}
-  "ppx_jane"                 {= "v0.18~preview.130.55+197"}
-  "ppx_module_timer"         {= "v0.18~preview.130.55+197"}
-  "ppxlib_jane"              {= "v0.18~preview.130.55+197"}
-  "re2"                      {= "v0.18~preview.130.55+197"}
+  "core"                     {= "v0.18~preview.130.74+175"}
+  "dedent"                   {= "v0.18~preview.130.74+175"}
+  "expect_test_helpers_core" {= "v0.18~preview.130.74+175"}
+  "ppx_here"                 {= "v0.18~preview.130.74+175"}
+  "ppx_jane"                 {= "v0.18~preview.130.74+175"}
+  "ppx_module_timer"         {= "v0.18~preview.130.74+175"}
+  "ppxlib_jane"              {= "v0.18~preview.130.74+175"}
+  "re2"                      {= "v0.18~preview.130.74+175"}
   "dune"                     {>= "3.17.0"}
   "ppxlib"                   {= "0.33.0+ox"}
 ]
@@ -31,7 +30,7 @@ PPX that exposes the source code string of an expression/module structure.
 """
 url {
   src:
-    "https://github.com/janestreet/ppx_demo/archive/7a94f8cf47743dde73f378199b99122ca17c86bb.tar.gz"
+    "https://github.com/janestreet/ppx_demo/archive/a620817e91df203b9e240cd0a40e7e1344c9449f.tar.gz"
   checksum:
-    "sha256=006da03dda861fab0e75fbe1ad8ef80f1e14e4bf849389d5a9e1b31d44016e59"
+    "sha256=c233010f0dca84bbb44bf002a31b90300165d9c81048d079837f7357329a6ae1"
 }
diff --git a/packages/ppx_derive_at_runtime/ppx_derive_at_runtime.v0.18~preview.130.55+197/opam b/packages/ppx_derive_at_runtime/ppx_derive_at_runtime.v0.18~preview.130.74+175/opam
similarity index 68%
rename from packages/ppx_derive_at_runtime/ppx_derive_at_runtime.v0.18~preview.130.55+197/opam
rename to packages/ppx_derive_at_runtime/ppx_derive_at_runtime.v0.18~preview.130.74+175/opam
index f290afad05..9e1a862e7b 100644
--- a/packages/ppx_derive_at_runtime/ppx_derive_at_runtime.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_derive_at_runtime/ppx_derive_at_runtime.v0.18~preview.130.74+175/opam
@@ -12,11 +12,12 @@ build: [
 ]
 depends: [
   "ocaml"                    {>= "5.1.0"}
-  "base"                     {= "v0.18~preview.130.55+197"}
-  "expect_test_helpers_core" {= "v0.18~preview.130.55+197"}
-  "ppx_helpers"              {= "v0.18~preview.130.55+197"}
-  "ppx_jane"                 {= "v0.18~preview.130.55+197"}
-  "ppxlib_jane"              {= "v0.18~preview.130.55+197"}
+  "base"                     {= "v0.18~preview.130.74+175"}
+  "expect_test_helpers_core" {= "v0.18~preview.130.74+175"}
+  "ppx_helpers"              {= "v0.18~preview.130.74+175"}
+  "ppx_jane"                 {= "v0.18~preview.130.74+175"}
+  "ppx_template"             {= "v0.18~preview.130.74+175"}
+  "ppxlib_jane"              {= "v0.18~preview.130.74+175"}
   "dune"                     {>= "3.17.0"}
   "ocaml-compiler-libs"      {= "v0.17.0+ox"}
   "ppxlib"                   {= "0.33.0+ox"}
@@ -31,7 +32,7 @@ specify a module path such as `My_library.Foo`.
 """
 url {
   src:
-    "https://github.com/janestreet/ppx_derive_at_runtime/archive/909456f2be9cd75ddc2e3ae91ca8cbca7bf9b93c.tar.gz"
+    "https://github.com/janestreet/ppx_derive_at_runtime/archive/c7e123f92d16d6f5b7fd28006b7fba0417c8f5f0.tar.gz"
   checksum:
-    "sha256=e361554cffe2cb8ad04b22623213d704dc42d2de2c3ad9e3ae8a3d09e95dc38a"
+    "sha256=ebb3686965ab10d4802cbf747fc37beca0ddfa1b38f8884f7827e009bcfc751b"
 }
diff --git a/packages/ppx_diff/ppx_diff.v0.18~preview.130.55+197/opam b/packages/ppx_diff/ppx_diff.v0.18~preview.130.74+175/opam
similarity index 62%
rename from packages/ppx_diff/ppx_diff.v0.18~preview.130.55+197/opam
rename to packages/ppx_diff/ppx_diff.v0.18~preview.130.74+175/opam
index e17f404485..82a4f6e9ae 100644
--- a/packages/ppx_diff/ppx_diff.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_diff/ppx_diff.v0.18~preview.130.74+175/opam
@@ -11,12 +11,12 @@ build: [
 ]
 depends: [
   "ocaml"              {>= "5.1.0"}
-  "base"               {= "v0.18~preview.130.55+197"}
-  "ppx_compare"        {= "v0.18~preview.130.55+197"}
-  "ppx_enumerate"      {= "v0.18~preview.130.55+197"}
-  "ppx_jane"           {= "v0.18~preview.130.55+197"}
-  "ppx_stable_witness" {= "v0.18~preview.130.55+197"}
-  "ppxlib_jane"        {= "v0.18~preview.130.55+197"}
+  "base"               {= "v0.18~preview.130.74+175"}
+  "ppx_compare"        {= "v0.18~preview.130.74+175"}
+  "ppx_enumerate"      {= "v0.18~preview.130.74+175"}
+  "ppx_jane"           {= "v0.18~preview.130.74+175"}
+  "ppx_stable_witness" {= "v0.18~preview.130.74+175"}
+  "ppxlib_jane"        {= "v0.18~preview.130.74+175"}
   "dune"               {>= "3.17.0"}
   "ppxlib"             {= "0.33.0+ox"}
 ]
@@ -28,7 +28,7 @@ A PPX rewriter that generates the implementation of [Ldiffable.S]. Generates dif
 """
 url {
   src:
-    "https://github.com/janestreet/ppx_diff/archive/b0e4b0ba8cab6fdfacc327f9b73619f51d47267c.tar.gz"
+    "https://github.com/janestreet/ppx_diff/archive/8f88b1244aa245e48dec005f648816fda7350c71.tar.gz"
   checksum:
-    "sha256=23fdeb4ca373c08b1464b03519fec46c25216ea6dd44f51a8fd70a6261883a6d"
+    "sha256=f159bf7c9282e45b6cae1ba26b4a52b964da2f0066714ba2098ac6a22fb855d9"
 }
diff --git a/packages/ppx_disable_unused_warnings/ppx_disable_unused_warnings.v0.18~preview.130.55+197/opam b/packages/ppx_disable_unused_warnings/ppx_disable_unused_warnings.v0.18~preview.130.74+175/opam
similarity index 100%
rename from packages/ppx_disable_unused_warnings/ppx_disable_unused_warnings.v0.18~preview.130.55+197/opam
rename to packages/ppx_disable_unused_warnings/ppx_disable_unused_warnings.v0.18~preview.130.74+175/opam
diff --git a/packages/ppx_embed_file/ppx_embed_file.v0.18~preview.130.55+197/opam b/packages/ppx_embed_file/ppx_embed_file.v0.18~preview.130.74+175/opam
similarity index 91%
rename from packages/ppx_embed_file/ppx_embed_file.v0.18~preview.130.55+197/opam
rename to packages/ppx_embed_file/ppx_embed_file.v0.18~preview.130.74+175/opam
index 05344da111..e8ad74dafd 100644
--- a/packages/ppx_embed_file/ppx_embed_file.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_embed_file/ppx_embed_file.v0.18~preview.130.74+175/opam
@@ -12,8 +12,8 @@ build: [
 ]
 depends: [
   "ocaml"    {>= "5.1.0"}
-  "core"     {= "v0.18~preview.130.55+197"}
-  "ppx_jane" {= "v0.18~preview.130.55+197"}
+  "core"     {= "v0.18~preview.130.74+175"}
+  "ppx_jane" {= "v0.18~preview.130.74+175"}
   "dune"     {>= "3.17.0"}
   "ppxlib"   {= "0.33.0+ox"}
 ]
diff --git a/packages/ppx_enumerate/ppx_enumerate.v0.18~preview.130.55+197/opam b/packages/ppx_enumerate/ppx_enumerate.v0.18~preview.130.74+175/opam
similarity index 76%
rename from packages/ppx_enumerate/ppx_enumerate.v0.18~preview.130.55+197/opam
rename to packages/ppx_enumerate/ppx_enumerate.v0.18~preview.130.74+175/opam
index 50e1b21ea1..0248293eb4 100644
--- a/packages/ppx_enumerate/ppx_enumerate.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_enumerate/ppx_enumerate.v0.18~preview.130.74+175/opam
@@ -12,7 +12,7 @@ build: [
 ]
 depends: [
   "ocaml"       {>= "5.1.0"}
-  "ppxlib_jane" {= "v0.18~preview.130.55+197"}
+  "ppxlib_jane" {= "v0.18~preview.130.74+175"}
   "dune"        {>= "3.17.0"}
   "ppxlib"      {= "0.33.0+ox"}
 ]
@@ -23,7 +23,7 @@ Part of the Jane Street's PPX rewriters collection.
 """
 url {
   src:
-    "https://github.com/janestreet/ppx_enumerate/archive/290553cfb8d276820ed928c7d00e01acea2c29a1.tar.gz"
+    "https://github.com/janestreet/ppx_enumerate/archive/bc35bc451bfec88b8f92ce5a11c10bd4c64d4e94.tar.gz"
   checksum:
-    "sha256=af1eb3b295f669efb5cccc703d4226665bca3bff5f036c730ee4fc21df963417"
+    "sha256=b3588bff670fb3e45734cb9be313301757047a4452e1e51c299ca296775636f1"
 }
diff --git a/packages/ppx_expect/ppx_expect.v0.18~preview.130.55+197/opam b/packages/ppx_expect/ppx_expect.v0.18~preview.130.74+175/opam
similarity index 57%
rename from packages/ppx_expect/ppx_expect.v0.18~preview.130.55+197/opam
rename to packages/ppx_expect/ppx_expect.v0.18~preview.130.74+175/opam
index 074c8d35c6..3c6c382b7d 100644
--- a/packages/ppx_expect/ppx_expect.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_expect/ppx_expect.v0.18~preview.130.74+175/opam
@@ -12,13 +12,13 @@ build: [
 ]
 depends: [
   "ocaml"           {>= "5.1.0"}
-  "base"            {= "v0.18~preview.130.55+197"}
-  "basement"        {= "v0.18~preview.130.55+197"}
-  "portable"        {= "v0.18~preview.130.55+197"}
-  "ppx_fuelproof"   {= "v0.18~preview.130.55+197"}
-  "ppx_here"        {= "v0.18~preview.130.55+197"}
-  "ppx_inline_test" {= "v0.18~preview.130.55+197"}
-  "stdio"           {= "v0.18~preview.130.55+197"}
+  "base"            {= "v0.18~preview.130.74+175"}
+  "basement"        {= "v0.18~preview.130.74+175"}
+  "portable"        {= "v0.18~preview.130.74+175"}
+  "ppx_fuelproof"   {= "v0.18~preview.130.74+175"}
+  "ppx_here"        {= "v0.18~preview.130.74+175"}
+  "ppx_inline_test" {= "v0.18~preview.130.74+175"}
+  "stdio"           {= "v0.18~preview.130.74+175"}
   "dune"            {>= "3.17.0"}
   "ppxlib"          {= "0.33.0+ox"}
 ]
@@ -29,7 +29,7 @@ Part of the Jane Street's PPX rewriters collection.
 """
 url {
   src:
-    "https://github.com/janestreet/ppx_expect/archive/79f199d82e0c0aad95a5929ab7edd8810a7e2aaf.tar.gz"
+    "https://github.com/janestreet/ppx_expect/archive/fe60d6e4c03d92ed56722a8b48f2d92cbf9d481d.tar.gz"
   checksum:
-    "sha256=909827c7efe7af21f65b71a362b0470cdc2db853ccc0119eac1315baa4936f8c"
+    "sha256=a91fbecb57ce2b92dfa0babdbcda132ca72d9eb3d7a6f9ee741f195f63aa8fc4"
 }
diff --git a/packages/ppx_fields_conv/ppx_fields_conv.v0.18~preview.130.55+197/opam b/packages/ppx_fields_conv/ppx_fields_conv.v0.18~preview.130.74+175/opam
similarity index 67%
rename from packages/ppx_fields_conv/ppx_fields_conv.v0.18~preview.130.55+197/opam
rename to packages/ppx_fields_conv/ppx_fields_conv.v0.18~preview.130.74+175/opam
index 2cc8e6680f..1caeed558e 100644
--- a/packages/ppx_fields_conv/ppx_fields_conv.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_fields_conv/ppx_fields_conv.v0.18~preview.130.74+175/opam
@@ -12,10 +12,10 @@ build: [
 ]
 depends: [
   "ocaml"       {>= "5.1.0"}
-  "base"        {= "v0.18~preview.130.55+197"}
-  "fieldslib"   {= "v0.18~preview.130.55+197"}
-  "ppx_helpers" {= "v0.18~preview.130.55+197"}
-  "ppxlib_jane" {= "v0.18~preview.130.55+197"}
+  "base"        {= "v0.18~preview.130.74+175"}
+  "fieldslib"   {= "v0.18~preview.130.74+175"}
+  "ppx_helpers" {= "v0.18~preview.130.74+175"}
+  "ppxlib_jane" {= "v0.18~preview.130.74+175"}
   "dune"        {>= "3.17.0"}
   "ppxlib"      {= "0.33.0+ox"}
 ]
@@ -26,7 +26,7 @@ Part of the Jane Street's PPX rewriters collection.
 """
 url {
   src:
-    "https://github.com/janestreet/ppx_fields_conv/archive/4878c9ae5aa61e4f7022cf00107ed7fcd3c989e9.tar.gz"
+    "https://github.com/janestreet/ppx_fields_conv/archive/7e1fe0c7d36acbc9d1bc5cf1c79af8eccbc1c388.tar.gz"
   checksum:
-    "sha256=44b45853dff7e3d0f211d393cc91cbc05c8916a40fb5ce3dec167431b892abd0"
+    "sha256=de43acec779433909a8698f5052445ae78e7320d478c85ae9e75322c9a56f809"
 }
diff --git a/packages/ppx_fixed_literal/ppx_fixed_literal.v0.18~preview.130.55+197/opam b/packages/ppx_fixed_literal/ppx_fixed_literal.v0.18~preview.130.74+175/opam
similarity index 95%
rename from packages/ppx_fixed_literal/ppx_fixed_literal.v0.18~preview.130.55+197/opam
rename to packages/ppx_fixed_literal/ppx_fixed_literal.v0.18~preview.130.74+175/opam
index dc64592735..23dc555cc2 100644
--- a/packages/ppx_fixed_literal/ppx_fixed_literal.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_fixed_literal/ppx_fixed_literal.v0.18~preview.130.74+175/opam
@@ -12,7 +12,7 @@ build: [
 ]
 depends: [
   "ocaml"  {>= "5.1.0"}
-  "base"   {= "v0.18~preview.130.55+197"}
+  "base"   {= "v0.18~preview.130.74+175"}
   "dune"   {>= "3.17.0"}
   "ppxlib" {= "0.33.0+ox"}
 ]
diff --git a/packages/ppx_for_loop/ppx_for_loop.v0.18~preview.130.55+197/opam b/packages/ppx_for_loop/ppx_for_loop.v0.18~preview.130.74+175/opam
similarity index 87%
rename from packages/ppx_for_loop/ppx_for_loop.v0.18~preview.130.55+197/opam
rename to packages/ppx_for_loop/ppx_for_loop.v0.18~preview.130.74+175/opam
index a86e969ed9..02f1c83b97 100644
--- a/packages/ppx_for_loop/ppx_for_loop.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_for_loop/ppx_for_loop.v0.18~preview.130.74+175/opam
@@ -12,9 +12,9 @@ build: [
 ]
 depends: [
   "ocaml"       {>= "5.1.0"}
-  "base"        {= "v0.18~preview.130.55+197"}
-  "ppxlib_jane" {= "v0.18~preview.130.55+197"}
-  "unboxed"     {= "v0.18~preview.130.55+197"}
+  "base"        {= "v0.18~preview.130.74+175"}
+  "ppxlib_jane" {= "v0.18~preview.130.74+175"}
+  "unboxed"     {= "v0.18~preview.130.74+175"}
   "dune"        {>= "3.17.0"}
   "ppxlib"      {= "0.33.0+ox"}
 ]
diff --git a/packages/ppx_fuelproof/ppx_fuelproof.v0.18~preview.130.55+197/opam b/packages/ppx_fuelproof/ppx_fuelproof.v0.18~preview.130.74+175/opam
similarity index 71%
rename from packages/ppx_fuelproof/ppx_fuelproof.v0.18~preview.130.55+197/opam
rename to packages/ppx_fuelproof/ppx_fuelproof.v0.18~preview.130.74+175/opam
index e094df151a..b3c24ca74e 100644
--- a/packages/ppx_fuelproof/ppx_fuelproof.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_fuelproof/ppx_fuelproof.v0.18~preview.130.74+175/opam
@@ -12,11 +12,11 @@ build: [
 ]
 depends: [
   "ocaml"         {>= "5.1.0"}
-  "base"          {= "v0.18~preview.130.55+197"}
-  "ppx_compare"   {= "v0.18~preview.130.55+197"}
-  "ppx_let"       {= "v0.18~preview.130.55+197"}
-  "ppx_sexp_conv" {= "v0.18~preview.130.55+197"}
-  "ppxlib_jane"   {= "v0.18~preview.130.55+197"}
+  "base"          {= "v0.18~preview.130.74+175"}
+  "ppx_compare"   {= "v0.18~preview.130.74+175"}
+  "ppx_let"       {= "v0.18~preview.130.74+175"}
+  "ppx_sexp_conv" {= "v0.18~preview.130.74+175"}
+  "ppxlib_jane"   {= "v0.18~preview.130.74+175"}
   "dune"          {>= "3.17.0"}
   "ppxlib"        {= "0.33.0+ox"}
 ]
@@ -33,7 +33,7 @@ type mode-cross in the way you want:
 """
 url {
   src:
-    "https://github.com/janestreet/ppx_fuelproof/archive/2f8f27509658813a0711e49a343066ba47f61ce9.tar.gz"
+    "https://github.com/janestreet/ppx_fuelproof/archive/35ecad67370ebbc8878240dfe6a55431cc354c13.tar.gz"
   checksum:
-    "sha256=407e412eb81575fbb64eb0903a9f53968c9aad37f2e3e3ec6a31dded5fe92702"
+    "sha256=4696c89d4e95ee34c903ca90dd4b5c47f340302775c2d57018c5675132f4e187"
 }
diff --git a/packages/ppx_globalize/ppx_globalize.v0.18~preview.130.55+197/opam b/packages/ppx_globalize/ppx_globalize.v0.18~preview.130.74+175/opam
similarity index 73%
rename from packages/ppx_globalize/ppx_globalize.v0.18~preview.130.55+197/opam
rename to packages/ppx_globalize/ppx_globalize.v0.18~preview.130.74+175/opam
index 94a14aa89e..d4a142a3a5 100644
--- a/packages/ppx_globalize/ppx_globalize.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_globalize/ppx_globalize.v0.18~preview.130.74+175/opam
@@ -12,8 +12,8 @@ build: [
 ]
 depends: [
   "ocaml"       {>= "5.1.0"}
-  "ppx_helpers" {= "v0.18~preview.130.55+197"}
-  "ppxlib_jane" {= "v0.18~preview.130.55+197"}
+  "ppx_helpers" {= "v0.18~preview.130.74+175"}
+  "ppxlib_jane" {= "v0.18~preview.130.74+175"}
   "dune"        {>= "3.17.0"}
   "ppxlib"      {= "0.33.0+ox"}
 ]
@@ -25,7 +25,7 @@ Part of the Jane Street's PPX rewriters collection.
 """
 url {
   src:
-    "https://github.com/janestreet/ppx_globalize/archive/7aa1eed751b68385bb3b2ce680667563e9bfd54f.tar.gz"
+    "https://github.com/janestreet/ppx_globalize/archive/fcae3a0e0e8031d8ebd6bc4d93622d38b553c207.tar.gz"
   checksum:
-    "sha256=48f81070f92c764c46eab8736a86bf28547e76ee3eb31ff1de8fb675512c8577"
+    "sha256=fa6d280206cebcd0c76428a8befa03776731c46d1d523e98e6ace3e72d1a1789"
 }
diff --git a/packages/ppx_hardcaml/ppx_hardcaml.v0.18~preview.130.55+197/opam b/packages/ppx_hardcaml/ppx_hardcaml.v0.18~preview.130.74+175/opam
similarity index 76%
rename from packages/ppx_hardcaml/ppx_hardcaml.v0.18~preview.130.55+197/opam
rename to packages/ppx_hardcaml/ppx_hardcaml.v0.18~preview.130.74+175/opam
index cbe46802f4..36fe1a2703 100644
--- a/packages/ppx_hardcaml/ppx_hardcaml.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_hardcaml/ppx_hardcaml.v0.18~preview.130.74+175/opam
@@ -12,9 +12,9 @@ build: [
 ]
 depends: [
   "ocaml"    {>= "5.1.0"}
-  "base"     {= "v0.18~preview.130.55+197"}
-  "hardcaml" {= "v0.18~preview.130.55+197"}
-  "ppx_jane" {= "v0.18~preview.130.55+197"}
+  "base"     {= "v0.18~preview.130.74+175"}
+  "hardcaml" {= "v0.18~preview.130.74+175"}
+  "ppx_jane" {= "v0.18~preview.130.74+175"}
   "dune"     {>= "3.17.0"}
   "ppxlib"   {= "0.33.0+ox"}
 ]
@@ -29,7 +29,7 @@ hierarchical designs.
 """
 url {
   src:
-    "https://github.com/janestreet/ppx_hardcaml/archive/dca24b319ba17c23d3666f7e7c136f7855fbf6b4.tar.gz"
+    "https://github.com/janestreet/ppx_hardcaml/archive/c8af3c30a2b0c6571ccb4a341822691d6d209961.tar.gz"
   checksum:
-    "sha256=e405ac926990862490d4a259b6534abc7addbe410b0bf669b49df4f70a9fbd9b"
+    "sha256=fe6aace3b0aa7cd9d1f4adc5dba1e3dff7d0f4beabb280fa7fdb164ba03dba8b"
 }
diff --git a/packages/ppx_hash/ppx_hash.v0.18~preview.130.55+197/opam b/packages/ppx_hash/ppx_hash.v0.18~preview.130.74+175/opam
similarity index 67%
rename from packages/ppx_hash/ppx_hash.v0.18~preview.130.55+197/opam
rename to packages/ppx_hash/ppx_hash.v0.18~preview.130.74+175/opam
index be8bf163bb..71b254124d 100644
--- a/packages/ppx_hash/ppx_hash.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_hash/ppx_hash.v0.18~preview.130.74+175/opam
@@ -11,10 +11,10 @@ build: [
 ]
 depends: [
   "ocaml"               {>= "5.1.0"}
-  "ppx_compare"         {= "v0.18~preview.130.55+197"}
-  "ppx_helpers"         {= "v0.18~preview.130.55+197"}
-  "ppx_sexp_conv"       {= "v0.18~preview.130.55+197"}
-  "ppxlib_jane"         {= "v0.18~preview.130.55+197"}
+  "ppx_compare"         {= "v0.18~preview.130.74+175"}
+  "ppx_helpers"         {= "v0.18~preview.130.74+175"}
+  "ppx_sexp_conv"       {= "v0.18~preview.130.74+175"}
+  "ppxlib_jane"         {= "v0.18~preview.130.74+175"}
   "dune"                {>= "3.17.0"}
   "ocaml-compiler-libs" {= "v0.17.0+ox"}
   "ppxlib"              {= "0.33.0+ox"}
@@ -27,7 +27,7 @@ Part of the Jane Street's PPX rewriters collection.
 """
 url {
   src:
-    "https://github.com/janestreet/ppx_hash/archive/a96445f9170ec9c71725080752e5883906f25e00.tar.gz"
+    "https://github.com/janestreet/ppx_hash/archive/1b25d352715b07baf6c91dc98172755d69382e49.tar.gz"
   checksum:
-    "sha256=0335a6603e9ca4567b1677d95b4e5869510fb8a23de63e43e3a7463d898353f4"
+    "sha256=268177d61e068b236b1bf227c10219446f32543730bdd9a030db13ab673d4e0f"
 }
diff --git a/packages/ppx_helpers/ppx_helpers.v0.18~preview.130.55+197/opam b/packages/ppx_helpers/ppx_helpers.v0.18~preview.130.74+175/opam
similarity index 75%
rename from packages/ppx_helpers/ppx_helpers.v0.18~preview.130.55+197/opam
rename to packages/ppx_helpers/ppx_helpers.v0.18~preview.130.74+175/opam
index 38c7a74400..14d901b479 100644
--- a/packages/ppx_helpers/ppx_helpers.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_helpers/ppx_helpers.v0.18~preview.130.74+175/opam
@@ -12,7 +12,7 @@ build: [
 ]
 depends: [
   "ocaml"       {>= "5.1.0"}
-  "ppxlib_jane" {= "v0.18~preview.130.55+197"}
+  "ppxlib_jane" {= "v0.18~preview.130.74+175"}
   "dune"        {>= "3.17.0"}
   "ppxlib"      {= "0.33.0+ox"}
 ]
@@ -23,7 +23,7 @@ Part of the Jane Street PPX rewriters collection.
 """
 url {
   src:
-    "https://github.com/janestreet/ppx_helpers/archive/0b47c7893f067baf36b9128607d844f646b6cd32.tar.gz"
+    "https://github.com/janestreet/ppx_helpers/archive/68fa6da2c4ec4aa3c3ed54fcd45637ed7870b8f9.tar.gz"
   checksum:
-    "sha256=6fdeff284d56a956dbcabe6c54f95295fcfabc72e74387c3cc2ad5f57aa05c03"
+    "sha256=a381f1193fad59424df1c4e72252780bfaa6f0eb4e1e14970235010242d9c60b"
 }
diff --git a/packages/ppx_here/ppx_here.v0.18~preview.130.55+197/opam b/packages/ppx_here/ppx_here.v0.18~preview.130.74+175/opam
similarity index 95%
rename from packages/ppx_here/ppx_here.v0.18~preview.130.55+197/opam
rename to packages/ppx_here/ppx_here.v0.18~preview.130.74+175/opam
index 2849831c67..d69bf179e1 100644
--- a/packages/ppx_here/ppx_here.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_here/ppx_here.v0.18~preview.130.74+175/opam
@@ -11,7 +11,7 @@ build: [
 ]
 depends: [
   "ocaml"  {>= "5.1.0"}
-  "base"   {= "v0.18~preview.130.55+197"}
+  "base"   {= "v0.18~preview.130.74+175"}
   "dune"   {>= "3.17.0"}
   "ppxlib" {= "0.33.0+ox"}
 ]
diff --git a/packages/ppx_html/ppx_html.v0.18~preview.130.55+197/opam b/packages/ppx_html/ppx_html.v0.18~preview.130.55+197/opam
deleted file mode 100644
index 66d25dce85..0000000000
--- a/packages/ppx_html/ppx_html.v0.18~preview.130.55+197/opam
+++ /dev/null
@@ -1,39 +0,0 @@
-opam-version: "2.0"
-maintainer: "Jane Street developers"
-authors: ["Jane Street Group, LLC"]
-homepage: "https://github.com/janestreet/ppx_html"
-bug-reports: "https://github.com/janestreet/ppx_html/issues"
-dev-repo: "git+https://github.com/janestreet/ppx_html.git"
-doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/ppx_html/index.html"
-license: "MIT"
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-]
-depends: [
-  "ocaml"                    {>= "5.1.0"}
-  "base"                     {= "v0.18~preview.130.55+197"}
-  "core"                     {= "v0.18~preview.130.55+197"}
-  "core_kernel"              {= "v0.18~preview.130.55+197"}
-  "expect_test_helpers_core" {= "v0.18~preview.130.55+197"}
-  "expectable"               {= "v0.18~preview.130.55+197"}
-  "patdiff"                  {= "v0.18~preview.130.55+197"}
-  "ppx_css"                  {= "v0.18~preview.130.55+197"}
-  "ppx_jane"                 {= "v0.18~preview.130.55+197"}
-  "virtual_dom"              {= "v0.18~preview.130.55+197"}
-  "angstrom"                 {>= "0.15.0"}
-  "dune"                     {>= "3.17.0"}
-  "ocaml-compiler-libs"      {= "v0.17.0+ox"}
-  "ppxlib"                   {= "0.33.0+ox"}
-]
-available: arch != "arm32" & arch != "x86_32"
-synopsis:
-  "PPX_HTML is a way of constructing Vdom.Node.t's using HTML syntax."
-description: """
-PPX_HTML is a way of constructing Vdom.Node.t's using HTML syntax.
-"""
-url {
-  src:
-    "https://github.com/janestreet/ppx_html/archive/1e78ea9cd732d6c0cb6914a56a11114352f3f7bc.tar.gz"
-  checksum:
-    "sha256=1b7a13f86c5b8f1be62c7a6238d12d6ba73c0eb52dc50c210c29af31cdfa6494"
-}
diff --git a/packages/ppx_html/ppx_html.v0.18~preview.130.74+175/opam b/packages/ppx_html/ppx_html.v0.18~preview.130.74+175/opam
new file mode 100644
index 0000000000..6abea36833
--- /dev/null
+++ b/packages/ppx_html/ppx_html.v0.18~preview.130.74+175/opam
@@ -0,0 +1,42 @@
+opam-version: "2.0"
+maintainer: "Jane Street developers"
+authors: ["Jane Street Group, LLC"]
+homepage: "https://github.com/janestreet/ppx_html"
+bug-reports: "https://github.com/janestreet/ppx_html/issues"
+dev-repo: "git+https://github.com/janestreet/ppx_html.git"
+doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/ppx_html/index.html"
+license: "MIT"
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+]
+depends: [
+  "ocaml"                    {>= "5.1.0"}
+  "base"                     {= "v0.18~preview.130.74+175"}
+  "bonsai"                   {= "v0.18~preview.130.74+175"}
+  "bonsai_web"               {= "v0.18~preview.130.74+175"}
+  "core"                     {= "v0.18~preview.130.74+175"}
+  "core_kernel"              {= "v0.18~preview.130.74+175"}
+  "expect_test_helpers_core" {= "v0.18~preview.130.74+175"}
+  "expectable"               {= "v0.18~preview.130.74+175"}
+  "patdiff"                  {= "v0.18~preview.130.74+175"}
+  "ppx_css"                  {= "v0.18~preview.130.74+175"}
+  "ppx_jane"                 {= "v0.18~preview.130.74+175"}
+  "virtual_dom"              {= "v0.18~preview.130.74+175"}
+  "angstrom"                 {>= "0.15.0"}
+  "dune"                     {>= "3.17.0"}
+  "js_of_ocaml-ppx"          {= "6.0.1+ox"}
+  "ocaml-compiler-libs"      {= "v0.17.0+ox"}
+  "ppxlib"                   {= "0.33.0+ox"}
+]
+available: arch != "arm32" & arch != "x86_32"
+synopsis:
+  "PPX_HTML is a way of constructing Vdom.Node.t's using HTML syntax."
+description: """
+PPX_HTML is a way of constructing Vdom.Node.t's using HTML syntax.
+"""
+url {
+  src:
+    "https://github.com/janestreet/ppx_html/archive/a25b5ab3fe419c49ca89fd35fe586a7912dfdffc.tar.gz"
+  checksum:
+    "sha256=2d9feda5efdc3916302f273aee4cc6829278589e0a403a6252aab2ee0c3b04d2"
+}
diff --git a/packages/ppx_ignore_instrumentation/ppx_ignore_instrumentation.v0.18~preview.130.55+197/opam b/packages/ppx_ignore_instrumentation/ppx_ignore_instrumentation.v0.18~preview.130.74+175/opam
similarity index 100%
rename from packages/ppx_ignore_instrumentation/ppx_ignore_instrumentation.v0.18~preview.130.55+197/opam
rename to packages/ppx_ignore_instrumentation/ppx_ignore_instrumentation.v0.18~preview.130.74+175/opam
diff --git a/packages/ppx_inline_test/ppx_inline_test.v0.18~preview.130.55+197/opam b/packages/ppx_inline_test/ppx_inline_test.v0.18~preview.130.74+175/opam
similarity index 64%
rename from packages/ppx_inline_test/ppx_inline_test.v0.18~preview.130.55+197/opam
rename to packages/ppx_inline_test/ppx_inline_test.v0.18~preview.130.74+175/opam
index 40668f7b39..e2a6cd57e9 100644
--- a/packages/ppx_inline_test/ppx_inline_test.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_inline_test/ppx_inline_test.v0.18~preview.130.74+175/opam
@@ -12,11 +12,11 @@ build: [
 ]
 depends: [
   "ocaml"       {>= "5.1.0"}
-  "base"        {= "v0.18~preview.130.55+197"}
-  "basement"    {= "v0.18~preview.130.55+197"}
-  "ppxlib_jane" {= "v0.18~preview.130.55+197"}
-  "sexplib0"    {= "v0.18~preview.130.55+197"}
-  "time_now"    {= "v0.18~preview.130.55+197"}
+  "base"        {= "v0.18~preview.130.74+175"}
+  "basement"    {= "v0.18~preview.130.74+175"}
+  "ppxlib_jane" {= "v0.18~preview.130.74+175"}
+  "sexplib0"    {= "v0.18~preview.130.74+175"}
+  "time_now"    {= "v0.18~preview.130.74+175"}
   "dune"        {>= "3.17.0"}
   "ppxlib"      {= "0.33.0+ox"}
 ]
@@ -27,7 +27,7 @@ Part of the Jane Street's PPX rewriters collection.
 """
 url {
   src:
-    "https://github.com/janestreet/ppx_inline_test/archive/ba7de8054a76c8402fbddc62cc3a07bf5a6b64f0.tar.gz"
+    "https://github.com/janestreet/ppx_inline_test/archive/61003ac54049dc4db0077544d5760929411f34b0.tar.gz"
   checksum:
-    "sha256=c8777cd65d8932930be0d7688f6be72be2c67ff0d2efe0bba7df73588526dfd8"
+    "sha256=306071ce9e91fa0a5edf4a3222508dce54c503a4331d09e8da24cd1038870845"
 }
diff --git a/packages/ppx_int63_literal/.generated b/packages/ppx_int63_literal/.generated
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/ppx_int63_literal/ppx_int63_literal.v0.18~preview.130.74+175/opam b/packages/ppx_int63_literal/ppx_int63_literal.v0.18~preview.130.74+175/opam
new file mode 100644
index 0000000000..591910d804
--- /dev/null
+++ b/packages/ppx_int63_literal/ppx_int63_literal.v0.18~preview.130.74+175/opam
@@ -0,0 +1,29 @@
+opam-version: "2.0"
+maintainer: "Jane Street developers"
+authors: ["Jane Street Group, LLC"]
+homepage: "https://github.com/janestreet/ppx_int63_literal"
+bug-reports: "https://github.com/janestreet/ppx_int63_literal/issues"
+dev-repo: "git+https://github.com/janestreet/ppx_int63_literal.git"
+doc:
+  "https://ocaml.janestreet.com/ocaml-core/latest/doc/ppx_int63_literal/index.html"
+license: "MIT"
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+]
+depends: [
+  "ocaml"  {>= "5.2.0"}
+  "base"   {= "v0.18~preview.130.74+175"}
+  "dune"   {>= "3.17.0"}
+  "ppxlib" {= "0.33.0+ox"}
+]
+available: arch != "arm32" & arch != "x86_32"
+synopsis: "Syntax extension for writing int63 literals."
+description: """
+This ppx allows users to write `Int63.t` values as literals, e.g. `Int63.zero` is `0J`.
+"""
+url {
+  src:
+    "https://github.com/janestreet/ppx_int63_literal/archive/4de87ca44c65e26e16c9aa7595ff20c4d7ddff18.tar.gz"
+  checksum:
+    "sha256=5bb50a5fbb7580fba9f850963294e7aa4ada73e8206b87cd8c4625fd0ada5647"
+}
diff --git a/packages/ppx_jane/ppx_jane.v0.18~preview.130.55+197/opam b/packages/ppx_jane/ppx_jane.v0.18~preview.130.55+197/opam
deleted file mode 100644
index 776a845fe2..0000000000
--- a/packages/ppx_jane/ppx_jane.v0.18~preview.130.55+197/opam
+++ /dev/null
@@ -1,59 +0,0 @@
-opam-version: "2.0"
-maintainer: "Jane Street developers"
-authors: ["Jane Street Group, LLC"]
-homepage: "https://github.com/janestreet/ppx_jane"
-bug-reports: "https://github.com/janestreet/ppx_jane/issues"
-dev-repo: "git+https://github.com/janestreet/ppx_jane.git"
-doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/ppx_jane/index.html"
-license: "MIT"
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-]
-depends: [
-  "ocaml"                       {>= "5.1.0"}
-  "base_quickcheck"             {= "v0.18~preview.130.55+197"}
-  "ppx_assert"                  {= "v0.18~preview.130.55+197"}
-  "ppx_base"                    {= "v0.18~preview.130.55+197"}
-  "ppx_bench"                   {= "v0.18~preview.130.55+197"}
-  "ppx_bin_prot"                {= "v0.18~preview.130.55+197"}
-  "ppx_custom_printf"           {= "v0.18~preview.130.55+197"}
-  "ppx_disable_unused_warnings" {= "v0.18~preview.130.55+197"}
-  "ppx_expect"                  {= "v0.18~preview.130.55+197"}
-  "ppx_fields_conv"             {= "v0.18~preview.130.55+197"}
-  "ppx_fixed_literal"           {= "v0.18~preview.130.55+197"}
-  "ppx_here"                    {= "v0.18~preview.130.55+197"}
-  "ppx_ignore_instrumentation"  {= "v0.18~preview.130.55+197"}
-  "ppx_inline_test"             {= "v0.18~preview.130.55+197"}
-  "ppx_let"                     {= "v0.18~preview.130.55+197"}
-  "ppx_log"                     {= "v0.18~preview.130.55+197"}
-  "ppx_module_timer"            {= "v0.18~preview.130.55+197"}
-  "ppx_optional"                {= "v0.18~preview.130.55+197"}
-  "ppx_pipebang"                {= "v0.18~preview.130.55+197"}
-  "ppx_sexp_message"            {= "v0.18~preview.130.55+197"}
-  "ppx_sexp_value"              {= "v0.18~preview.130.55+197"}
-  "ppx_shorthand"               {= "v0.18~preview.130.55+197"}
-  "ppx_stable"                  {= "v0.18~preview.130.55+197"}
-  "ppx_stable_witness"          {= "v0.18~preview.130.55+197"}
-  "ppx_string"                  {= "v0.18~preview.130.55+197"}
-  "ppx_string_conv"             {= "v0.18~preview.130.55+197"}
-  "ppx_template"                {= "v0.18~preview.130.55+197"}
-  "ppx_tydi"                    {= "v0.18~preview.130.55+197"}
-  "ppx_typed_fields"            {= "v0.18~preview.130.55+197"}
-  "ppx_typerep_conv"            {= "v0.18~preview.130.55+197"}
-  "ppx_var_name"                {= "v0.18~preview.130.55+197"}
-  "ppx_variants_conv"           {= "v0.18~preview.130.55+197"}
-  "dune"                        {>= "3.17.0"}
-  "ppxlib"                      {= "0.33.0+ox"}
-]
-available: arch != "arm32" & arch != "x86_32"
-synopsis: "Standard Jane Street ppx rewriters"
-description: """
-This package installs a ppx-jane executable, which is a ppx driver
-including all standard Jane Street ppx rewriters.
-"""
-url {
-  src:
-    "https://github.com/janestreet/ppx_jane/archive/20654d9f0590a264519e5895320d6a02945b9c67.tar.gz"
-  checksum:
-    "sha256=157269bc4eb78e14be22949de0df0bd4ba8d0a1965eb5f0b8aaf5cfe6164166f"
-}
diff --git a/packages/ppx_jane/ppx_jane.v0.18~preview.130.74+175/opam b/packages/ppx_jane/ppx_jane.v0.18~preview.130.74+175/opam
new file mode 100644
index 0000000000..0ba2baa0b8
--- /dev/null
+++ b/packages/ppx_jane/ppx_jane.v0.18~preview.130.74+175/opam
@@ -0,0 +1,61 @@
+opam-version: "2.0"
+maintainer: "Jane Street developers"
+authors: ["Jane Street Group, LLC"]
+homepage: "https://github.com/janestreet/ppx_jane"
+bug-reports: "https://github.com/janestreet/ppx_jane/issues"
+dev-repo: "git+https://github.com/janestreet/ppx_jane.git"
+doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/ppx_jane/index.html"
+license: "MIT"
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+]
+depends: [
+  "ocaml"                       {>= "5.1.0"}
+  "base_quickcheck"             {= "v0.18~preview.130.74+175"}
+  "ppx_assert"                  {= "v0.18~preview.130.74+175"}
+  "ppx_base"                    {= "v0.18~preview.130.74+175"}
+  "ppx_bench"                   {= "v0.18~preview.130.74+175"}
+  "ppx_bin_prot"                {= "v0.18~preview.130.74+175"}
+  "ppx_custom_printf"           {= "v0.18~preview.130.74+175"}
+  "ppx_debug_assert"            {= "v0.18~preview.130.74+175"}
+  "ppx_disable_unused_warnings" {= "v0.18~preview.130.74+175"}
+  "ppx_expect"                  {= "v0.18~preview.130.74+175"}
+  "ppx_fields_conv"             {= "v0.18~preview.130.74+175"}
+  "ppx_fixed_literal"           {= "v0.18~preview.130.74+175"}
+  "ppx_here"                    {= "v0.18~preview.130.74+175"}
+  "ppx_ignore_instrumentation"  {= "v0.18~preview.130.74+175"}
+  "ppx_inline_test"             {= "v0.18~preview.130.74+175"}
+  "ppx_int63_literal"           {= "v0.18~preview.130.74+175"}
+  "ppx_let"                     {= "v0.18~preview.130.74+175"}
+  "ppx_log"                     {= "v0.18~preview.130.74+175"}
+  "ppx_module_timer"            {= "v0.18~preview.130.74+175"}
+  "ppx_optional"                {= "v0.18~preview.130.74+175"}
+  "ppx_pipebang"                {= "v0.18~preview.130.74+175"}
+  "ppx_sexp_message"            {= "v0.18~preview.130.74+175"}
+  "ppx_sexp_value"              {= "v0.18~preview.130.74+175"}
+  "ppx_shorthand"               {= "v0.18~preview.130.74+175"}
+  "ppx_stable"                  {= "v0.18~preview.130.74+175"}
+  "ppx_stable_witness"          {= "v0.18~preview.130.74+175"}
+  "ppx_string"                  {= "v0.18~preview.130.74+175"}
+  "ppx_string_conv"             {= "v0.18~preview.130.74+175"}
+  "ppx_template"                {= "v0.18~preview.130.74+175"}
+  "ppx_tydi"                    {= "v0.18~preview.130.74+175"}
+  "ppx_typed_fields"            {= "v0.18~preview.130.74+175"}
+  "ppx_typerep_conv"            {= "v0.18~preview.130.74+175"}
+  "ppx_var_name"                {= "v0.18~preview.130.74+175"}
+  "ppx_variants_conv"           {= "v0.18~preview.130.74+175"}
+  "dune"                        {>= "3.17.0"}
+  "ppxlib"                      {= "0.33.0+ox"}
+]
+available: arch != "arm32" & arch != "x86_32"
+synopsis: "Standard Jane Street ppx rewriters"
+description: """
+This package installs a ppx-jane executable, which is a ppx driver
+including all standard Jane Street ppx rewriters.
+"""
+url {
+  src:
+    "https://github.com/janestreet/ppx_jane/archive/cba182358010632de5a29947a3634b683184ea88.tar.gz"
+  checksum:
+    "sha256=acc5e35a57c37f9680e14624e35771dac248a26b120cfb8cf0744005232cc244"
+}
diff --git a/packages/ppx_js_style/ppx_js_style.v0.18~preview.130.55+197/opam b/packages/ppx_js_style/ppx_js_style.v0.18~preview.130.74+175/opam
similarity index 76%
rename from packages/ppx_js_style/ppx_js_style.v0.18~preview.130.55+197/opam
rename to packages/ppx_js_style/ppx_js_style.v0.18~preview.130.74+175/opam
index 0097a9636e..24fd8b6472 100644
--- a/packages/ppx_js_style/ppx_js_style.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_js_style/ppx_js_style.v0.18~preview.130.74+175/opam
@@ -12,8 +12,8 @@ build: [
 ]
 depends: [
   "ocaml"               {>= "5.1.0"}
-  "ppx_template"        {= "v0.18~preview.130.55+197"}
-  "ppxlib_jane"         {= "v0.18~preview.130.55+197"}
+  "ppx_template"        {= "v0.18~preview.130.74+175"}
+  "ppxlib_jane"         {= "v0.18~preview.130.74+175"}
   "dune"                {>= "3.17.0"}
   "ocaml-compiler-libs" {= "v0.17.0+ox"}
   "odoc-parser"
@@ -29,7 +29,7 @@ enforce some coding conventions across all Jane Street packages.
 """
 url {
   src:
-    "https://github.com/janestreet/ppx_js_style/archive/064914d7e339951b4754befbbd3edeb17e84c962.tar.gz"
+    "https://github.com/janestreet/ppx_js_style/archive/a2c8278cb686a97b9eece5cdc726784b328c0278.tar.gz"
   checksum:
-    "sha256=1215065d382f82b77131d151abda90234f94e7d9826539c125dd46aab095fa1c"
+    "sha256=21707e37c7a8c200530522e3796214c93adc369b65dcc3ae4261f1fbcdf401b6"
 }
diff --git a/packages/ppx_jsonaf_conv/ppx_jsonaf_conv.v0.18~preview.130.55+197/opam b/packages/ppx_jsonaf_conv/ppx_jsonaf_conv.v0.18~preview.130.74+175/opam
similarity index 79%
rename from packages/ppx_jsonaf_conv/ppx_jsonaf_conv.v0.18~preview.130.55+197/opam
rename to packages/ppx_jsonaf_conv/ppx_jsonaf_conv.v0.18~preview.130.74+175/opam
index 0c3eab66a0..fc81288cee 100644
--- a/packages/ppx_jsonaf_conv/ppx_jsonaf_conv.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_jsonaf_conv/ppx_jsonaf_conv.v0.18~preview.130.74+175/opam
@@ -12,11 +12,11 @@ build: [
 ]
 depends: [
   "ocaml"          {>= "5.1.0"}
-  "base"           {= "v0.18~preview.130.55+197"}
-  "capitalization" {= "v0.18~preview.130.55+197"}
-  "jsonaf"         {= "v0.18~preview.130.55+197"}
-  "ppx_jane"       {= "v0.18~preview.130.55+197"}
-  "ppxlib_jane"    {= "v0.18~preview.130.55+197"}
+  "base"           {= "v0.18~preview.130.74+175"}
+  "capitalization" {= "v0.18~preview.130.74+175"}
+  "jsonaf"         {= "v0.18~preview.130.74+175"}
+  "ppx_jane"       {= "v0.18~preview.130.74+175"}
+  "ppxlib_jane"    {= "v0.18~preview.130.74+175"}
   "dune"           {>= "3.17.0"}
   "ppxlib"         {= "0.33.0+ox"}
 ]
diff --git a/packages/ppx_let/ppx_let.v0.18~preview.130.55+197/opam b/packages/ppx_let/ppx_let.v0.18~preview.130.74+175/opam
similarity index 68%
rename from packages/ppx_let/ppx_let.v0.18~preview.130.55+197/opam
rename to packages/ppx_let/ppx_let.v0.18~preview.130.74+175/opam
index a659220f63..e62a88afe7 100644
--- a/packages/ppx_let/ppx_let.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_let/ppx_let.v0.18~preview.130.74+175/opam
@@ -11,9 +11,9 @@ build: [
 ]
 depends: [
   "ocaml"       {>= "5.1.0"}
-  "base"        {= "v0.18~preview.130.55+197"}
-  "ppx_here"    {= "v0.18~preview.130.55+197"}
-  "ppxlib_jane" {= "v0.18~preview.130.55+197"}
+  "base"        {= "v0.18~preview.130.74+175"}
+  "ppx_here"    {= "v0.18~preview.130.74+175"}
+  "ppxlib_jane" {= "v0.18~preview.130.74+175"}
   "dune"        {>= "3.17.0"}
   "ppxlib"      {= "0.33.0+ox"}
 ]
@@ -24,7 +24,7 @@ Part of the Jane Street's PPX rewriters collection.
 """
 url {
   src:
-    "https://github.com/janestreet/ppx_let/archive/71ecad8e1b7c4bce0e0be983d54373048213ef37.tar.gz"
+    "https://github.com/janestreet/ppx_let/archive/18f8b737a32b3f805c5bba908bd55396b2505cde.tar.gz"
   checksum:
-    "sha256=b6cf607998359bebae94d7e2a48a567bee4d012408c2a733ca45702597e657c7"
+    "sha256=2b1d4032cd7895b44e3f01f4bbe5a3fce53a8b45271d326f64ce2099cd33ae6b"
 }
diff --git a/packages/ppx_log/ppx_log.v0.18~preview.130.55+197/opam b/packages/ppx_log/ppx_log.v0.18~preview.130.55+197/opam
deleted file mode 100644
index 9a51ca812f..0000000000
--- a/packages/ppx_log/ppx_log.v0.18~preview.130.55+197/opam
+++ /dev/null
@@ -1,42 +0,0 @@
-opam-version: "2.0"
-maintainer: "Jane Street developers"
-authors: ["Jane Street Group, LLC"]
-homepage: "https://github.com/janestreet/ppx_log"
-bug-reports: "https://github.com/janestreet/ppx_log/issues"
-dev-repo: "git+https://github.com/janestreet/ppx_log.git"
-doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/ppx_log/index.html"
-license: "MIT"
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-]
-depends: [
-  "ocaml"             {>= "5.1.0"}
-  "base"              {= "v0.18~preview.130.55+197"}
-  "ppx_compare"       {= "v0.18~preview.130.55+197"}
-  "ppx_enumerate"     {= "v0.18~preview.130.55+197"}
-  "ppx_expect"        {= "v0.18~preview.130.55+197"}
-  "ppx_fields_conv"   {= "v0.18~preview.130.55+197"}
-  "ppx_here"          {= "v0.18~preview.130.55+197"}
-  "ppx_let"           {= "v0.18~preview.130.55+197"}
-  "ppx_sexp_conv"     {= "v0.18~preview.130.55+197"}
-  "ppx_sexp_message"  {= "v0.18~preview.130.55+197"}
-  "ppx_sexp_value"    {= "v0.18~preview.130.55+197"}
-  "ppx_string"        {= "v0.18~preview.130.55+197"}
-  "ppx_variants_conv" {= "v0.18~preview.130.55+197"}
-  "sexplib"           {= "v0.18~preview.130.55+197"}
-  "stdio"             {= "v0.18~preview.130.55+197"}
-  "dune"              {>= "3.17.0"}
-  "ppxlib"            {= "0.33.0+ox"}
-]
-available: arch != "arm32" & arch != "x86_32"
-synopsis:
-  "Ppx_sexp_message-like extension nodes for lazily rendering log messages"
-description: """
-Part of the Jane Street's PPX rewriters collection. 
-"""
-url {
-  src:
-    "https://github.com/janestreet/ppx_log/archive/f2e575559dd1a3ab392ed6b4e9d2144ef6a2db41.tar.gz"
-  checksum:
-    "sha256=1be7093966f4107beafae370c0a4dfc15baea1d28d9df94c25aaebf49c9ccc5b"
-}
diff --git a/packages/ppx_log/ppx_log.v0.18~preview.130.74+175/opam b/packages/ppx_log/ppx_log.v0.18~preview.130.74+175/opam
new file mode 100644
index 0000000000..6174c2f55d
--- /dev/null
+++ b/packages/ppx_log/ppx_log.v0.18~preview.130.74+175/opam
@@ -0,0 +1,42 @@
+opam-version: "2.0"
+maintainer: "Jane Street developers"
+authors: ["Jane Street Group, LLC"]
+homepage: "https://github.com/janestreet/ppx_log"
+bug-reports: "https://github.com/janestreet/ppx_log/issues"
+dev-repo: "git+https://github.com/janestreet/ppx_log.git"
+doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/ppx_log/index.html"
+license: "MIT"
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+]
+depends: [
+  "ocaml"             {>= "5.1.0"}
+  "base"              {= "v0.18~preview.130.74+175"}
+  "ppx_compare"       {= "v0.18~preview.130.74+175"}
+  "ppx_enumerate"     {= "v0.18~preview.130.74+175"}
+  "ppx_expect"        {= "v0.18~preview.130.74+175"}
+  "ppx_fields_conv"   {= "v0.18~preview.130.74+175"}
+  "ppx_here"          {= "v0.18~preview.130.74+175"}
+  "ppx_let"           {= "v0.18~preview.130.74+175"}
+  "ppx_sexp_conv"     {= "v0.18~preview.130.74+175"}
+  "ppx_sexp_message"  {= "v0.18~preview.130.74+175"}
+  "ppx_sexp_value"    {= "v0.18~preview.130.74+175"}
+  "ppx_string"        {= "v0.18~preview.130.74+175"}
+  "ppx_variants_conv" {= "v0.18~preview.130.74+175"}
+  "sexplib"           {= "v0.18~preview.130.74+175"}
+  "stdio"             {= "v0.18~preview.130.74+175"}
+  "dune"              {>= "3.17.0"}
+  "ppxlib"            {= "0.33.0+ox"}
+]
+available: arch != "arm32" & arch != "x86_32"
+synopsis:
+  "Ppx_sexp_message-like extension nodes for lazily rendering log messages"
+description: """
+Part of the Jane Street's PPX rewriters collection. 
+"""
+url {
+  src:
+    "https://github.com/janestreet/ppx_log/archive/db1b9047b1a0c380901f346a7f427354e71c3670.tar.gz"
+  checksum:
+    "sha256=2488a0e8090d8fbf40ded447a6a5b53a41a0f8ce3514d2a08ee9bae5802c2125"
+}
diff --git a/packages/ppx_module_timer/ppx_module_timer.v0.18~preview.130.55+197/opam b/packages/ppx_module_timer/ppx_module_timer.v0.18~preview.130.74+175/opam
similarity index 80%
rename from packages/ppx_module_timer/ppx_module_timer.v0.18~preview.130.55+197/opam
rename to packages/ppx_module_timer/ppx_module_timer.v0.18~preview.130.74+175/opam
index 2a75e5792d..9df972cc1c 100644
--- a/packages/ppx_module_timer/ppx_module_timer.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_module_timer/ppx_module_timer.v0.18~preview.130.74+175/opam
@@ -12,11 +12,11 @@ build: [
 ]
 depends: [
   "ocaml"       {>= "5.1.0"}
-  "base"        {= "v0.18~preview.130.55+197"}
-  "ppx_base"    {= "v0.18~preview.130.55+197"}
-  "ppxlib_jane" {= "v0.18~preview.130.55+197"}
-  "stdio"       {= "v0.18~preview.130.55+197"}
-  "time_now"    {= "v0.18~preview.130.55+197"}
+  "base"        {= "v0.18~preview.130.74+175"}
+  "ppx_base"    {= "v0.18~preview.130.74+175"}
+  "ppxlib_jane" {= "v0.18~preview.130.74+175"}
+  "stdio"       {= "v0.18~preview.130.74+175"}
+  "time_now"    {= "v0.18~preview.130.74+175"}
   "dune"        {>= "3.17.0"}
   "ppxlib"      {= "0.33.0+ox"}
 ]
diff --git a/packages/ppx_optcomp/ppx_optcomp.v0.18~preview.130.55+197/opam b/packages/ppx_optcomp/ppx_optcomp.v0.18~preview.130.74+175/opam
similarity index 85%
rename from packages/ppx_optcomp/ppx_optcomp.v0.18~preview.130.55+197/opam
rename to packages/ppx_optcomp/ppx_optcomp.v0.18~preview.130.74+175/opam
index 05782c86ab..01a7e174dd 100644
--- a/packages/ppx_optcomp/ppx_optcomp.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_optcomp/ppx_optcomp.v0.18~preview.130.74+175/opam
@@ -12,9 +12,9 @@ build: [
 ]
 depends: [
   "ocaml"               {>= "5.1.0"}
-  "base"                {= "v0.18~preview.130.55+197"}
-  "ppxlib_jane"         {= "v0.18~preview.130.55+197"}
-  "stdio"               {= "v0.18~preview.130.55+197"}
+  "base"                {= "v0.18~preview.130.74+175"}
+  "ppxlib_jane"         {= "v0.18~preview.130.74+175"}
+  "stdio"               {= "v0.18~preview.130.74+175"}
   "dune"                {>= "3.17.0"}
   "ocaml-compiler-libs" {= "v0.17.0+ox"}
   "ppxlib"              {= "0.33.0+ox"}
diff --git a/packages/ppx_optional/ppx_optional.v0.18~preview.130.55+197/opam b/packages/ppx_optional/ppx_optional.v0.18~preview.130.74+175/opam
similarity index 90%
rename from packages/ppx_optional/ppx_optional.v0.18~preview.130.55+197/opam
rename to packages/ppx_optional/ppx_optional.v0.18~preview.130.74+175/opam
index 81758a3a73..172b02d6de 100644
--- a/packages/ppx_optional/ppx_optional.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_optional/ppx_optional.v0.18~preview.130.74+175/opam
@@ -12,8 +12,8 @@ build: [
 ]
 depends: [
   "ocaml"       {>= "5.1.0"}
-  "base"        {= "v0.18~preview.130.55+197"}
-  "ppxlib_jane" {= "v0.18~preview.130.55+197"}
+  "base"        {= "v0.18~preview.130.74+175"}
+  "ppxlib_jane" {= "v0.18~preview.130.74+175"}
   "dune"        {>= "3.17.0"}
   "ppxlib"      {= "0.33.0+ox"}
 ]
diff --git a/packages/ppx_pattern_bind/ppx_pattern_bind.v0.18~preview.130.55+197/opam b/packages/ppx_pattern_bind/ppx_pattern_bind.v0.18~preview.130.74+175/opam
similarity index 73%
rename from packages/ppx_pattern_bind/ppx_pattern_bind.v0.18~preview.130.55+197/opam
rename to packages/ppx_pattern_bind/ppx_pattern_bind.v0.18~preview.130.74+175/opam
index 1af6cede07..1c0c886bff 100644
--- a/packages/ppx_pattern_bind/ppx_pattern_bind.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_pattern_bind/ppx_pattern_bind.v0.18~preview.130.74+175/opam
@@ -12,9 +12,9 @@ build: [
 ]
 depends: [
   "ocaml"       {>= "5.1.0"}
-  "base"        {= "v0.18~preview.130.55+197"}
-  "ppx_let"     {= "v0.18~preview.130.55+197"}
-  "ppxlib_jane" {= "v0.18~preview.130.55+197"}
+  "base"        {= "v0.18~preview.130.74+175"}
+  "ppx_let"     {= "v0.18~preview.130.74+175"}
+  "ppxlib_jane" {= "v0.18~preview.130.74+175"}
   "dune"        {>= "3.17.0"}
   "ppxlib"      {= "0.33.0+ox"}
 ]
@@ -27,7 +27,7 @@ way that causes incremental nodes to fire as little as possible.
 """
 url {
   src:
-    "https://github.com/janestreet/ppx_pattern_bind/archive/20ebe67317acf2538bed22f6f34c047f86c818dd.tar.gz"
+    "https://github.com/janestreet/ppx_pattern_bind/archive/e959242fe0da1b0452a53f5f8ebc0b372ad7b93f.tar.gz"
   checksum:
-    "sha256=da930c3383826c8219199a8a8f485ff248341fb68b0ef52045eb75aa94db1bb1"
+    "sha256=18cdadee6b74aa79590d0a407dc0a1ff194afff95709867f4f2f5b29e721bf95"
 }
diff --git a/packages/ppx_pipebang/ppx_pipebang.v0.18~preview.130.55+197/opam b/packages/ppx_pipebang/ppx_pipebang.v0.18~preview.130.74+175/opam
similarity index 100%
rename from packages/ppx_pipebang/ppx_pipebang.v0.18~preview.130.55+197/opam
rename to packages/ppx_pipebang/ppx_pipebang.v0.18~preview.130.74+175/opam
diff --git a/packages/ppx_portable/ppx_portable.v0.18~preview.130.55+197/opam b/packages/ppx_portable/ppx_portable.v0.18~preview.130.74+175/opam
similarity index 74%
rename from packages/ppx_portable/ppx_portable.v0.18~preview.130.55+197/opam
rename to packages/ppx_portable/ppx_portable.v0.18~preview.130.74+175/opam
index fdeabe988a..190eaa54aa 100644
--- a/packages/ppx_portable/ppx_portable.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_portable/ppx_portable.v0.18~preview.130.74+175/opam
@@ -12,9 +12,9 @@ build: [
 ]
 depends: [
   "ocaml"        {>= "5.1.0"}
-  "base"         {= "v0.18~preview.130.55+197"}
-  "ppx_js_style" {= "v0.18~preview.130.55+197"}
-  "ppxlib_jane"  {= "v0.18~preview.130.55+197"}
+  "base"         {= "v0.18~preview.130.74+175"}
+  "ppx_js_style" {= "v0.18~preview.130.74+175"}
+  "ppxlib_jane"  {= "v0.18~preview.130.74+175"}
   "dune"         {>= "3.17.0"}
   "ppxlib"       {= "0.33.0+ox"}
 ]
@@ -29,7 +29,7 @@ mutually recursive values using Portable_lazy.
 """
 url {
   src:
-    "https://github.com/janestreet/ppx_portable/archive/921c21424489a19dd28767cda12c8f65e4374d6f.tar.gz"
+    "https://github.com/janestreet/ppx_portable/archive/e0c2870604dc75cc2a3ddb6f9826925fe0da100b.tar.gz"
   checksum:
-    "sha256=6f23bc1c95b8072218028c02641302622b82d67c50cdc59069392ed0e95276cc"
+    "sha256=e2c8cb548971a3480a3ab8c8a9e1b48995d97a06743eb5c82fd8d42847ff00a5"
 }
diff --git a/packages/ppx_quick_test/ppx_quick_test.v0.18~preview.130.55+197/opam b/packages/ppx_quick_test/ppx_quick_test.v0.18~preview.130.55+197/opam
deleted file mode 100644
index a884dceae6..0000000000
--- a/packages/ppx_quick_test/ppx_quick_test.v0.18~preview.130.55+197/opam
+++ /dev/null
@@ -1,44 +0,0 @@
-opam-version: "2.0"
-maintainer: "Jane Street developers"
-authors: ["Jane Street Group, LLC"]
-homepage: "https://github.com/janestreet/ppx_quick_test"
-bug-reports: "https://github.com/janestreet/ppx_quick_test/issues"
-dev-repo: "git+https://github.com/janestreet/ppx_quick_test.git"
-doc:
-  "https://ocaml.janestreet.com/ocaml-core/latest/doc/ppx_quick_test/index.html"
-license: "MIT"
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-]
-depends: [
-  "ocaml"                     {>= "5.1.0"}
-  "async"                     {= "v0.18~preview.130.55+197"}
-  "async_kernel"              {= "v0.18~preview.130.55+197"}
-  "base"                      {= "v0.18~preview.130.55+197"}
-  "base_quickcheck"           {= "v0.18~preview.130.55+197"}
-  "core"                      {= "v0.18~preview.130.55+197"}
-  "core_kernel"               {= "v0.18~preview.130.55+197"}
-  "expect_test_helpers_async" {= "v0.18~preview.130.55+197"}
-  "expect_test_helpers_core"  {= "v0.18~preview.130.55+197"}
-  "ppx_expect"                {= "v0.18~preview.130.55+197"}
-  "ppx_here"                  {= "v0.18~preview.130.55+197"}
-  "ppx_jane"                  {= "v0.18~preview.130.55+197"}
-  "ppx_sexp_conv"             {= "v0.18~preview.130.55+197"}
-  "ppx_sexp_message"          {= "v0.18~preview.130.55+197"}
-  "ppxlib_jane"               {= "v0.18~preview.130.55+197"}
-  "stdio"                     {= "v0.18~preview.130.55+197"}
-  "dune"                      {>= "3.17.0"}
-  "ppxlib"                    {= "0.33.0+ox"}
-]
-available: arch != "arm32" & arch != "x86_32"
-synopsis:
-  "Spiritual equivalent of let%expect_test, but for property based tests as an ergonomic wrapper to write quickcheck tests."
-description: """
-Part of the Jane Street's PPX rewriters collection.
-"""
-url {
-  src:
-    "https://github.com/janestreet/ppx_quick_test/archive/015c83ec6ceea417d3a672e2144011d7e9469bd4.tar.gz"
-  checksum:
-    "sha256=fdd09bfda8d311104655633fec927871ac22fe0d86f4697722270f4cd0ffa45f"
-}
diff --git a/packages/ppx_quick_test/ppx_quick_test.v0.18~preview.130.74+175/opam b/packages/ppx_quick_test/ppx_quick_test.v0.18~preview.130.74+175/opam
new file mode 100644
index 0000000000..1564d68564
--- /dev/null
+++ b/packages/ppx_quick_test/ppx_quick_test.v0.18~preview.130.74+175/opam
@@ -0,0 +1,44 @@
+opam-version: "2.0"
+maintainer: "Jane Street developers"
+authors: ["Jane Street Group, LLC"]
+homepage: "https://github.com/janestreet/ppx_quick_test"
+bug-reports: "https://github.com/janestreet/ppx_quick_test/issues"
+dev-repo: "git+https://github.com/janestreet/ppx_quick_test.git"
+doc:
+  "https://ocaml.janestreet.com/ocaml-core/latest/doc/ppx_quick_test/index.html"
+license: "MIT"
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+]
+depends: [
+  "ocaml"                     {>= "5.1.0"}
+  "async"                     {= "v0.18~preview.130.74+175"}
+  "async_kernel"              {= "v0.18~preview.130.74+175"}
+  "base"                      {= "v0.18~preview.130.74+175"}
+  "base_quickcheck"           {= "v0.18~preview.130.74+175"}
+  "core"                      {= "v0.18~preview.130.74+175"}
+  "core_kernel"               {= "v0.18~preview.130.74+175"}
+  "expect_test_helpers_async" {= "v0.18~preview.130.74+175"}
+  "expect_test_helpers_core"  {= "v0.18~preview.130.74+175"}
+  "ppx_expect"                {= "v0.18~preview.130.74+175"}
+  "ppx_here"                  {= "v0.18~preview.130.74+175"}
+  "ppx_jane"                  {= "v0.18~preview.130.74+175"}
+  "ppx_sexp_conv"             {= "v0.18~preview.130.74+175"}
+  "ppx_sexp_message"          {= "v0.18~preview.130.74+175"}
+  "ppxlib_jane"               {= "v0.18~preview.130.74+175"}
+  "stdio"                     {= "v0.18~preview.130.74+175"}
+  "dune"                      {>= "3.17.0"}
+  "ppxlib"                    {= "0.33.0+ox"}
+]
+available: arch != "arm32" & arch != "x86_32"
+synopsis:
+  "Spiritual equivalent of let%expect_test, but for property based tests as an ergonomic wrapper to write quickcheck tests."
+description: """
+Part of the Jane Street's PPX rewriters collection.
+"""
+url {
+  src:
+    "https://github.com/janestreet/ppx_quick_test/archive/b4d5240391555c003c5565764c53660cae4b9a97.tar.gz"
+  checksum:
+    "sha256=173aee6cbed49a841d96c4924c65f2916aea8b0b744b1d946748265704ecb84a"
+}
diff --git a/packages/ppx_rope/ppx_rope.v0.18~preview.130.55+197/opam b/packages/ppx_rope/ppx_rope.v0.18~preview.130.74+175/opam
similarity index 83%
rename from packages/ppx_rope/ppx_rope.v0.18~preview.130.55+197/opam
rename to packages/ppx_rope/ppx_rope.v0.18~preview.130.74+175/opam
index 9e73a6192d..e5a7547d8b 100644
--- a/packages/ppx_rope/ppx_rope.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_rope/ppx_rope.v0.18~preview.130.74+175/opam
@@ -11,10 +11,10 @@ build: [
 ]
 depends: [
   "ocaml"      {>= "5.1.0"}
-  "base"       {= "v0.18~preview.130.55+197"}
-  "dedent"     {= "v0.18~preview.130.55+197"}
-  "jane_rope"  {= "v0.18~preview.130.55+197"}
-  "ppx_string" {= "v0.18~preview.130.55+197"}
+  "base"       {= "v0.18~preview.130.74+175"}
+  "dedent"     {= "v0.18~preview.130.74+175"}
+  "jane_rope"  {= "v0.18~preview.130.74+175"}
+  "ppx_string" {= "v0.18~preview.130.74+175"}
   "dune"       {>= "3.17.0"}
   "ppxlib"     {= "0.33.0+ox"}
 ]
diff --git a/packages/ppx_sexp_conv/ppx_sexp_conv.v0.18~preview.130.55+197/opam b/packages/ppx_sexp_conv/ppx_sexp_conv.v0.18~preview.130.74+175/opam
similarity index 67%
rename from packages/ppx_sexp_conv/ppx_sexp_conv.v0.18~preview.130.55+197/opam
rename to packages/ppx_sexp_conv/ppx_sexp_conv.v0.18~preview.130.74+175/opam
index 4619a28066..4e06c20a06 100644
--- a/packages/ppx_sexp_conv/ppx_sexp_conv.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_sexp_conv/ppx_sexp_conv.v0.18~preview.130.74+175/opam
@@ -12,10 +12,10 @@ build: [
 ]
 depends: [
   "ocaml"       {>= "5.1.0"}
-  "basement"    {= "v0.18~preview.130.55+197"}
-  "ppx_helpers" {= "v0.18~preview.130.55+197"}
-  "ppxlib_jane" {= "v0.18~preview.130.55+197"}
-  "sexplib0"    {= "v0.18~preview.130.55+197"}
+  "basement"    {= "v0.18~preview.130.74+175"}
+  "ppx_helpers" {= "v0.18~preview.130.74+175"}
+  "ppxlib_jane" {= "v0.18~preview.130.74+175"}
+  "sexplib0"    {= "v0.18~preview.130.74+175"}
   "dune"        {>= "3.17.0"}
   "ppxlib"      {= "0.33.0+ox"}
 ]
@@ -26,7 +26,7 @@ Part of the Jane Street's PPX rewriters collection.
 """
 url {
   src:
-    "https://github.com/janestreet/ppx_sexp_conv/archive/c5e62791166b03ce4c11cbff21e11088b730a059.tar.gz"
+    "https://github.com/janestreet/ppx_sexp_conv/archive/cd2e70050fc77a66defc9ca80aebe3e15877a719.tar.gz"
   checksum:
-    "sha256=3e596a47afb5788c136e47d100d4b75a4030c7304d0163bb167bfac92d91509b"
+    "sha256=06bfd7480a3b455ea1c7e392fd253ef8fa5004d1bebd65abaa4d689ef9daab6c"
 }
diff --git a/packages/ppx_sexp_message/ppx_sexp_message.v0.18~preview.130.55+197/opam b/packages/ppx_sexp_message/ppx_sexp_message.v0.18~preview.130.74+175/opam
similarity index 69%
rename from packages/ppx_sexp_message/ppx_sexp_message.v0.18~preview.130.55+197/opam
rename to packages/ppx_sexp_message/ppx_sexp_message.v0.18~preview.130.74+175/opam
index 33df723f2c..4f455a3a3f 100644
--- a/packages/ppx_sexp_message/ppx_sexp_message.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_sexp_message/ppx_sexp_message.v0.18~preview.130.74+175/opam
@@ -12,9 +12,9 @@ build: [
 ]
 depends: [
   "ocaml"         {>= "5.1.0"}
-  "base"          {= "v0.18~preview.130.55+197"}
-  "ppx_here"      {= "v0.18~preview.130.55+197"}
-  "ppx_sexp_conv" {= "v0.18~preview.130.55+197"}
+  "base"          {= "v0.18~preview.130.74+175"}
+  "ppx_here"      {= "v0.18~preview.130.74+175"}
+  "ppx_sexp_conv" {= "v0.18~preview.130.74+175"}
   "dune"          {>= "3.17.0"}
   "ppxlib"        {= "0.33.0+ox"}
 ]
@@ -25,7 +25,7 @@ Part of the Jane Street's PPX rewriters collection.
 """
 url {
   src:
-    "https://github.com/janestreet/ppx_sexp_message/archive/005a191d62119a40859cf99ce247614cb2e2f1e4.tar.gz"
+    "https://github.com/janestreet/ppx_sexp_message/archive/2c12622117212e6bd1dd83185308ed3d3b143986.tar.gz"
   checksum:
-    "sha256=3abf9f5f32231496b35c8fdc14c3aa9647f10f816a47bdf1b5a4e6d395c6de59"
+    "sha256=775b8dc03cf1eddba7254744a83dfc3e7b2672f2ae6d25db27907a64c2e56af8"
 }
diff --git a/packages/ppx_sexp_value/ppx_sexp_value.v0.18~preview.130.55+197/opam b/packages/ppx_sexp_value/ppx_sexp_value.v0.18~preview.130.74+175/opam
similarity index 70%
rename from packages/ppx_sexp_value/ppx_sexp_value.v0.18~preview.130.55+197/opam
rename to packages/ppx_sexp_value/ppx_sexp_value.v0.18~preview.130.74+175/opam
index c0c35580ff..a2e2137069 100644
--- a/packages/ppx_sexp_value/ppx_sexp_value.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_sexp_value/ppx_sexp_value.v0.18~preview.130.74+175/opam
@@ -12,9 +12,9 @@ build: [
 ]
 depends: [
   "ocaml"         {>= "5.1.0"}
-  "base"          {= "v0.18~preview.130.55+197"}
-  "ppx_here"      {= "v0.18~preview.130.55+197"}
-  "ppx_sexp_conv" {= "v0.18~preview.130.55+197"}
+  "base"          {= "v0.18~preview.130.74+175"}
+  "ppx_here"      {= "v0.18~preview.130.74+175"}
+  "ppx_sexp_conv" {= "v0.18~preview.130.74+175"}
   "dune"          {>= "3.17.0"}
   "ppxlib"        {= "0.33.0+ox"}
 ]
@@ -26,7 +26,7 @@ Part of the Jane Street's PPX rewriters collection.
 """
 url {
   src:
-    "https://github.com/janestreet/ppx_sexp_value/archive/33473ef6fcd7b35a25bae1ac3369eaa07511a083.tar.gz"
+    "https://github.com/janestreet/ppx_sexp_value/archive/159484c7d3c5a36e404ffce31a0ef7db352ef756.tar.gz"
   checksum:
-    "sha256=0b562ef302a1d964536d14b38d8c726df6d8784ebbc823ae6123946e1bb5c029"
+    "sha256=8dc994c4eedce7eebc0369dcd07227228ae5d3ae5557bf24aa4a796fa2a6ae1b"
 }
diff --git a/packages/ppx_shorthand/ppx_shorthand.v0.18~preview.130.55+197/opam b/packages/ppx_shorthand/ppx_shorthand.v0.18~preview.130.74+175/opam
similarity index 77%
rename from packages/ppx_shorthand/ppx_shorthand.v0.18~preview.130.55+197/opam
rename to packages/ppx_shorthand/ppx_shorthand.v0.18~preview.130.74+175/opam
index 88c26faa07..2c52186f81 100644
--- a/packages/ppx_shorthand/ppx_shorthand.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_shorthand/ppx_shorthand.v0.18~preview.130.74+175/opam
@@ -12,7 +12,7 @@ build: [
 ]
 depends: [
   "ocaml"       {>= "5.1.0"}
-  "ppxlib_jane" {= "v0.18~preview.130.55+197"}
+  "ppxlib_jane" {= "v0.18~preview.130.74+175"}
   "dune"        {>= "3.17.0"}
   "ppxlib"      {= "0.33.0+ox"}
 ]
@@ -23,7 +23,7 @@ This ppx is a collection of small AST transformations that might not otherwise w
 """
 url {
   src:
-    "https://github.com/janestreet/ppx_shorthand/archive/a67dac3b7656dc5d0ad03d83a094df430c502f47.tar.gz"
+    "https://github.com/janestreet/ppx_shorthand/archive/85cf765cf150646b9e4f7f3d9eea0881faa309d7.tar.gz"
   checksum:
-    "sha256=9a0b06eb8a9f9e7c9052dfaf576454cb5a1c6bdfcaa7164112dbe470688523c7"
+    "sha256=95abb6df37183a2dab33b6aca8b891b582b634d4f19b508fda181d7bbe9bcf6e"
 }
diff --git a/packages/ppx_simple_xml_conv/ppx_simple_xml_conv.v0.18~preview.130.55+197/opam b/packages/ppx_simple_xml_conv/ppx_simple_xml_conv.v0.18~preview.130.74+175/opam
similarity index 78%
rename from packages/ppx_simple_xml_conv/ppx_simple_xml_conv.v0.18~preview.130.55+197/opam
rename to packages/ppx_simple_xml_conv/ppx_simple_xml_conv.v0.18~preview.130.74+175/opam
index 56e5a76960..4c56e2642d 100644
--- a/packages/ppx_simple_xml_conv/ppx_simple_xml_conv.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_simple_xml_conv/ppx_simple_xml_conv.v0.18~preview.130.74+175/opam
@@ -12,12 +12,12 @@ build: [
 ]
 depends: [
   "ocaml"        {>= "5.1.0"}
-  "base"         {= "v0.18~preview.130.55+197"}
-  "core"         {= "v0.18~preview.130.55+197"}
-  "ppx_jane"     {= "v0.18~preview.130.55+197"}
-  "ppx_js_style" {= "v0.18~preview.130.55+197"}
-  "ppxlib_jane"  {= "v0.18~preview.130.55+197"}
-  "simple_xml"   {= "v0.18~preview.130.55+197"}
+  "base"         {= "v0.18~preview.130.74+175"}
+  "core"         {= "v0.18~preview.130.74+175"}
+  "ppx_jane"     {= "v0.18~preview.130.74+175"}
+  "ppx_js_style" {= "v0.18~preview.130.74+175"}
+  "ppxlib_jane"  {= "v0.18~preview.130.74+175"}
+  "simple_xml"   {= "v0.18~preview.130.74+175"}
   "dune"         {>= "3.17.0"}
   "ppxlib"       {= "0.33.0+ox"}
   "xmlm"         {>= "1.4.0"}
diff --git a/packages/ppx_stable/ppx_stable.v0.18~preview.130.55+197/opam b/packages/ppx_stable/ppx_stable.v0.18~preview.130.74+175/opam
similarity index 90%
rename from packages/ppx_stable/ppx_stable.v0.18~preview.130.55+197/opam
rename to packages/ppx_stable/ppx_stable.v0.18~preview.130.74+175/opam
index bfed2e0e33..d22c347dd8 100644
--- a/packages/ppx_stable/ppx_stable.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_stable/ppx_stable.v0.18~preview.130.74+175/opam
@@ -12,8 +12,8 @@ build: [
 ]
 depends: [
   "ocaml"       {>= "5.1.0"}
-  "base"        {= "v0.18~preview.130.55+197"}
-  "ppxlib_jane" {= "v0.18~preview.130.55+197"}
+  "base"        {= "v0.18~preview.130.74+175"}
+  "ppxlib_jane" {= "v0.18~preview.130.74+175"}
   "dune"        {>= "3.17.0"}
   "ppxlib"      {= "0.33.0+ox"}
 ]
diff --git a/packages/ppx_stable_witness/ppx_stable_witness.v0.18~preview.130.55+197/opam b/packages/ppx_stable_witness/ppx_stable_witness.v0.18~preview.130.74+175/opam
similarity index 74%
rename from packages/ppx_stable_witness/ppx_stable_witness.v0.18~preview.130.55+197/opam
rename to packages/ppx_stable_witness/ppx_stable_witness.v0.18~preview.130.74+175/opam
index 19171ed874..d50a663c14 100644
--- a/packages/ppx_stable_witness/ppx_stable_witness.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_stable_witness/ppx_stable_witness.v0.18~preview.130.74+175/opam
@@ -12,9 +12,9 @@ build: [
 ]
 depends: [
   "ocaml"       {>= "5.1.0"}
-  "base"        {= "v0.18~preview.130.55+197"}
-  "basement"    {= "v0.18~preview.130.55+197"}
-  "ppxlib_jane" {= "v0.18~preview.130.55+197"}
+  "base"        {= "v0.18~preview.130.74+175"}
+  "basement"    {= "v0.18~preview.130.74+175"}
+  "ppxlib_jane" {= "v0.18~preview.130.74+175"}
   "dune"        {>= "3.17.0"}
   "ppxlib"      {= "0.33.0+ox"}
 ]
@@ -28,7 +28,7 @@ Part of the Jane Street's PPX rewriters collection.
 """
 url {
   src:
-    "https://github.com/janestreet/ppx_stable_witness/archive/8c5e881059f38b35c6fa81182ee4d217a61dac43.tar.gz"
+    "https://github.com/janestreet/ppx_stable_witness/archive/37907daf6b804ee39d2e7a7abd18a87e9f461f8c.tar.gz"
   checksum:
-    "sha256=d1b113ae2d0eb104c59595d203ca8b31b2f5687966a5fe80c8e1b791a94e6169"
+    "sha256=682cd26ca2b4987185a64bf3e5b153c8c6df219cedbb4dc84f820581e228cafe"
 }
diff --git a/packages/ppx_string/ppx_string.v0.18~preview.130.55+197/opam b/packages/ppx_string/ppx_string.v0.18~preview.130.74+175/opam
similarity index 86%
rename from packages/ppx_string/ppx_string.v0.18~preview.130.55+197/opam
rename to packages/ppx_string/ppx_string.v0.18~preview.130.74+175/opam
index 973c923ad0..b5c0a55a0d 100644
--- a/packages/ppx_string/ppx_string.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_string/ppx_string.v0.18~preview.130.74+175/opam
@@ -12,9 +12,9 @@ build: [
 ]
 depends: [
   "ocaml"        {>= "5.1.0"}
-  "base"         {= "v0.18~preview.130.55+197"}
-  "ppx_base"     {= "v0.18~preview.130.55+197"}
-  "ppx_template" {= "v0.18~preview.130.55+197"}
+  "base"         {= "v0.18~preview.130.74+175"}
+  "ppx_base"     {= "v0.18~preview.130.74+175"}
+  "ppx_template" {= "v0.18~preview.130.74+175"}
   "dune"         {>= "3.17.0"}
   "ppxlib"       {= "0.33.0+ox"}
 ]
diff --git a/packages/ppx_string_conv/ppx_string_conv.v0.18~preview.130.55+197/opam b/packages/ppx_string_conv/ppx_string_conv.v0.18~preview.130.74+175/opam
similarity index 63%
rename from packages/ppx_string_conv/ppx_string_conv.v0.18~preview.130.55+197/opam
rename to packages/ppx_string_conv/ppx_string_conv.v0.18~preview.130.74+175/opam
index ddfc25832d..046f92438d 100644
--- a/packages/ppx_string_conv/ppx_string_conv.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_string_conv/ppx_string_conv.v0.18~preview.130.74+175/opam
@@ -12,11 +12,11 @@ build: [
 ]
 depends: [
   "ocaml"          {>= "5.1.0"}
-  "base"           {= "v0.18~preview.130.55+197"}
-  "capitalization" {= "v0.18~preview.130.55+197"}
-  "ppx_let"        {= "v0.18~preview.130.55+197"}
-  "ppx_string"     {= "v0.18~preview.130.55+197"}
-  "ppxlib_jane"    {= "v0.18~preview.130.55+197"}
+  "base"           {= "v0.18~preview.130.74+175"}
+  "capitalization" {= "v0.18~preview.130.74+175"}
+  "ppx_let"        {= "v0.18~preview.130.74+175"}
+  "ppx_string"     {= "v0.18~preview.130.74+175"}
+  "ppxlib_jane"    {= "v0.18~preview.130.74+175"}
   "dune"           {>= "3.17.0"}
   "ppxlib"         {= "0.33.0+ox"}
 ]
@@ -27,7 +27,7 @@ Part of the Jane Street's PPX rewriters collection.
 """
 url {
   src:
-    "https://github.com/janestreet/ppx_string_conv/archive/e9072ce59ab14d0f2dd9b11ac0832e0eeb4bc92b.tar.gz"
+    "https://github.com/janestreet/ppx_string_conv/archive/a54ad9efba09095f5cf90bd3e5945858a0562779.tar.gz"
   checksum:
-    "sha256=3ba8163c6b8316b4469eb343f70bc54aadfda1fca0babb66fc01b6174ee8b9e3"
+    "sha256=5a3945849bef591e9306fd9ad2d9e1a4273a71c8c9f9b4e7cc037e8ea538a229"
 }
diff --git a/packages/ppx_template/ppx_template.v0.18~preview.130.55+197/opam b/packages/ppx_template/ppx_template.v0.18~preview.130.74+175/opam
similarity index 74%
rename from packages/ppx_template/ppx_template.v0.18~preview.130.55+197/opam
rename to packages/ppx_template/ppx_template.v0.18~preview.130.74+175/opam
index d37ced4d43..2363561492 100644
--- a/packages/ppx_template/ppx_template.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_template/ppx_template.v0.18~preview.130.74+175/opam
@@ -12,9 +12,9 @@ build: [
 ]
 depends: [
   "ocaml"       {>= "5.1.0"}
-  "ppx_helpers" {= "v0.18~preview.130.55+197"}
-  "ppxlib_jane" {= "v0.18~preview.130.55+197"}
-  "sexplib0"    {= "v0.18~preview.130.55+197"}
+  "ppx_helpers" {= "v0.18~preview.130.74+175"}
+  "ppxlib_jane" {= "v0.18~preview.130.74+175"}
+  "sexplib0"    {= "v0.18~preview.130.74+175"}
   "dune"        {>= "3.17.0"}
   "ppxlib"      {= "0.33.0+ox"}
 ]
@@ -26,7 +26,7 @@ This PPX rewriter is used internally at Jane Street to simulate polymorphism ove
 """
 url {
   src:
-    "https://github.com/janestreet/ppx_template/archive/45c878db6a591436207fe7fbcbf5781ff956a669.tar.gz"
+    "https://github.com/janestreet/ppx_template/archive/8d864d58fb68f983a060842861dc0058058e442a.tar.gz"
   checksum:
-    "sha256=64596c9a6cc1f358e7c8bb496579054b2a4a22cdb744e5c6aa06f2ba35356f7a"
+    "sha256=6f8f6568848b14f1c373d6459c318a58c0ced61a8472c5064977a735e9dadbf0"
 }
diff --git a/packages/ppx_tydi/ppx_tydi.v0.18~preview.130.55+197/opam b/packages/ppx_tydi/ppx_tydi.v0.18~preview.130.74+175/opam
similarity index 96%
rename from packages/ppx_tydi/ppx_tydi.v0.18~preview.130.55+197/opam
rename to packages/ppx_tydi/ppx_tydi.v0.18~preview.130.74+175/opam
index baea2c8f21..0d4dd40cca 100644
--- a/packages/ppx_tydi/ppx_tydi.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_tydi/ppx_tydi.v0.18~preview.130.74+175/opam
@@ -11,7 +11,7 @@ build: [
 ]
 depends: [
   "ocaml"  {>= "5.1.0"}
-  "base"   {= "v0.18~preview.130.55+197"}
+  "base"   {= "v0.18~preview.130.74+175"}
   "dune"   {>= "3.17.0"}
   "ppxlib" {= "0.33.0+ox"}
 ]
diff --git a/packages/ppx_typed_fields/ppx_typed_fields.v0.18~preview.130.55+197/opam b/packages/ppx_typed_fields/ppx_typed_fields.v0.18~preview.130.55+197/opam
deleted file mode 100644
index e42475b277..0000000000
--- a/packages/ppx_typed_fields/ppx_typed_fields.v0.18~preview.130.55+197/opam
+++ /dev/null
@@ -1,43 +0,0 @@
-opam-version: "2.0"
-maintainer: "Jane Street developers"
-authors: ["Jane Street Group, LLC"]
-homepage: "https://github.com/janestreet/ppx_typed_fields"
-bug-reports: "https://github.com/janestreet/ppx_typed_fields/issues"
-dev-repo: "git+https://github.com/janestreet/ppx_typed_fields.git"
-doc:
-  "https://ocaml.janestreet.com/ocaml-core/latest/doc/ppx_typed_fields/index.html"
-license: "MIT"
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-]
-depends: [
-  "ocaml"            {>= "5.1.0"}
-  "base"             {= "v0.18~preview.130.55+197"}
-  "ppx_base"         {= "v0.18~preview.130.55+197"}
-  "ppx_compare"      {= "v0.18~preview.130.55+197"}
-  "ppx_enumerate"    {= "v0.18~preview.130.55+197"}
-  "ppx_globalize"    {= "v0.18~preview.130.55+197"}
-  "ppx_hash"         {= "v0.18~preview.130.55+197"}
-  "ppx_pipebang"     {= "v0.18~preview.130.55+197"}
-  "ppx_sexp_conv"    {= "v0.18~preview.130.55+197"}
-  "ppx_sexp_message" {= "v0.18~preview.130.55+197"}
-  "ppx_string"       {= "v0.18~preview.130.55+197"}
-  "ppx_template"     {= "v0.18~preview.130.55+197"}
-  "ppxlib_jane"      {= "v0.18~preview.130.55+197"}
-  "sexplib"          {= "v0.18~preview.130.55+197"}
-  "sexplib0"         {= "v0.18~preview.130.55+197"}
-  "univ_map"         {= "v0.18~preview.130.55+197"}
-  "dune"             {>= "3.17.0"}
-  "ppxlib"           {= "0.33.0+ox"}
-]
-available: arch != "arm32" & arch != "x86_32"
-synopsis: "GADT-based field accessors and utilities"
-description: """
-Part of the Jane Street's PPX rewriters collection.
-"""
-url {
-  src:
-    "https://github.com/janestreet/ppx_typed_fields/archive/cc947be161c2c9d32fba350eb6d03d0b88e3bba2.tar.gz"
-  checksum:
-    "sha256=597aa9c307a088afb51f2a104dd672a73e0cbd6a89e1e3ab7de95f897d102042"
-}
diff --git a/packages/ppx_typed_fields/ppx_typed_fields.v0.18~preview.130.74+175/opam b/packages/ppx_typed_fields/ppx_typed_fields.v0.18~preview.130.74+175/opam
new file mode 100644
index 0000000000..422ed6f834
--- /dev/null
+++ b/packages/ppx_typed_fields/ppx_typed_fields.v0.18~preview.130.74+175/opam
@@ -0,0 +1,43 @@
+opam-version: "2.0"
+maintainer: "Jane Street developers"
+authors: ["Jane Street Group, LLC"]
+homepage: "https://github.com/janestreet/ppx_typed_fields"
+bug-reports: "https://github.com/janestreet/ppx_typed_fields/issues"
+dev-repo: "git+https://github.com/janestreet/ppx_typed_fields.git"
+doc:
+  "https://ocaml.janestreet.com/ocaml-core/latest/doc/ppx_typed_fields/index.html"
+license: "MIT"
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+]
+depends: [
+  "ocaml"            {>= "5.1.0"}
+  "base"             {= "v0.18~preview.130.74+175"}
+  "ppx_base"         {= "v0.18~preview.130.74+175"}
+  "ppx_compare"      {= "v0.18~preview.130.74+175"}
+  "ppx_enumerate"    {= "v0.18~preview.130.74+175"}
+  "ppx_globalize"    {= "v0.18~preview.130.74+175"}
+  "ppx_hash"         {= "v0.18~preview.130.74+175"}
+  "ppx_pipebang"     {= "v0.18~preview.130.74+175"}
+  "ppx_sexp_conv"    {= "v0.18~preview.130.74+175"}
+  "ppx_sexp_message" {= "v0.18~preview.130.74+175"}
+  "ppx_string"       {= "v0.18~preview.130.74+175"}
+  "ppx_template"     {= "v0.18~preview.130.74+175"}
+  "ppxlib_jane"      {= "v0.18~preview.130.74+175"}
+  "sexplib"          {= "v0.18~preview.130.74+175"}
+  "sexplib0"         {= "v0.18~preview.130.74+175"}
+  "univ_map"         {= "v0.18~preview.130.74+175"}
+  "dune"             {>= "3.17.0"}
+  "ppxlib"           {= "0.33.0+ox"}
+]
+available: arch != "arm32" & arch != "x86_32"
+synopsis: "GADT-based field accessors and utilities"
+description: """
+Part of the Jane Street's PPX rewriters collection.
+"""
+url {
+  src:
+    "https://github.com/janestreet/ppx_typed_fields/archive/e83649b9ec90faca043ce9bd8932adebd5942f6a.tar.gz"
+  checksum:
+    "sha256=8d8808aa60427515f2c8acd5e189498fd187b8b11e8a501c559bb14ed8ba6a3c"
+}
diff --git a/packages/ppx_typerep_conv/ppx_typerep_conv.v0.18~preview.130.55+197/opam b/packages/ppx_typerep_conv/ppx_typerep_conv.v0.18~preview.130.74+175/opam
similarity index 66%
rename from packages/ppx_typerep_conv/ppx_typerep_conv.v0.18~preview.130.55+197/opam
rename to packages/ppx_typerep_conv/ppx_typerep_conv.v0.18~preview.130.74+175/opam
index 27b777bf8f..b130d84ba2 100644
--- a/packages/ppx_typerep_conv/ppx_typerep_conv.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_typerep_conv/ppx_typerep_conv.v0.18~preview.130.74+175/opam
@@ -12,9 +12,10 @@ build: [
 ]
 depends: [
   "ocaml"       {>= "5.1.0"}
-  "base"        {= "v0.18~preview.130.55+197"}
-  "ppxlib_jane" {= "v0.18~preview.130.55+197"}
-  "typerep"     {= "v0.18~preview.130.55+197"}
+  "base"        {= "v0.18~preview.130.74+175"}
+  "ppx_helpers" {= "v0.18~preview.130.74+175"}
+  "ppxlib_jane" {= "v0.18~preview.130.74+175"}
+  "typerep"     {= "v0.18~preview.130.74+175"}
   "dune"        {>= "3.17.0"}
   "ppxlib"      {= "0.33.0+ox"}
 ]
@@ -25,7 +26,7 @@ Part of the Jane Street's PPX rewriters collection.
 """
 url {
   src:
-    "https://github.com/janestreet/ppx_typerep_conv/archive/efeebaaecd27d03bb4dea2ffb1ca63079d4cd02e.tar.gz"
+    "https://github.com/janestreet/ppx_typerep_conv/archive/8d969017db170b1662f9c2b71d7e009cca85e57c.tar.gz"
   checksum:
-    "sha256=023d8ca993220e6ca8aa00dbda41c218fe2381ba554b35e043e726b83bf4d658"
+    "sha256=319d6a1890e0e560ef56d89a104fcbb6347f2f083ad26d48580a9008aff1039d"
 }
diff --git a/packages/ppx_var_name/ppx_var_name.v0.18~preview.130.55+197/opam b/packages/ppx_var_name/ppx_var_name.v0.18~preview.130.74+175/opam
similarity index 95%
rename from packages/ppx_var_name/ppx_var_name.v0.18~preview.130.55+197/opam
rename to packages/ppx_var_name/ppx_var_name.v0.18~preview.130.74+175/opam
index 6bcc259390..3be0c6f7a1 100644
--- a/packages/ppx_var_name/ppx_var_name.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_var_name/ppx_var_name.v0.18~preview.130.74+175/opam
@@ -12,7 +12,7 @@ build: [
 ]
 depends: [
   "ocaml"  {>= "5.1.0"}
-  "base"   {= "v0.18~preview.130.55+197"}
+  "base"   {= "v0.18~preview.130.74+175"}
   "dune"   {>= "3.17.0"}
   "ppxlib" {= "0.33.0+ox"}
 ]
diff --git a/packages/ppx_variants_conv/ppx_variants_conv.v0.18~preview.130.55+197/opam b/packages/ppx_variants_conv/ppx_variants_conv.v0.18~preview.130.74+175/opam
similarity index 70%
rename from packages/ppx_variants_conv/ppx_variants_conv.v0.18~preview.130.55+197/opam
rename to packages/ppx_variants_conv/ppx_variants_conv.v0.18~preview.130.74+175/opam
index 7d7e9fffa3..9c17021adc 100644
--- a/packages/ppx_variants_conv/ppx_variants_conv.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_variants_conv/ppx_variants_conv.v0.18~preview.130.74+175/opam
@@ -12,9 +12,9 @@ build: [
 ]
 depends: [
   "ocaml"       {>= "5.1.0"}
-  "base"        {= "v0.18~preview.130.55+197"}
-  "ppxlib_jane" {= "v0.18~preview.130.55+197"}
-  "variantslib" {= "v0.18~preview.130.55+197"}
+  "base"        {= "v0.18~preview.130.74+175"}
+  "ppxlib_jane" {= "v0.18~preview.130.74+175"}
+  "variantslib" {= "v0.18~preview.130.74+175"}
   "dune"        {>= "3.17.0"}
   "ppxlib"      {= "0.33.0+ox"}
 ]
@@ -26,7 +26,7 @@ Part of the Jane Street's PPX rewriters collection.
 """
 url {
   src:
-    "https://github.com/janestreet/ppx_variants_conv/archive/3d99f3353110435608e416fcc2e9193ad193674e.tar.gz"
+    "https://github.com/janestreet/ppx_variants_conv/archive/fd440040c79655f8071ae35c768511e40d5f8d51.tar.gz"
   checksum:
-    "sha256=7ba39b11ef830432a06f36160972d8eccc4063c986683a69002ab8dd59bbe787"
+    "sha256=309d85ea3a615ba91e50bfa9e6076ed80354c499d397321814166f0a4a34103c"
 }
diff --git a/packages/ppx_with/ppx_with.v0.18~preview.130.55+197/opam b/packages/ppx_with/ppx_with.v0.18~preview.130.74+175/opam
similarity index 91%
rename from packages/ppx_with/ppx_with.v0.18~preview.130.55+197/opam
rename to packages/ppx_with/ppx_with.v0.18~preview.130.74+175/opam
index 639bd5c913..1216b24413 100644
--- a/packages/ppx_with/ppx_with.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_with/ppx_with.v0.18~preview.130.74+175/opam
@@ -11,8 +11,8 @@ build: [
 ]
 depends: [
   "ocaml"       {>= "5.1.0"}
-  "base"        {= "v0.18~preview.130.55+197"}
-  "ppxlib_jane" {= "v0.18~preview.130.55+197"}
+  "base"        {= "v0.18~preview.130.74+175"}
+  "ppxlib_jane" {= "v0.18~preview.130.74+175"}
   "dune"        {>= "3.17.0"}
   "ppxlib"      {= "0.33.0+ox"}
 ]
diff --git a/packages/ppx_xml_conv/ppx_xml_conv.v0.18~preview.130.55+197/opam b/packages/ppx_xml_conv/ppx_xml_conv.v0.18~preview.130.74+175/opam
similarity index 81%
rename from packages/ppx_xml_conv/ppx_xml_conv.v0.18~preview.130.55+197/opam
rename to packages/ppx_xml_conv/ppx_xml_conv.v0.18~preview.130.74+175/opam
index 3fc06df25e..c6d7ede20f 100644
--- a/packages/ppx_xml_conv/ppx_xml_conv.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_xml_conv/ppx_xml_conv.v0.18~preview.130.74+175/opam
@@ -12,10 +12,10 @@ build: [
 ]
 depends: [
   "ocaml"           {>= "5.1.0"}
-  "base"            {= "v0.18~preview.130.55+197"}
-  "csvfields"       {= "v0.18~preview.130.55+197"}
-  "ppx_conv_func"   {= "v0.18~preview.130.55+197"}
-  "ppx_fields_conv" {= "v0.18~preview.130.55+197"}
+  "base"            {= "v0.18~preview.130.74+175"}
+  "csvfields"       {= "v0.18~preview.130.74+175"}
+  "ppx_conv_func"   {= "v0.18~preview.130.74+175"}
+  "ppx_fields_conv" {= "v0.18~preview.130.74+175"}
   "dune"            {>= "3.17.0"}
   "ppxlib"          {= "0.33.0+ox"}
 ]
diff --git a/packages/ppx_yojson_conv/ppx_yojson_conv.v0.18~preview.130.55+197/opam b/packages/ppx_yojson_conv/ppx_yojson_conv.v0.18~preview.130.74+175/opam
similarity index 77%
rename from packages/ppx_yojson_conv/ppx_yojson_conv.v0.18~preview.130.55+197/opam
rename to packages/ppx_yojson_conv/ppx_yojson_conv.v0.18~preview.130.74+175/opam
index c6300b48cc..7880b6839e 100644
--- a/packages/ppx_yojson_conv/ppx_yojson_conv.v0.18~preview.130.55+197/opam
+++ b/packages/ppx_yojson_conv/ppx_yojson_conv.v0.18~preview.130.74+175/opam
@@ -12,11 +12,11 @@ build: [
 ]
 depends: [
   "ocaml"               {>= "5.1.0"}
-  "base"                {= "v0.18~preview.130.55+197"}
-  "capitalization"      {= "v0.18~preview.130.55+197"}
-  "ppx_js_style"        {= "v0.18~preview.130.55+197"}
-  "ppx_yojson_conv_lib" {= "v0.18~preview.130.55+197"}
-  "ppxlib_jane"         {= "v0.18~preview.130.55+197"}
+  "base"                {= "v0.18~preview.130.74+175"}
+  "capitalization"      {= "v0.18~preview.130.74+175"}
+  "ppx_js_style"        {= "v0.18~preview.130.74+175"}
+  "ppx_yojson_conv_lib" {= "v0.18~preview.130.74+175"}
+  "ppxlib_jane"         {= "v0.18~preview.130.74+175"}
   "dune"                {>= "3.17.0"}
   "ppxlib"              {= "0.33.0+ox"}
 ]
diff --git a/packages/ppx_yojson_conv_lib/ppx_yojson_conv_lib.v0.18~preview.130.55+197/opam b/packages/ppx_yojson_conv_lib/ppx_yojson_conv_lib.v0.18~preview.130.74+175/opam
similarity index 100%
rename from packages/ppx_yojson_conv_lib/ppx_yojson_conv_lib.v0.18~preview.130.55+197/opam
rename to packages/ppx_yojson_conv_lib/ppx_yojson_conv_lib.v0.18~preview.130.74+175/opam
diff --git a/packages/ppxlib/ppxlib.0.33.0+ox/files/ppxlib+src+ast_builder.ml.patch b/packages/ppxlib/ppxlib.0.33.0+ox/files/ppxlib+src+ast_builder.ml.patch
index baae4da9ed..321de6c3f7 100644
--- a/packages/ppxlib/ppxlib.0.33.0+ox/files/ppxlib+src+ast_builder.ml.patch
+++ b/packages/ppxlib/ppxlib.0.33.0+ox/files/ppxlib+src+ast_builder.ml.patch
@@ -334,7 +334,7 @@
 +    val label_declaration :
 +    name:string loc ->
 +    mutable_:mutable_flag ->
-+    modalities:modality list ->
++    modalities:modalities ->
 +    type_:core_type ->
 +    label_declaration
 +
diff --git a/packages/ppxlib/ppxlib.0.33.0+ox/files/ppxlib+src+ast_builder.mli.patch b/packages/ppxlib/ppxlib.0.33.0+ox/files/ppxlib+src+ast_builder.mli.patch
index 1afbda1b43..1118cd9442 100644
--- a/packages/ppxlib/ppxlib.0.33.0+ox/files/ppxlib+src+ast_builder.mli.patch
+++ b/packages/ppxlib/ppxlib.0.33.0+ox/files/ppxlib+src+ast_builder.mli.patch
@@ -30,7 +30,7 @@
 +    val label_declaration :
 +      loc:location -> name:string loc ->
 +      mutable_:mutable_flag ->
-+      modalities:modality list ->
++      modalities:modalities ->
 +      type_:core_type ->
 +      label_declaration
    end
@@ -56,7 +56,7 @@
 +    val label_declaration :
 +      name:string loc ->
 +      mutable_:mutable_flag ->
-+      modalities:modality list ->
++      modalities:modalities ->
 +      type_:core_type ->
 +      label_declaration
    end
diff --git a/packages/ppxlib/ppxlib.0.33.0+ox/files/ppxlib+src+common.ml.patch b/packages/ppxlib/ppxlib.0.33.0+ox/files/ppxlib+src+common.ml.patch
index ac9d0d6067..e254f52cbf 100644
--- a/packages/ppxlib/ppxlib.0.33.0+ox/files/ppxlib+src+common.ml.patch
+++ b/packages/ppxlib/ppxlib.0.33.0+ox/files/ppxlib+src+common.ml.patch
@@ -62,7 +62,7 @@
 +      match ty.ptyp_desc with
 +      | Ptyp_var (_, Some jkind) -> begin
 +         match jkind.pjkind_desc with
-+         | Default | Abbreviation "value" -> false
++         | Pjk_default | Pjk_abbreviation "value" -> false
 +         | _ -> true
 +        end
 +      | _ -> false)
diff --git a/packages/ppxlib/ppxlib.0.33.0+ox/files/ppxlib+src+name.ml.patch b/packages/ppxlib/ppxlib.0.33.0+ox/files/ppxlib+src+name.ml.patch
index 5b55f34153..4050027318 100644
--- a/packages/ppxlib/ppxlib.0.33.0+ox/files/ppxlib+src+name.ml.patch
+++ b/packages/ppxlib/ppxlib.0.33.0+ox/files/ppxlib+src+name.ml.patch
@@ -1,6 +1,6 @@
 --- a/src/name.ml
 +++ b/src/name.ml
-@@ -97,8 +97,31 @@ module Allowlisted = struct
+@@ -97,8 +97,32 @@ module Allowlisted = struct
          "ocaml.warn_on_literal_pattern";
          "ocaml.warnerror";
          "ocaml.warning";
@@ -29,10 +29,11 @@
 +        "ocaml.unsafe_allow_any_mode_crossing";
 +        "ocaml.or_null_reexport";
 +        "ocaml.atomic";
++        "ocaml.llvm_backend"
        ]
  
    (* Allow list the following extensions.
-@@ -107,7 +130,16 @@ module Allowlisted = struct
+@@ -107,7 +131,17 @@ module Allowlisted = struct
       at the level of a ppx rewriter that they have been properly interpreted, so
       we just accept them anywhere.
    *)
@@ -46,11 +47,12 @@
 +      ; "ocaml.src_pos"
 +      ; "ocaml.call_pos"
 +      ; "ocaml.atomic.loc"
++      ; "ocaml.eval"
 +      ]
  
    let is_allowlisted ~kind name =
      match kind with
-@@ -166,6 +198,8 @@ module Reserved_namespaces = struct
+@@ -166,6 +200,8 @@ module Reserved_namespaces = struct
    let () = reserve "metaocaml"
    let () = reserve "ocamlformat"
    let () = reserve "ppxlib.migration"
@@ -59,7 +61,7 @@
  
    let check_not_reserved ~kind name =
      let kind, list =
-@@ -185,8 +219,13 @@ module Reserved_namespaces = struct
+@@ -185,8 +221,13 @@ module Reserved_namespaces = struct
          kind name
  end
  
diff --git a/packages/ppxlib/ppxlib.0.33.0+ox/opam b/packages/ppxlib/ppxlib.0.33.0+ox/opam
index 13a74d25c9..b1b356fa5b 100644
--- a/packages/ppxlib/ppxlib.0.33.0+ox/opam
+++ b/packages/ppxlib/ppxlib.0.33.0+ox/opam
@@ -115,11 +115,11 @@ extra-files: [
   ]
   [
     "ppxlib+src+ast_builder.ml.patch"
-    "sha256=49e607a19da6cc7f95a38157be4a31473b96426eefddb5c7aa048bafd893ef95"
+    "sha256=acdbfaf94eacacedb58d36f494ebc71d93fc7135e8d6c28eb3398c77264ac915"
   ]
   [
     "ppxlib+src+ast_builder.mli.patch"
-    "sha256=93c1d7a8d7fa5824a7ac61da6e2a35f0e661b7ea532a901b013a0dc4b03ef7f1"
+    "sha256=1fc8a974777c266e13df6cbc5af6df33182d55fc39eb5e59d6476b74fc18ef0d"
   ]
   [
     "ppxlib+src+ast_builder_intf.ml.patch"
@@ -159,7 +159,7 @@ extra-files: [
   ]
   [
     "ppxlib+src+common.ml.patch"
-    "sha256=1053b7edfffb3279e345dbfdd5222a90fcbe7e87a99e9a0f6b61dfdaaa3f0e7e"
+    "sha256=d8ed6370f9b7f14019a1b5953dac3fd63d59b9e6a963f89bafc237133a394d5f"
   ]
   [
     "ppxlib+src+common.mli.patch"
@@ -215,7 +215,7 @@ extra-files: [
   ]
   [
     "ppxlib+src+name.ml.patch"
-    "sha256=4d6b8864701a0444f0a4e3b264e2ad0d3c05b8b9cf3aee8c0c3f62cecea98989"
+    "sha256=24f89c989df15d04a0f7339600b14b627311d5ce1d8da4b74c77f00a5c3652ff"
   ]
   [
     "ppxlib+src+ppxlib.ml.patch"
diff --git a/packages/ppxlib_ast/ppxlib_ast.0.33.0+ox/files/ppxlib+ast+ast.ml.patch b/packages/ppxlib_ast/ppxlib_ast.0.33.0+ox/files/ppxlib+ast+ast.ml.patch
index 666ba87699..c8713d9c60 100644
--- a/packages/ppxlib_ast/ppxlib_ast.0.33.0+ox/files/ppxlib+ast+ast.ml.patch
+++ b/packages/ppxlib_ast/ppxlib_ast.0.33.0+ox/files/ppxlib+ast+ast.ml.patch
@@ -136,15 +136,17 @@
  
            Can only appear in the following context:
  
-@@ -242,6 +290,7 @@ and core_type_desc = Parsetree.core_type
+@@ -242,6 +290,9 @@ and core_type_desc = Parsetree.core_type
            - As the {{!value_description.pval_type} [pval_type]} field of a
              {!value_description}. *)
    | Ptyp_package of package_type  (** [(module S)]. *)
++  | Ptyp_quote of core_type (** [<[T]>] *)
++  | Ptyp_splice of core_type (** [$T] *)
 +  | Ptyp_of_kind of jkind_annotation  (** [(type : k)] *)
    | Ptyp_extension of extension  (** [\[%id\]]. *)
  
  and package_type = longident_loc * (longident_loc * core_type) list
-@@ -303,18 +352,38 @@ and pattern_desc = Parsetree.pattern_des
+@@ -303,18 +354,38 @@ and pattern_desc = Parsetree.pattern_des
  
            Other forms of interval are recognized by the parser but rejected by
            the type-checker. *)
@@ -189,7 +191,7 @@
    | Ppat_variant of label * pattern option
        (** [Ppat_variant(`A, pat)] represents:
  
-@@ -329,9 +398,23 @@ and pattern_desc = Parsetree.pattern_des
+@@ -329,9 +400,23 @@ and pattern_desc = Parsetree.pattern_des
              {{!Asttypes.closed_flag.Open} [Open]}
  
            Invariant: [n > 0] *)
@@ -215,7 +217,7 @@
    | Ppat_type of longident_loc  (** Pattern [#tconst] *)
    | Ppat_lazy of pattern  (** Pattern [lazy P] *)
    | Ppat_unpack of string option loc
-@@ -360,35 +443,33 @@ and expression_desc = Parsetree.expressi
+@@ -360,35 +445,33 @@ and expression_desc = Parsetree.expressi
    | Pexp_constant of constant
        (** Expressions constant such as [1], ['a'], ["true"], [1.0], [1l], [1L],
            [1n] *)
@@ -278,7 +280,7 @@
    | Pexp_apply of expression * (arg_label * expression) list
        (** [Pexp_apply(E0, \[(l1, E1) ; ... ; (ln, En)\])] represents
            [E0 ~l1:E1 ... ~ln:En]
-@@ -403,10 +484,24 @@ and expression_desc = Parsetree.expressi
+@@ -403,10 +486,24 @@ and expression_desc = Parsetree.expressi
        (** [match E0 with P1 -> E1 | ... | Pn -> En] *)
    | Pexp_try of expression * cases
        (** [try E0 with P1 -> E1 | ... | Pn -> En] *)
@@ -307,7 +309,7 @@
    | Pexp_construct of longident_loc * expression option
        (** [Pexp_construct(C, exp)] represents:
  
-@@ -425,10 +520,22 @@ and expression_desc = Parsetree.expressi
+@@ -425,10 +522,22 @@ and expression_desc = Parsetree.expressi
            - [{ E0 with l1=P1; ...; ln=Pn }] when [exp0] is [Some E0]
  
            Invariant: [n > 0] *)
@@ -331,7 +333,7 @@
    | Pexp_ifthenelse of expression * expression * expression option
        (** [if E1 then E2 else E3] *)
    | Pexp_sequence of expression * expression  (** [E1; E2] *)
-@@ -440,7 +547,7 @@ and expression_desc = Parsetree.expressi
+@@ -440,7 +549,7 @@ and expression_desc = Parsetree.expressi
              {{!Asttypes.direction_flag.Upto} [Upto]}
            - [for i = E1 downto E2 do E3 done] when [direction] is
              {{!Asttypes.direction_flag.Downto} [Downto]} *)
@@ -340,7 +342,7 @@
    | Pexp_coerce of expression * core_type option * core_type
        (** [Pexp_coerce(E, from, T)] represents
  
-@@ -448,7 +555,7 @@ and expression_desc = Parsetree.expressi
+@@ -448,7 +557,7 @@ and expression_desc = Parsetree.expressi
            - [(E : T0 :> T)] when [from] is [Some T0]. *)
    | Pexp_send of expression * label loc  (** [E # m] *)
    | Pexp_new of longident_loc  (** [new M.c] *)
@@ -349,7 +351,7 @@
    | Pexp_override of (label loc * expression) list
        (** [{< x1 = E1; ...; xn = En >}] *)
    | Pexp_letmodule of string option loc * module_expr * expression
-@@ -467,7 +574,8 @@ and expression_desc = Parsetree.expressi
+@@ -467,7 +576,8 @@ and expression_desc = Parsetree.expressi
            {{!class_field_kind.Cfk_concrete} [Cfk_concrete]} for methods (not
            values). *)
    | Pexp_object of class_structure  (** [object ... end] *)
@@ -359,7 +361,7 @@
    | Pexp_pack of module_expr
        (** [(module ME)].
  
-@@ -482,6 +590,15 @@ and expression_desc = Parsetree.expressi
+@@ -482,6 +592,17 @@ and expression_desc = Parsetree.expressi
            - [let* P0 = E00 and* P1 = E01 in E1] *)
    | Pexp_extension of extension  (** [\[%id\]] *)
    | Pexp_unreachable  (** [.] *)
@@ -371,11 +373,13 @@
 +          - [CLAUSES] is a series of [comprehension_clause].
 +      *)
 +  | Pexp_overwrite of expression * expression
++  | Pexp_quote of expression (** runtime metaprogramming quotations <[E]> *)
++  | Pexp_splice of expression (** runtime metaprogramming splicing $(E)  *)
 +  | Pexp_hole
  
  and case = Parsetree.case = {
    pc_lhs : pattern;
-@@ -503,11 +620,148 @@ and binding_op = Parsetree.binding_op = 
+@@ -503,11 +624,148 @@ and binding_op = Parsetree.binding_op = 
    pbop_loc : location;
  }
  
@@ -524,7 +528,7 @@
    pval_prim : string list;
    pval_attributes : attributes;  (** [... \[@@id1\] \[@@id2\]] *)
    pval_loc : location;
-@@ -530,6 +784,7 @@ and type_declaration = Parsetree.type_de
+@@ -530,6 +788,7 @@ and type_declaration = Parsetree.type_de
    ptype_private : private_flag;  (** for [= private ...] *)
    ptype_manifest : core_type option;  (** represents [= T] *)
    ptype_attributes : attributes;  (** [... \[@@id1\] \[@@id2\]] *)
@@ -532,7 +536,7 @@
    ptype_loc : location;
  }
  (** Here are type declarations and their representation, for various
-@@ -555,11 +810,13 @@ and type_kind = Parsetree.type_kind =
+@@ -555,11 +814,13 @@ and type_kind = Parsetree.type_kind =
    | Ptype_abstract
    | Ptype_variant of constructor_declaration list
    | Ptype_record of label_declaration list  (** Invariant: non-empty list *)
@@ -546,7 +550,7 @@
    pld_type : core_type;
    pld_loc : location;
    pld_attributes : attributes;  (** [l : T \[@id1\] \[@id2\]] *)
-@@ -573,15 +830,22 @@ and label_declaration = Parsetree.label_
+@@ -573,15 +834,22 @@ and label_declaration = Parsetree.label_
  
  and constructor_declaration = Parsetree.constructor_declaration = {
    pcd_name : string loc;
@@ -571,7 +575,7 @@
    | Pcstr_record of label_declaration list
        (** Values of type {!constructor_declaration} represents the constructor
            arguments of:
-@@ -621,7 +885,8 @@ and type_exception = Parsetree.type_exce
+@@ -621,7 +889,8 @@ and type_exception = Parsetree.type_exce
  (** Definition of a new exception ([exception E]). *)
  
  and extension_constructor_kind = Parsetree.extension_constructor_kind =
@@ -581,7 +585,7 @@
        (** [Pext_decl(existentials, c_args, t_opt)] describes a new extension
            constructor. It can be:
  
-@@ -647,7 +912,7 @@ and extension_constructor_kind = Parsetr
+@@ -647,7 +916,7 @@ and extension_constructor_kind = Parsetr
                - [c_args] is [\[T1; ...; Tn\]],
                - [t_opt] is [Some T0].
             }
@@ -590,7 +594,7 @@
                when
  
                - [existentials] is [\['a;...\]],
-@@ -842,22 +1107,25 @@ and module_type = Parsetree.module_type 
+@@ -842,22 +1111,25 @@ and module_type = Parsetree.module_type 
  and module_type_desc = Parsetree.module_type_desc =
    | Pmty_ident of longident_loc  (** [Pmty_ident(S)] represents [S] *)
    | Pmty_signature of signature  (** [sig ... end] *)
@@ -619,7 +623,7 @@
  
  and signature_item = Parsetree.signature_item = {
    psig_desc : signature_item_desc;
-@@ -882,17 +1150,20 @@ and signature_item_desc = Parsetree.sign
+@@ -882,17 +1154,20 @@ and signature_item_desc = Parsetree.sign
        (** [module type S = MT] and [module type S] *)
    | Psig_modtypesubst of module_type_declaration  (** [module type S :=  ...] *)
    | Psig_open of open_description  (** [open X] *)
@@ -641,7 +645,7 @@
    pmd_attributes : attributes;  (** [... \[@@id1\] \[@@id2\]] *)
    pmd_loc : location;
  }
-@@ -946,6 +1217,7 @@ and open_declaration = module_expr open_
+@@ -946,6 +1221,7 @@ and open_declaration = module_expr open_
      - [open struct ... end] *)
  
  and 'a include_infos = 'a Parsetree.include_infos = {
@@ -649,7 +653,7 @@
    pincl_mod : 'a;
    pincl_loc : location;
    pincl_attributes : attributes;
-@@ -987,9 +1259,18 @@ and module_expr_desc = Parsetree.module_
+@@ -987,9 +1263,18 @@ and module_expr_desc = Parsetree.module_
    | Pmod_functor of functor_parameter * module_expr
        (** [functor(X : MT1) -> ME] *)
    | Pmod_apply of module_expr * module_expr  (** [ME1(ME2)] *)
@@ -669,7 +673,7 @@
  
  and structure = structure_item list
  
-@@ -1028,10 +1309,13 @@ and structure_item_desc = Parsetree.stru
+@@ -1028,10 +1313,13 @@ and structure_item_desc = Parsetree.stru
    | Pstr_include of include_declaration  (** [include ME] *)
    | Pstr_attribute of attribute  (** [\[@@@id\]] *)
    | Pstr_extension of extension * attributes  (** [\[%%id\]] *)
@@ -683,17 +687,17 @@
    pvb_attributes : attributes;
    pvb_loc : location;
  }
-@@ -1044,6 +1328,19 @@ and module_binding = Parsetree.module_bi
+@@ -1044,6 +1332,19 @@ and module_binding = Parsetree.module_bi
  }
  (** Values of type [module_binding] represents [module X = ME] *)
  
 +and jkind_annotation_desc = Parsetree.jkind_annotation_desc =
-+  | Default
-+  | Abbreviation of string
-+  | Mod of jkind_annotation * modes
-+  | With of jkind_annotation * core_type * modalities
-+  | Kind_of of core_type
-+  | Product of jkind_annotation list
++  | Pjk_default
++  | Pjk_abbreviation of string
++  | Pjk_mod of jkind_annotation * modes
++  | Pjk_with of jkind_annotation * core_type * modalities
++  | Pjk_kind_of of core_type
++  | Pjk_product of jkind_annotation list
 +
 +and jkind_annotation = Parsetree.jkind_annotation =
 +  { pjkind_loc : location
@@ -703,7 +707,7 @@
  (** {1 Toplevel} *)
  (** {2 Toplevel phrases} *)
  
-@@ -1069,408 +1366,377 @@ and directive_argument_desc = Parsetree.
+@@ -1069,408 +1370,380 @@ and directive_argument_desc = Parsetree.
    | Pdir_bool of bool
  
  and cases = case list [@@deriving_inline traverse]
@@ -839,7 +843,8 @@
 +            let a = self#string a in
 +            let b = self#char b in Pconst_unboxed_integer (a, b)
 +        | Pconst_char a -> let a = self#char a in Pconst_char a
-+        | Pconst_untagged_char a -> let a = self#char a in Pconst_untagged_char a
++        | Pconst_untagged_char a ->
++            let a = self#char a in Pconst_untagged_char a
          | Pconst_string (a, b, c) ->
              let a = self#string a in
              let b = self#location b in
@@ -991,6 +996,8 @@
 +                   let b = self#option self#jkind_annotation b in (a, b)) a in
 +            let b = self#core_type b in Ptyp_poly (a, b)
 +        | Ptyp_package a -> let a = self#package_type a in Ptyp_package a
++        | Ptyp_quote a -> let a = self#core_type a in Ptyp_quote a
++        | Ptyp_splice a -> let a = self#core_type a in Ptyp_splice a
 +        | Ptyp_of_kind a -> let a = self#jkind_annotation a in Ptyp_of_kind a
 +        | Ptyp_extension a -> let a = self#extension a in Ptyp_extension a
 +    method package_type : package_type -> package_type=
@@ -1331,7 +1338,7 @@
          | Pexp_ifthenelse (a, b, c) ->
              let a = self#expression a in
              let b = self#expression b in
-@@ -1478,160 +1744,226 @@ class virtual map =
+@@ -1478,160 +1751,228 @@ class virtual map =
              Pexp_ifthenelse (a, b, c)
          | Pexp_sequence (a, b) ->
              let a = self#expression a in
@@ -1452,6 +1459,8 @@
 +        | Pexp_overwrite (a, b) ->
 +            let a = self#expression a in
 +            let b = self#expression b in Pexp_overwrite (a, b)
++        | Pexp_quote a -> let a = self#expression a in Pexp_quote a
++        | Pexp_splice a -> let a = self#expression a in Pexp_splice a
 +        | Pexp_hole -> Pexp_hole
 +    method case : case -> case=
        fun { pc_lhs; pc_guard; pc_rhs } ->
@@ -1654,7 +1663,7 @@
          let ptype_loc = self#location ptype_loc in
          {
            ptype_name;
-@@ -1641,10 +1973,10 @@ class virtual map =
+@@ -1641,10 +1982,10 @@ class virtual map =
            ptype_private;
            ptype_manifest;
            ptype_attributes;
@@ -1668,7 +1677,7 @@
        fun x ->
          match x with
          | Ptype_abstract -> Ptype_abstract
-@@ -1652,68 +1984,78 @@ class virtual map =
+@@ -1652,68 +1993,78 @@ class virtual map =
              let a = self#list self#constructor_declaration a in
              Ptype_variant a
          | Ptype_record a ->
@@ -1787,7 +1796,7 @@
          let ptyext_private = self#private_flag ptyext_private in
          let ptyext_loc = self#location ptyext_loc in
          let ptyext_attributes = self#attributes ptyext_attributes in
-@@ -1723,224 +2065,172 @@ class virtual map =
+@@ -1723,224 +2074,172 @@ class virtual map =
            ptyext_constructors;
            ptyext_private;
            ptyext_loc;
@@ -2078,7 +2087,7 @@
        fun x ->
          match x with
          | Pcf_inherit (a, b, c) ->
-@@ -1951,1090 +2241,980 @@ class virtual map =
+@@ -1951,1090 +2250,985 @@ class virtual map =
          | Pcf_val a ->
              let a =
                (fun (a, b, c) ->
@@ -2586,17 +2595,18 @@
 +      jkind_annotation_desc -> jkind_annotation_desc=
 +      fun x ->
 +        match x with
-+        | Default -> Default
-+        | Abbreviation a -> let a = self#string a in Abbreviation a
-+        | Mod (a, b) ->
++        | Pjk_default -> Pjk_default
++        | Pjk_abbreviation a -> let a = self#string a in Pjk_abbreviation a
++        | Pjk_mod (a, b) ->
 +            let a = self#jkind_annotation a in
-+            let b = self#modes b in Mod (a, b)
-+        | With (a, b, c) ->
++            let b = self#modes b in Pjk_mod (a, b)
++        | Pjk_with (a, b, c) ->
 +            let a = self#jkind_annotation a in
 +            let b = self#core_type b in
-+            let c = self#modalities c in With (a, b, c)
-+        | Kind_of a -> let a = self#core_type a in Kind_of a
-+        | Product a -> let a = self#list self#jkind_annotation a in Product a
++            let c = self#modalities c in Pjk_with (a, b, c)
++        | Pjk_kind_of a -> let a = self#core_type a in Pjk_kind_of a
++        | Pjk_product a ->
++            let a = self#list self#jkind_annotation a in Pjk_product a
 +    method jkind_annotation : jkind_annotation -> jkind_annotation=
 +      fun { pjkind_loc; pjkind_desc } ->
 +        let pjkind_loc = self#location pjkind_loc in
@@ -2873,6 +2883,8 @@
 +               a;
 +             self#core_type b)
          | Ptyp_package a -> self#package_type a
++        | Ptyp_quote a -> self#core_type a
++        | Ptyp_splice a -> self#core_type a
 +        | Ptyp_of_kind a -> self#jkind_annotation a
          | Ptyp_extension a -> self#extension a
 -
@@ -3197,6 +3209,8 @@
 +        | Pexp_stack a -> self#expression a
 +        | Pexp_comprehension a -> self#comprehension_expression a
 +        | Pexp_overwrite (a, b) -> (self#expression a; self#expression b)
++        | Pexp_quote a -> self#expression a
++        | Pexp_splice a -> self#expression a
 +        | Pexp_hole -> ()
 +    method case : case -> unit=
        fun { pc_lhs; pc_guard; pc_rhs } ->
@@ -3753,7 +3767,7 @@
          | Psig_typesubst a -> self#list self#type_declaration a
          | Psig_typext a -> self#type_extension a
          | Psig_exception a -> self#type_exception a
-@@ -3044,125 +3224,102 @@ class virtual iter =
+@@ -3044,125 +3238,102 @@ class virtual iter =
          | Psig_modtype a -> self#module_type_declaration a
          | Psig_modtypesubst a -> self#module_type_declaration a
          | Psig_open a -> self#open_description a
@@ -3925,7 +3939,7 @@
          | Pstr_typext a -> self#type_extension a
          | Pstr_exception a -> self#type_exception a
          | Pstr_module a -> self#module_binding a
-@@ -3173,159 +3330,151 @@ class virtual iter =
+@@ -3173,159 +3344,151 @@ class virtual iter =
          | Pstr_class_type a -> self#list self#class_type_declaration a
          | Pstr_include a -> self#include_declaration a
          | Pstr_attribute a -> self#attribute a
@@ -3958,13 +3972,13 @@
 +    method jkind_annotation_desc : jkind_annotation_desc -> unit=
 +      fun x ->
 +        match x with
-+        | Default -> ()
-+        | Abbreviation a -> self#string a
-+        | Mod (a, b) -> (self#jkind_annotation a; self#modes b)
-+        | With (a, b, c) ->
++        | Pjk_default -> ()
++        | Pjk_abbreviation a -> self#string a
++        | Pjk_mod (a, b) -> (self#jkind_annotation a; self#modes b)
++        | Pjk_with (a, b, c) ->
 +            (self#jkind_annotation a; self#core_type b; self#modalities c)
-+        | Kind_of a -> self#core_type a
-+        | Product a -> self#list self#jkind_annotation a
++        | Pjk_kind_of a -> self#core_type a
++        | Pjk_product a -> self#list self#jkind_annotation a
 +    method jkind_annotation : jkind_annotation -> unit=
 +      fun { pjkind_loc; pjkind_desc } ->
 +        self#location pjkind_loc; self#jkind_annotation_desc pjkind_desc
@@ -4167,7 +4181,7 @@
        fun x acc ->
          match x with
          | PStr a -> self#structure a acc
-@@ -3333,160 +3482,169 @@ class virtual ['acc] fold =
+@@ -3333,160 +3496,171 @@ class virtual ['acc] fold =
          | PTyp a -> self#core_type a acc
          | PPat (a, b) ->
              let acc = self#pattern a acc in
@@ -4253,6 +4267,8 @@
 +                a acc in
 +            let acc = self#core_type b acc in acc
          | Ptyp_package a -> self#package_type a acc
++        | Ptyp_quote a -> self#core_type a acc
++        | Ptyp_splice a -> self#core_type a acc
 +        | Ptyp_of_kind a -> self#jkind_annotation a acc
          | Ptyp_extension a -> self#extension a acc
 -
@@ -4418,7 +4434,7 @@
          | Ppat_type a -> self#longident_loc a acc
          | Ppat_lazy a -> self#pattern a acc
          | Ppat_unpack a -> self#loc (self#option self#string) a acc
-@@ -3494,574 +3652,581 @@ class virtual ['acc] fold =
+@@ -3494,574 +3668,583 @@ class virtual ['acc] fold =
          | Ppat_extension a -> self#extension a acc
          | Ppat_open (a, b) ->
              let acc = self#longident_loc a acc in
@@ -4649,6 +4665,8 @@
 +        | Pexp_overwrite (a, b) ->
 +            let acc = self#expression a acc in
 +            let acc = self#expression b acc in acc
++        | Pexp_quote a -> self#expression a acc
++        | Pexp_splice a -> self#expression a acc
 +        | Pexp_hole -> acc
 +    method case : case -> 'acc -> 'acc=
        fun { pc_lhs; pc_guard; pc_rhs } acc ->
@@ -5324,7 +5342,7 @@
          | Psig_typesubst a -> self#list self#type_declaration a acc
          | Psig_typext a -> self#type_extension a acc
          | Psig_exception a -> self#type_exception a acc
-@@ -4071,147 +4236,134 @@ class virtual ['acc] fold =
+@@ -4071,147 +4254,134 @@ class virtual ['acc] fold =
          | Psig_modtype a -> self#module_type_declaration a acc
          | Psig_modtypesubst a -> self#module_type_declaration a acc
          | Psig_open a -> self#open_description a acc
@@ -5536,7 +5554,7 @@
          | Pstr_typext a -> self#type_extension a acc
          | Pstr_exception a -> self#type_exception a acc
          | Pstr_module a -> self#module_binding a acc
-@@ -4224,1812 +4376,1951 @@ class virtual ['acc] fold =
+@@ -4224,1812 +4394,1962 @@ class virtual ['acc] fold =
          | Pstr_attribute a -> self#attribute a acc
          | Pstr_extension (a, b) ->
              let acc = self#extension a acc in
@@ -5573,17 +5591,17 @@
 +    method jkind_annotation_desc : jkind_annotation_desc -> 'acc -> 'acc=
 +      fun x acc ->
 +        match x with
-+        | Default -> acc
-+        | Abbreviation a -> self#string a acc
-+        | Mod (a, b) ->
++        | Pjk_default -> acc
++        | Pjk_abbreviation a -> self#string a acc
++        | Pjk_mod (a, b) ->
 +            let acc = self#jkind_annotation a acc in
 +            let acc = self#modes b acc in acc
-+        | With (a, b, c) ->
++        | Pjk_with (a, b, c) ->
 +            let acc = self#jkind_annotation a acc in
 +            let acc = self#core_type b acc in
 +            let acc = self#modalities c acc in acc
-+        | Kind_of a -> self#core_type a acc
-+        | Product a -> self#list self#jkind_annotation a acc
++        | Pjk_kind_of a -> self#core_type a acc
++        | Pjk_product a -> self#list self#jkind_annotation a acc
 +    method jkind_annotation : jkind_annotation -> 'acc -> 'acc=
 +      fun { pjkind_loc; pjkind_desc } acc ->
 +        let acc = self#location pjkind_loc acc in
@@ -5997,6 +6015,10 @@
 -            let a, acc = self#package_type a acc in
 -            (Ptyp_package a, acc)
 +            let (a, acc) = self#package_type a acc in ((Ptyp_package a), acc)
++        | Ptyp_quote a ->
++            let (a, acc) = self#core_type a acc in ((Ptyp_quote a), acc)
++        | Ptyp_splice a ->
++            let (a, acc) = self#core_type a acc in ((Ptyp_splice a), acc)
 +        | Ptyp_of_kind a ->
 +            let (a, acc) = self#jkind_annotation a acc in
 +            ((Ptyp_of_kind a), acc)
@@ -6579,6 +6601,10 @@
 +            let (a, acc) = self#expression a acc in
 +            let (b, acc) = self#expression b acc in
 +            ((Pexp_overwrite (a, b)), acc)
++        | Pexp_quote a ->
++            let (a, acc) = self#expression a acc in ((Pexp_quote a), acc)
++        | Pexp_splice a ->
++            let (a, acc) = self#expression a acc in ((Pexp_splice a), acc)
 +        | Pexp_hole -> (Pexp_hole, acc)
 +    method case : case -> 'acc -> (case * 'acc)=
        fun { pc_lhs; pc_guard; pc_rhs } acc ->
@@ -8062,21 +8088,22 @@
 +      jkind_annotation_desc -> 'acc -> (jkind_annotation_desc * 'acc)=
 +      fun x acc ->
 +        match x with
-+        | Default -> (Default, acc)
-+        | Abbreviation a ->
-+            let (a, acc) = self#string a acc in ((Abbreviation a), acc)
-+        | Mod (a, b) ->
++        | Pjk_default -> (Pjk_default, acc)
++        | Pjk_abbreviation a ->
++            let (a, acc) = self#string a acc in ((Pjk_abbreviation a), acc)
++        | Pjk_mod (a, b) ->
 +            let (a, acc) = self#jkind_annotation a acc in
-+            let (b, acc) = self#modes b acc in ((Mod (a, b)), acc)
-+        | With (a, b, c) ->
++            let (b, acc) = self#modes b acc in ((Pjk_mod (a, b)), acc)
++        | Pjk_with (a, b, c) ->
 +            let (a, acc) = self#jkind_annotation a acc in
 +            let (b, acc) = self#core_type b acc in
-+            let (c, acc) = self#modalities c acc in ((With (a, b, c)), acc)
-+        | Kind_of a ->
-+            let (a, acc) = self#core_type a acc in ((Kind_of a), acc)
-+        | Product a ->
++            let (c, acc) = self#modalities c acc in
++            ((Pjk_with (a, b, c)), acc)
++        | Pjk_kind_of a ->
++            let (a, acc) = self#core_type a acc in ((Pjk_kind_of a), acc)
++        | Pjk_product a ->
 +            let (a, acc) = self#list self#jkind_annotation a acc in
-+            ((Product a), acc)
++            ((Pjk_product a), acc)
 +    method jkind_annotation :
 +      jkind_annotation -> 'acc -> (jkind_annotation * 'acc)=
 +      fun { pjkind_loc; pjkind_desc } acc ->
@@ -8444,6 +8471,8 @@
 +                ctx a in
 +            let b = self#core_type ctx b in Ptyp_poly (a, b)
 +        | Ptyp_package a -> let a = self#package_type ctx a in Ptyp_package a
++        | Ptyp_quote a -> let a = self#core_type ctx a in Ptyp_quote a
++        | Ptyp_splice a -> let a = self#core_type ctx a in Ptyp_splice a
 +        | Ptyp_of_kind a ->
 +            let a = self#jkind_annotation ctx a in Ptyp_of_kind a
          | Ptyp_extension a ->
@@ -8788,7 +8817,7 @@
          | Pexp_ifthenelse (a, b, c) ->
              let a = self#expression ctx a in
              let b = self#expression ctx b in
-@@ -6037,161 +6328,239 @@ class virtual ['ctx] map_with_context =
+@@ -6037,161 +6357,242 @@ class virtual ['ctx] map_with_context =
              Pexp_ifthenelse (a, b, c)
          | Pexp_sequence (a, b) ->
              let a = self#expression ctx a in
@@ -8910,6 +8939,9 @@
 +        | Pexp_overwrite (a, b) ->
 +            let a = self#expression ctx a in
 +            let b = self#expression ctx b in Pexp_overwrite (a, b)
++        | Pexp_quote a ->
++            let a = self#expression ctx a in Pexp_quote a
++        | Pexp_splice a -> let a = self#expression ctx a in Pexp_splice a
 +        | Pexp_hole -> Pexp_hole
 +    method case : 'ctx -> case -> case=
        fun ctx { pc_lhs; pc_guard; pc_rhs } ->
@@ -9120,7 +9152,7 @@
          let ptype_loc = self#location ctx ptype_loc in
          {
            ptype_name;
-@@ -6201,10 +6570,10 @@ class virtual ['ctx] map_with_context =
+@@ -6201,10 +6602,10 @@ class virtual ['ctx] map_with_context =
            ptype_private;
            ptype_manifest;
            ptype_attributes;
@@ -9134,7 +9166,7 @@
        fun ctx x ->
          match x with
          | Ptype_abstract -> Ptype_abstract
-@@ -6212,69 +6581,80 @@ class virtual ['ctx] map_with_context =
+@@ -6212,69 +6613,80 @@ class virtual ['ctx] map_with_context =
              let a = self#list self#constructor_declaration ctx a in
              Ptype_variant a
          | Ptype_record a ->
@@ -9254,7 +9286,7 @@
          let ptyext_private = self#private_flag ctx ptyext_private in
          let ptyext_loc = self#location ctx ptyext_loc in
          let ptyext_attributes = self#attributes ctx ptyext_attributes in
-@@ -6284,225 +6664,178 @@ class virtual ['ctx] map_with_context =
+@@ -6284,225 +6696,178 @@ class virtual ['ctx] map_with_context =
            ptyext_constructors;
            ptyext_private;
            ptyext_loc;
@@ -9547,7 +9579,7 @@
        fun ctx x ->
          match x with
          | Pcf_inherit (a, b, c) ->
-@@ -6513,3873 +6846,4137 @@ class virtual ['ctx] map_with_context =
+@@ -6513,3873 +6878,4163 @@ class virtual ['ctx] map_with_context =
          | Pcf_val a ->
              let a =
                (fun ctx (a, b, c) ->
@@ -10067,18 +10099,19 @@
 -
 -    method toplevel_directive : 'ctx -> toplevel_directive -> toplevel_directive
 -        =
-+        | Default -> Default
-+        | Abbreviation a -> let a = self#string ctx a in Abbreviation a
-+        | Mod (a, b) ->
++        | Pjk_default -> Pjk_default
++        | Pjk_abbreviation a ->
++            let a = self#string ctx a in Pjk_abbreviation a
++        | Pjk_mod (a, b) ->
 +            let a = self#jkind_annotation ctx a in
-+            let b = self#modes ctx b in Mod (a, b)
-+        | With (a, b, c) ->
++            let b = self#modes ctx b in Pjk_mod (a, b)
++        | Pjk_with (a, b, c) ->
 +            let a = self#jkind_annotation ctx a in
 +            let b = self#core_type ctx b in
-+            let c = self#modalities ctx c in With (a, b, c)
-+        | Kind_of a -> let a = self#core_type ctx a in Kind_of a
-+        | Product a ->
-+            let a = self#list self#jkind_annotation ctx a in Product a
++            let c = self#modalities ctx c in Pjk_with (a, b, c)
++        | Pjk_kind_of a -> let a = self#core_type ctx a in Pjk_kind_of a
++        | Pjk_product a ->
++            let a = self#list self#jkind_annotation ctx a in Pjk_product a
 +    method jkind_annotation : 'ctx -> jkind_annotation -> jkind_annotation=
 +      fun ctx { pjkind_loc; pjkind_desc } ->
 +        let pjkind_loc = self#location ctx pjkind_loc in
@@ -10520,6 +10553,10 @@
 -            let a = self#package_type a in
 -            self#constr "Ptyp_package" [ a ]
 +            let a = self#package_type a in self#constr "Ptyp_package" [a]
++        | Ptyp_quote a ->
++            let a = self#core_type a in self#constr "Ptyp_quote" [a]
++        | Ptyp_splice a ->
++            let a = self#core_type a in self#constr "Ptyp_splice" [a]
 +        | Ptyp_of_kind a ->
 +            let a = self#jkind_annotation a in self#constr "Ptyp_of_kind" [a]
          | Ptyp_extension a ->
@@ -11035,6 +11072,10 @@
 +        | Pexp_overwrite (a, b) ->
 +            let a = self#expression a in
 +            let b = self#expression b in self#constr "Pexp_overwrite" [a; b]
++        | Pexp_quote a ->
++            let a = self#expression a in self#constr "Pexp_quote" [a]
++        | Pexp_splice a ->
++            let a = self#expression a in self#constr "Pexp_splice" [a]
 +        | Pexp_hole -> self#constr "Pexp_hole" []
 +    method case : case -> 'res=
        fun { pc_lhs; pc_guard; pc_rhs } ->
@@ -12382,20 +12423,21 @@
 +    method jkind_annotation_desc : jkind_annotation_desc -> 'res=
 +      fun x ->
 +        match x with
-+        | Default -> self#constr "Default" []
-+        | Abbreviation a ->
-+            let a = self#string a in self#constr "Abbreviation" [a]
-+        | Mod (a, b) ->
++        | Pjk_default -> self#constr "Pjk_default" []
++        | Pjk_abbreviation a ->
++            let a = self#string a in self#constr "Pjk_abbreviation" [a]
++        | Pjk_mod (a, b) ->
 +            let a = self#jkind_annotation a in
-+            let b = self#modes b in self#constr "Mod" [a; b]
-+        | With (a, b, c) ->
++            let b = self#modes b in self#constr "Pjk_mod" [a; b]
++        | Pjk_with (a, b, c) ->
 +            let a = self#jkind_annotation a in
 +            let b = self#core_type b in
-+            let c = self#modalities c in self#constr "With" [a; b; c]
-+        | Kind_of a -> let a = self#core_type a in self#constr "Kind_of" [a]
-+        | Product a ->
++            let c = self#modalities c in self#constr "Pjk_with" [a; b; c]
++        | Pjk_kind_of a ->
++            let a = self#core_type a in self#constr "Pjk_kind_of" [a]
++        | Pjk_product a ->
 +            let a = self#list self#jkind_annotation a in
-+            self#constr "Product" [a]
++            self#constr "Pjk_product" [a]
 +    method jkind_annotation : jkind_annotation -> 'res=
 +      fun { pjkind_loc; pjkind_desc } ->
 +        let pjkind_loc = self#location pjkind_loc in
@@ -12962,6 +13004,14 @@
 -              self#constr ctx "Ptyp_package" [ Stdlib.snd a ] )
 +            ((Ptyp_package (Stdlib.fst a)),
 +              (self#constr ctx "Ptyp_package" [Stdlib.snd a]))
++        | Ptyp_quote a ->
++            let a = self#core_type ctx a in
++            ((Ptyp_quote (Stdlib.fst a)),
++              (self#constr ctx "Ptyp_quote" [Stdlib.snd a]))
++        | Ptyp_splice a ->
++            let a = self#core_type ctx a in
++            ((Ptyp_splice (Stdlib.fst a)),
++              (self#constr ctx "Ptyp_splice" [Stdlib.snd a]))
 +        | Ptyp_of_kind a ->
 +            let a = self#jkind_annotation ctx a in
 +            ((Ptyp_of_kind (Stdlib.fst a)),
@@ -13750,6 +13800,14 @@
 +            let b = self#expression ctx b in
 +            ((Pexp_overwrite ((Stdlib.fst a), (Stdlib.fst b))),
 +              (self#constr ctx "Pexp_overwrite" [Stdlib.snd a; Stdlib.snd b]))
++        | Pexp_quote a ->
++            let a = self#expression ctx a in
++            ((Pexp_quote (Stdlib.fst a)),
++              (self#constr ctx "Pexp_quote" [Stdlib.snd a]))
++        | Pexp_splice a ->
++            let a = self#expression ctx a in
++            ((Pexp_splice (Stdlib.fst a)),
++              (self#constr ctx "Pexp_splice" [Stdlib.snd a]))
 +        | Pexp_hole -> (Pexp_hole, (self#constr ctx "Pexp_hole" []))
 +    method case : 'ctx -> case -> (case * 'res)=
        fun ctx { pc_lhs; pc_guard; pc_rhs } ->
@@ -15929,31 +15987,31 @@
 +      'ctx -> jkind_annotation_desc -> (jkind_annotation_desc * 'res)=
 +      fun ctx x ->
 +        match x with
-+        | Default -> (Default, (self#constr ctx "Default" []))
-+        | Abbreviation a ->
++        | Pjk_default -> (Pjk_default, (self#constr ctx "Pjk_default" []))
++        | Pjk_abbreviation a ->
 +            let a = self#string ctx a in
-+            ((Abbreviation (Stdlib.fst a)),
-+              (self#constr ctx "Abbreviation" [Stdlib.snd a]))
-+        | Mod (a, b) ->
++            ((Pjk_abbreviation (Stdlib.fst a)),
++              (self#constr ctx "Pjk_abbreviation" [Stdlib.snd a]))
++        | Pjk_mod (a, b) ->
 +            let a = self#jkind_annotation ctx a in
 +            let b = self#modes ctx b in
-+            ((Mod ((Stdlib.fst a), (Stdlib.fst b))),
-+              (self#constr ctx "Mod" [Stdlib.snd a; Stdlib.snd b]))
-+        | With (a, b, c) ->
++            ((Pjk_mod ((Stdlib.fst a), (Stdlib.fst b))),
++              (self#constr ctx "Pjk_mod" [Stdlib.snd a; Stdlib.snd b]))
++        | Pjk_with (a, b, c) ->
 +            let a = self#jkind_annotation ctx a in
 +            let b = self#core_type ctx b in
 +            let c = self#modalities ctx c in
-+            ((With ((Stdlib.fst a), (Stdlib.fst b), (Stdlib.fst c))),
-+              (self#constr ctx "With"
++            ((Pjk_with ((Stdlib.fst a), (Stdlib.fst b), (Stdlib.fst c))),
++              (self#constr ctx "Pjk_with"
 +                 [Stdlib.snd a; Stdlib.snd b; Stdlib.snd c]))
-+        | Kind_of a ->
++        | Pjk_kind_of a ->
 +            let a = self#core_type ctx a in
-+            ((Kind_of (Stdlib.fst a)),
-+              (self#constr ctx "Kind_of" [Stdlib.snd a]))
-+        | Product a ->
++            ((Pjk_kind_of (Stdlib.fst a)),
++              (self#constr ctx "Pjk_kind_of" [Stdlib.snd a]))
++        | Pjk_product a ->
 +            let a = self#list self#jkind_annotation ctx a in
-+            ((Product (Stdlib.fst a)),
-+              (self#constr ctx "Product" [Stdlib.snd a]))
++            ((Pjk_product (Stdlib.fst a)),
++              (self#constr ctx "Pjk_product" [Stdlib.snd a]))
 +    method jkind_annotation :
 +      'ctx -> jkind_annotation -> (jkind_annotation * 'res)=
 +      fun ctx { pjkind_loc; pjkind_desc } ->
diff --git a/packages/ppxlib_ast/ppxlib_ast.0.33.0+ox/files/ppxlib+ast+ast_helper_lite.ml.patch b/packages/ppxlib_ast/ppxlib_ast.0.33.0+ox/files/ppxlib+ast+ast_helper_lite.ml.patch
index ef3328ee35..a1dd01a2de 100644
--- a/packages/ppxlib_ast/ppxlib_ast.0.33.0+ox/files/ppxlib+ast+ast_helper_lite.ml.patch
+++ b/packages/ppxlib_ast/ppxlib_ast.0.33.0+ox/files/ppxlib+ast+ast_helper_lite.ml.patch
@@ -32,7 +32,7 @@
    let package ?loc ?attrs a b = mk ?loc ?attrs (Ptyp_package (a, b))
    let extension ?loc ?attrs a = mk ?loc ?attrs (Ptyp_extension a)
  
-@@ -101,39 +110,48 @@ module Typ = struct
+@@ -101,39 +110,50 @@ module Typ = struct
        if List.mem v vl then
          Location.raise_errorf ~loc "variable in scope syntax error: %s" v
      in
@@ -88,11 +88,13 @@
          | Ptyp_package (longident, lst) ->
              Ptyp_package
                (longident, List.map (fun (n, typ) -> (n, loop typ)) lst)
++        | Ptyp_quote core_type -> Ptyp_quote (loop core_type)
++        | Ptyp_splice core_type -> Ptyp_splice (loop core_type)
 +        | Ptyp_of_kind jkind -> Ptyp_of_kind jkind
          | Ptyp_extension (s, arg) -> Ptyp_extension (s, arg)
        in
        { t with ptyp_desc = desc }
-@@ -170,16 +188,17 @@ module Pat = struct
+@@ -170,16 +190,17 @@ module Pat = struct
    let alias ?loc ?attrs a b = mk ?loc ?attrs (Ppat_alias (a, b))
    let constant ?loc ?attrs a = mk ?loc ?attrs (Ppat_constant a)
    let interval ?loc ?attrs a b = mk ?loc ?attrs (Ppat_interval (a, b))
@@ -113,7 +115,7 @@
    let type_ ?loc ?attrs a = mk ?loc ?attrs (Ppat_type a)
    let lazy_ ?loc ?attrs a = mk ?loc ?attrs (Ppat_lazy a)
    let unpack ?loc ?attrs a = mk ?loc ?attrs (Ppat_unpack a)
-@@ -200,28 +219,39 @@ module Exp = struct
+@@ -200,28 +221,39 @@ module Exp = struct
    let attr d a = { d with pexp_attributes = d.pexp_attributes @ [ a ] }
    let ident ?loc ?attrs a = mk ?loc ?attrs (Pexp_ident a)
    let constant ?loc ?attrs a = mk ?loc ?attrs (Pexp_constant a)
@@ -160,7 +162,7 @@
    let override ?loc ?attrs a = mk ?loc ?attrs (Pexp_override a)
    let letmodule ?loc ?attrs a b c = mk ?loc ?attrs (Pexp_letmodule (a, b, c))
    let letexception ?loc ?attrs a b = mk ?loc ?attrs (Pexp_letexception (a, b))
-@@ -229,7 +259,7 @@ module Exp = struct
+@@ -229,7 +261,7 @@ module Exp = struct
    let lazy_ ?loc ?attrs a = mk ?loc ?attrs (Pexp_lazy a)
    let poly ?loc ?attrs a b = mk ?loc ?attrs (Pexp_poly (a, b))
    let object_ ?loc ?attrs a = mk ?loc ?attrs (Pexp_object a)
@@ -169,7 +171,7 @@
    let pack ?loc ?attrs a = mk ?loc ?attrs (Pexp_pack a)
    let open_ ?loc ?attrs a b = mk ?loc ?attrs (Pexp_open (a, b))
  
-@@ -238,10 +268,14 @@ module Exp = struct
+@@ -238,10 +270,16 @@ module Exp = struct
  
    let extension ?loc ?attrs a = mk ?loc ?attrs (Pexp_extension a)
    let unreachable ?loc ?attrs () = mk ?loc ?attrs Pexp_unreachable
@@ -180,11 +182,13 @@
      { pbop_op = op; pbop_pat = pat; pbop_exp = exp; pbop_loc = loc }
 +
 +  let overwrite ?loc ?attrs a b = mk ?loc ?attrs (Pexp_overwrite (a, b))
++  let quote ?loc ?attrs e = mk ?loc ?attrs (Pexp_quote e)
++  let splice ?loc ?attrs e = mk ?loc ?attrs (Pexp_splice e)
 +  let hole ?loc ?attrs () = mk ?loc ?attrs Pexp_hole
  end
  
  module Mty = struct
-@@ -251,8 +285,9 @@ module Mty = struct
+@@ -251,8 +289,9 @@ module Mty = struct
    let attr d a = { d with pmty_attributes = d.pmty_attributes @ [ a ] }
    let ident ?loc ?attrs a = mk ?loc ?attrs (Pmty_ident a)
    let alias ?loc ?attrs a = mk ?loc ?attrs (Pmty_alias a)
@@ -196,7 +200,7 @@
    let with_ ?loc ?attrs a b = mk ?loc ?attrs (Pmty_with (a, b))
    let typeof_ ?loc ?attrs a = mk ?loc ?attrs (Pmty_typeof a)
    let extension ?loc ?attrs a = mk ?loc ?attrs (Pmty_extension a)
-@@ -267,7 +302,7 @@ module Mod = struct
+@@ -267,7 +306,7 @@ module Mod = struct
    let structure ?loc ?attrs x = mk ?loc ?attrs (Pmod_structure x)
    let functor_ ?loc ?attrs arg body = mk ?loc ?attrs (Pmod_functor (arg, body))
    let apply ?loc ?attrs m1 m2 = mk ?loc ?attrs (Pmod_apply (m1, m2))
@@ -205,7 +209,7 @@
    let unpack ?loc ?attrs e = mk ?loc ?attrs (Pmod_unpack e)
    let extension ?loc ?attrs a = mk ?loc ?attrs (Pmod_extension a)
  end
-@@ -284,7 +319,7 @@ module Sig = struct
+@@ -284,7 +323,7 @@ module Sig = struct
    let rec_module ?loc a = mk ?loc (Psig_recmodule a)
    let modtype ?loc a = mk ?loc (Psig_modtype a)
    let open_ ?loc a = mk ?loc (Psig_open a)
@@ -214,7 +218,7 @@
    let class_ ?loc a = mk ?loc (Psig_class a)
    let class_type ?loc a = mk ?loc (Psig_class_type a)
    let extension ?loc ?(attrs = []) a = mk ?loc (Psig_extension (a, attrs))
-@@ -367,10 +402,12 @@ module Cf = struct
+@@ -367,10 +406,12 @@ module Cf = struct
  end
  
  module Val = struct
@@ -228,7 +232,7 @@
        pval_attributes = attrs;
        pval_loc = loc;
        pval_prim = prim;
-@@ -379,7 +416,7 @@ end
+@@ -379,7 +420,7 @@ end
  
  module Md = struct
    let mk ?(loc = !default_loc) ?(attrs = []) name typ =
@@ -237,7 +241,7 @@
  end
  
  module Ms = struct
-@@ -419,12 +456,12 @@ end
+@@ -419,12 +460,12 @@ end
  
  module Incl = struct
    let mk ?(loc = !default_loc) ?(attrs = []) mexpr =
@@ -252,7 +256,7 @@
  end
  
  module Ci = struct
-@@ -450,12 +487,14 @@ module Type = struct
+@@ -450,12 +491,14 @@ module Type = struct
        ptype_kind = kind;
        ptype_private = priv;
        ptype_manifest = manifest;
@@ -267,7 +271,7 @@
      {
        pcd_name = name;
        pcd_vars = vars;
-@@ -465,10 +504,12 @@ module Type = struct
+@@ -465,10 +508,12 @@ module Type = struct
        pcd_attributes = attrs;
      }
  
@@ -281,7 +285,7 @@
        pld_type = typ;
        pld_loc = loc;
        pld_attributes = attrs;
-@@ -505,6 +546,7 @@ module Te = struct
+@@ -505,6 +550,7 @@ module Te = struct
  
    let decl ?(loc = !default_loc) ?(attrs = []) ?(vars = [])
        ?(args = Pcstr_tuple []) ?res name =
diff --git a/packages/ppxlib_ast/ppxlib_ast.0.33.0+ox/files/ppxlib+ast+ast_helper_lite.mli.patch b/packages/ppxlib_ast/ppxlib_ast.0.33.0+ox/files/ppxlib+ast+ast_helper_lite.mli.patch
index 47745f3c97..793f498a81 100644
--- a/packages/ppxlib_ast/ppxlib_ast.0.33.0+ox/files/ppxlib+ast+ast_helper_lite.mli.patch
+++ b/packages/ppxlib_ast/ppxlib_ast.0.33.0+ox/files/ppxlib+ast+ast_helper_lite.mli.patch
@@ -53,7 +53,7 @@
    val setfield :
      ?loc:loc -> ?attrs:attrs -> expression -> lid -> expression -> expression
  
-@@ -264,8 +285,13 @@ module Exp : sig
+@@ -264,8 +285,15 @@ module Exp : sig
  
    val extension : ?loc:loc -> ?attrs:attrs -> extension -> expression
    val unreachable : ?loc:loc -> ?attrs:attrs -> unit -> expression
@@ -63,11 +63,13 @@
    val binding_op : str -> pattern -> expression -> loc -> binding_op
 +
 +  val overwrite : ?loc:loc -> ?attrs:attrs -> expression -> expression -> expression
++  val quote : ?loc:loc -> ?attrs:attrs -> expression -> expression
++  val splice : ?loc:loc -> ?attrs:attrs -> expression -> expression
 +  val hole : ?loc:loc -> ?attrs:attrs -> unit -> expression
  end
  
  (** Value declarations *)
-@@ -351,10 +377,10 @@ module Mty : sig
+@@ -351,10 +379,10 @@ module Mty : sig
    val attr : module_type -> attribute -> module_type
    val ident : ?loc:loc -> ?attrs:attrs -> lid -> module_type
    val alias : ?loc:loc -> ?attrs:attrs -> lid -> module_type
diff --git a/packages/ppxlib_ast/ppxlib_ast.0.33.0+ox/files/ppxlib+astlib+ast_414.ml.patch b/packages/ppxlib_ast/ppxlib_ast.0.33.0+ox/files/ppxlib+astlib+ast_414.ml.patch
index bb46b16a77..70f733aadd 100644
--- a/packages/ppxlib_ast/ppxlib_ast.0.33.0+ox/files/ppxlib+astlib+ast_414.ml.patch
+++ b/packages/ppxlib_ast/ppxlib_ast.0.33.0+ox/files/ppxlib+astlib+ast_414.ml.patch
@@ -132,15 +132,17 @@
          (** ['a1 ... 'an. T]
  
             Can only appear in the following context:
-@@ -211,6 +256,7 @@ module Parsetree = struct
+@@ -211,6 +256,9 @@ module Parsetree = struct
               {!value_description}.
             *)
      | Ptyp_package of package_type  (** [(module S)]. *)
++    | Ptyp_quote of core_type (** [<[T]>] *)
++    | Ptyp_splice of core_type (** [$T] *)
 +    | Ptyp_of_kind of jkind_annotation (** [(type : k)] *)
      | Ptyp_extension of extension  (** [[%id]]. *)
  
    and package_type = Longident.t loc * (Longident.t loc * core_type) list
-@@ -273,18 +319,36 @@ module Parsetree = struct
+@@ -273,18 +321,36 @@ module Parsetree = struct
  
               Other forms of interval are recognized by the parser
               but rejected by the type-checker. *)
@@ -182,7 +184,7 @@
             *)
      | Ppat_variant of label * pattern option
          (** [Ppat_variant(`A, pat)] represents:
-@@ -300,9 +364,23 @@ module Parsetree = struct
+@@ -300,9 +366,23 @@ module Parsetree = struct
  
             Invariant: [n > 0]
             *)
@@ -208,7 +210,7 @@
      | Ppat_type of Longident.t loc  (** Pattern [#tconst] *)
      | Ppat_lazy of pattern  (** Pattern [lazy P] *)
      | Ppat_unpack of string option loc
-@@ -334,37 +412,33 @@ module Parsetree = struct
+@@ -334,37 +414,33 @@ module Parsetree = struct
      | Pexp_constant of constant
          (** Expressions constant such as [1], ['a'], ["true"], [1.0], [1l],
                [1L], [1n] *)
@@ -272,7 +274,7 @@
      | Pexp_apply of expression * (arg_label * expression) list
          (** [Pexp_apply(E0, [(l1, E1) ; ... ; (ln, En)])]
                represents [E0 ~l1:E1 ... ~ln:En]
-@@ -380,11 +454,24 @@ module Parsetree = struct
+@@ -380,11 +456,24 @@ module Parsetree = struct
          (** [match E0 with P1 -> E1 | ... | Pn -> En] *)
      | Pexp_try of expression * case list
          (** [try E0 with P1 -> E1 | ... | Pn -> En] *)
@@ -299,7 +301,7 @@
      | Pexp_construct of Longident.t loc * expression option
          (** [Pexp_construct(C, exp)] represents:
               - [C]               when [exp] is [None],
-@@ -403,10 +490,22 @@ module Parsetree = struct
+@@ -403,10 +492,22 @@ module Parsetree = struct
  
               Invariant: [n > 0]
             *)
@@ -323,7 +325,7 @@
      | Pexp_ifthenelse of expression * expression * expression option
          (** [if E1 then E2 else E3] *)
      | Pexp_sequence of expression * expression  (** [E1; E2] *)
-@@ -418,7 +517,7 @@ module Parsetree = struct
+@@ -418,7 +519,7 @@ module Parsetree = struct
                - [for i = E1 downto E2 do E3 done]
                     when [direction] is {{!Asttypes.direction_flag.Downto}[Downto]}
             *)
@@ -332,7 +334,7 @@
      | Pexp_coerce of expression * core_type option * core_type
          (** [Pexp_coerce(E, from, T)] represents
                - [(E :> T)]      when [from] is [None],
-@@ -426,7 +525,7 @@ module Parsetree = struct
+@@ -426,7 +527,7 @@ module Parsetree = struct
             *)
      | Pexp_send of expression * label loc  (** [E # m] *)
      | Pexp_new of Longident.t loc  (** [new M.c] *)
@@ -341,7 +343,7 @@
      | Pexp_override of (label loc * expression) list
          (** [{< x1 = E1; ...; xn = En >}] *)
      | Pexp_letmodule of string option loc * module_expr * expression
-@@ -446,7 +545,7 @@ module Parsetree = struct
+@@ -446,7 +547,7 @@ module Parsetree = struct
               {{!class_field_kind.Cfk_concrete}[Cfk_concrete]} for methods (not
               values). *)
      | Pexp_object of class_structure  (** [object ... end] *)
@@ -350,7 +352,7 @@
      | Pexp_pack of module_expr
          (** [(module ME)].
  
-@@ -461,6 +560,15 @@ module Parsetree = struct
+@@ -461,6 +562,17 @@ module Parsetree = struct
                - [let* P0 = E00 and* P1 = E01 in E1] *)
      | Pexp_extension of extension  (** [[%id]] *)
      | Pexp_unreachable  (** [.] *)
@@ -362,11 +364,13 @@
 +          - [CLAUSES] is a series of [comprehension_clause].
 +      *)
 +    | Pexp_overwrite of expression * expression
++    | Pexp_quote of expression (** runtime metaprogramming quotations <[E]> *)
++    | Pexp_splice of expression (** runtime metaprogramming splicing $(E) *)
 +    | Pexp_hole
  
    and case (*IF_CURRENT = Parsetree.case *) =
      {
-@@ -485,12 +593,148 @@ module Parsetree = struct
+@@ -485,12 +597,148 @@ module Parsetree = struct
        pbop_loc : Location.t;
      }
  
@@ -515,7 +519,7 @@
        pval_prim: string list;
        pval_attributes: attributes;  (** [... [\@\@id1] [\@\@id2]] *)
        pval_loc: Location.t;
-@@ -515,6 +759,7 @@ module Parsetree = struct
+@@ -515,6 +763,7 @@ module Parsetree = struct
        ptype_private: private_flag;  (** for [= private ...] *)
        ptype_manifest: core_type option;  (** represents [= T] *)
        ptype_attributes: attributes;  (** [... [\@\@id1] [\@\@id2]] *)
@@ -523,7 +527,7 @@
        ptype_loc: Location.t;
      }
    (**
-@@ -547,12 +792,14 @@ module Parsetree = struct
+@@ -547,12 +796,14 @@ module Parsetree = struct
      | Ptype_abstract
      | Ptype_variant of constructor_declaration list
      | Ptype_record of label_declaration list  (** Invariant: non-empty list *)
@@ -538,7 +542,7 @@
        pld_type: core_type;
        pld_loc: Location.t;
        pld_attributes: attributes;  (** [l : T [\@id1] [\@id2]] *)
-@@ -571,15 +818,23 @@ module Parsetree = struct
+@@ -571,15 +822,23 @@ module Parsetree = struct
    and constructor_declaration (*IF_CURRENT = Parsetree.constructor_declaration *) =
      {
        pcd_name: string loc;
@@ -564,7 +568,7 @@
      | Pcstr_record of label_declaration list
          (** Values of type {!constructor_declaration}
        represents the constructor arguments of:
-@@ -626,7 +881,8 @@ module Parsetree = struct
+@@ -626,7 +885,8 @@ module Parsetree = struct
    (** Definition of a new exception ([exception E]). *)
  
    and extension_constructor_kind (*IF_CURRENT = Parsetree.extension_constructor_kind *) =
@@ -574,7 +578,7 @@
          (** [Pext_decl(existentials, c_args, t_opt)]
              describes a new extension constructor. It can be:
              - [C of T1 * ... * Tn] when:
-@@ -854,21 +1110,26 @@ module Parsetree = struct
+@@ -854,21 +1114,26 @@ module Parsetree = struct
    and module_type_desc (*IF_CURRENT = Parsetree.module_type_desc *) =
      | Pmty_ident of Longident.t loc  (** [Pmty_ident(S)] represents [S] *)
      | Pmty_signature of signature  (** [sig ... end] *)
@@ -604,7 +608,7 @@
  
    and signature_item (*IF_CURRENT = Parsetree.signature_item *) =
      {
-@@ -896,18 +1157,21 @@ module Parsetree = struct
+@@ -896,18 +1161,21 @@ module Parsetree = struct
      | Psig_modtypesubst of module_type_declaration
          (** [module type S :=  ...]  *)
      | Psig_open of open_description  (** [open X] *)
@@ -627,7 +631,7 @@
        pmd_attributes: attributes;  (** [... [\@\@id1] [\@\@id2]] *)
        pmd_loc: Location.t;
      }
-@@ -963,6 +1227,7 @@ module Parsetree = struct
+@@ -963,6 +1231,7 @@ module Parsetree = struct
  
    and 'a include_infos (*IF_CURRENT = 'a Parsetree.include_infos *) =
      {
@@ -635,7 +639,7 @@
        pincl_mod: 'a;
        pincl_loc: Location.t;
        pincl_attributes: attributes;
-@@ -1006,9 +1271,17 @@ module Parsetree = struct
+@@ -1006,9 +1275,17 @@ module Parsetree = struct
      | Pmod_functor of functor_parameter * module_expr
          (** [functor(X : MT1) -> ME] *)
      | Pmod_apply of module_expr * module_expr  (** [ME1(ME2)] *)
@@ -654,7 +658,7 @@
  
    and structure = structure_item list
  
-@@ -1048,11 +1321,14 @@ module Parsetree = struct
+@@ -1048,11 +1325,14 @@ module Parsetree = struct
      | Pstr_include of include_declaration  (** [include ME] *)
      | Pstr_attribute of attribute  (** [[\@\@\@id]] *)
      | Pstr_extension of extension * attributes  (** [[%%id]] *)
@@ -669,17 +673,17 @@
        pvb_attributes: attributes;
        pvb_loc: Location.t;
      }
-@@ -1066,6 +1342,20 @@ module Parsetree = struct
+@@ -1066,6 +1346,20 @@ module Parsetree = struct
      }
    (** Values of type [module_binding] represents [module X = ME] *)
  
 +  and jkind_annotation_desc (*IF_CURRENT = Parsetree.jkind_annotation_desc *) =
-+    | Default
-+    | Abbreviation of string
-+    | Mod of jkind_annotation * modes
-+    | With of jkind_annotation * core_type * modalities
-+    | Kind_of of core_type
-+    | Product of jkind_annotation list
++    | Pjk_default
++    | Pjk_abbreviation of string
++    | Pjk_mod of jkind_annotation * modes
++    | Pjk_with of jkind_annotation * core_type * modalities
++    | Pjk_kind_of of core_type
++    | Pjk_product of jkind_annotation list
 +
 +  and jkind_annotation (*IF_CURRENT = Parsetree.jkind_annotation *) =
 +    { pjkind_loc : Location.t
diff --git a/packages/ppxlib_ast/ppxlib_ast.0.33.0+ox/files/ppxlib+astlib+ast_999.ml.patch b/packages/ppxlib_ast/ppxlib_ast.0.33.0+ox/files/ppxlib+astlib+ast_999.ml.patch
index 65b1daaf5e..bdd7ef1913 100644
--- a/packages/ppxlib_ast/ppxlib_ast.0.33.0+ox/files/ppxlib+astlib+ast_999.ml.patch
+++ b/packages/ppxlib_ast/ppxlib_ast.0.33.0+ox/files/ppxlib+astlib+ast_999.ml.patch
@@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/astlib/ast_999.ml
-@@ -0,0 +1,1385 @@
+@@ -0,0 +1,1389 @@
 +module Asttypes = struct
 +  type constant (*IF_CURRENT = Asttypes.constant *) =
 +      Const_int of int
@@ -242,6 +242,8 @@
 +           *)
 +    | Ptyp_package of package_type  (** [(module S)]. *)
 +    | Ptyp_open of Longident.t loc * core_type (** [M.(T)] *)
++    | Ptyp_quote of core_type (** [<[T]>] *)
++    | Ptyp_splice of core_type (** [$T] *)
 +    | Ptyp_of_kind of jkind_annotation (** [(type : k)] *)
 +    | Ptyp_extension of extension  (** [[%id]]. *)
 +
@@ -556,6 +558,8 @@
 +          - [CLAUSES] is a series of [comprehension_clause].
 +      *)
 +    | Pexp_overwrite of expression * expression
++    | Pexp_quote of expression (** runtime metaprogramming quotations <[E]> *)
++    | Pexp_splice of expression (** runtime metaprogramming splicing $(E) *)
 +    | Pexp_hole
 +
 +  and case (*IF_CURRENT = Parsetree.case *) =
@@ -1342,12 +1346,12 @@
 +  (** Values of type [module_binding] represents [module X = ME] *)
 +
 +  and jkind_annotation_desc (*IF_CURRENT = Parsetree.jkind_annotation_desc *) =
-+    | Default
-+    | Abbreviation of string
-+    | Mod of jkind_annotation * modes
-+    | With of jkind_annotation * core_type * modalities
-+    | Kind_of of core_type
-+    | Product of jkind_annotation list
++    | Pjk_default
++    | Pjk_abbreviation of string
++    | Pjk_mod of jkind_annotation * modes
++    | Pjk_with of jkind_annotation * core_type * modalities
++    | Pjk_kind_of of core_type
++    | Pjk_product of jkind_annotation list
 +
 +  and jkind_annotation (*IF_CURRENT = Parsetree.jkind_annotation *) =
 +    { pjkind_loc : Location.t
@@ -1383,6 +1387,6 @@
 +end
 +
 +module Config = struct
-+  let ast_impl_magic_number = "Caml1999M568"
-+  let ast_intf_magic_number = "Caml1999N568"
++  let ast_impl_magic_number = "Caml1999M569"
++  let ast_intf_magic_number = "Caml1999N569"
 +end
diff --git a/packages/ppxlib_ast/ppxlib_ast.0.33.0+ox/files/ppxlib+astlib+migrate_500_999.ml.patch b/packages/ppxlib_ast/ppxlib_ast.0.33.0+ox/files/ppxlib+astlib+migrate_500_999.ml.patch
index 7c7d6bd53e..0aeb3f3ebc 100644
--- a/packages/ppxlib_ast/ppxlib_ast.0.33.0+ox/files/ppxlib+astlib+migrate_500_999.ml.patch
+++ b/packages/ppxlib_ast/ppxlib_ast.0.33.0+ox/files/ppxlib+astlib+migrate_500_999.ml.patch
@@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/astlib/migrate_500_999.ml
-@@ -0,0 +1,1686 @@
+@@ -0,0 +1,1696 @@
 +open Stdlib0
 +module From = Ast_500
 +module To = Ast_999
@@ -219,6 +219,10 @@
 +      Ast_999.Parsetree.Pexp_comprehension (copy_comprehension_expression x0)
 +  | Ast_500.Parsetree.Pexp_overwrite (x0, x1) ->
 +      Ast_999.Parsetree.Pexp_overwrite (copy_expression x0, copy_expression x1)
++  | Ast_500.Parsetree.Pexp_quote x0 ->
++      Ast_999.Parsetree.Pexp_quote (copy_expression x0)
++  | Ast_500.Parsetree.Pexp_splice x0 ->
++      Ast_999.Parsetree.Pexp_splice (copy_expression x0)
 +  | Ast_500.Parsetree.Pexp_hole ->
 +      Ast_999.Parsetree.Pexp_hole
 +
@@ -346,12 +350,12 @@
 +and copy_jkind_annotation_desc :
 +  Ast_500.Parsetree.jkind_annotation_desc -> Ast_999.Parsetree.jkind_annotation_desc =
 +  function
-+  | Default -> Default
-+  | Abbreviation x0 -> Abbreviation x0
-+  | Mod (x0, x1) -> Mod (copy_jkind_annotation x0, copy_modes x1)
-+  | With (x0, x1, x2) -> With (copy_jkind_annotation x0, copy_core_type x1, copy_modalities x2)
-+  | Kind_of x0 -> Kind_of (copy_core_type x0)
-+  | Product x0 -> Product (List.map copy_jkind_annotation x0)
++  | Pjk_default -> Pjk_default
++  | Pjk_abbreviation x0 -> Pjk_abbreviation x0
++  | Pjk_mod (x0, x1) -> Pjk_mod (copy_jkind_annotation x0, copy_modes x1)
++  | Pjk_with (x0, x1, x2) -> Pjk_with (copy_jkind_annotation x0, copy_core_type x1, copy_modalities x2)
++  | Pjk_kind_of x0 -> Pjk_kind_of (copy_core_type x0)
++  | Pjk_product x0 -> Pjk_product (List.map copy_jkind_annotation x0)
 +
 +and copy_bound_var (var, jkind) =
 +    copy_loc (fun x -> x) var, Option.map copy_jkind_annotation jkind
@@ -420,6 +424,8 @@
 +        | Ptyp_package (longident, lst) ->
 +            Ptyp_package
 +              (longident, List.map (fun (n, typ) -> (n, loop typ)) lst)
++        | Ptyp_quote core_type -> Ptyp_quote (loop core_type)
++        | Ptyp_splice core_type -> Ptyp_splice (loop core_type)
 +        | Ptyp_of_kind x1 -> Ptyp_of_kind x1
 +        | Ptyp_extension (s, arg) -> Ptyp_extension (s, arg)
 +      in
@@ -684,6 +690,10 @@
 +        (List.map copy_bound_var x0, copy_core_type x1)
 +  | Ast_500.Parsetree.Ptyp_package x0 ->
 +      Ast_999.Parsetree.Ptyp_package (copy_package_type x0)
++  | Ast_500.Parsetree.Ptyp_quote x0 ->
++      Ast_999.Parsetree.Ptyp_quote (copy_core_type x0)
++  | Ast_500.Parsetree.Ptyp_splice x0 ->
++      Ast_999.Parsetree.Ptyp_splice (copy_core_type x0)
 +  | Ast_500.Parsetree.Ptyp_of_kind x0 ->
 +      Ast_999.Parsetree.Ptyp_of_kind (copy_jkind_annotation x0)
 +  | Ast_500.Parsetree.Ptyp_extension x0 ->
diff --git a/packages/ppxlib_ast/ppxlib_ast.0.33.0+ox/files/ppxlib+astlib+migrate_999_500.ml.patch b/packages/ppxlib_ast/ppxlib_ast.0.33.0+ox/files/ppxlib+astlib+migrate_999_500.ml.patch
index 8b3ff4e1cb..47091df617 100644
--- a/packages/ppxlib_ast/ppxlib_ast.0.33.0+ox/files/ppxlib+astlib+migrate_999_500.ml.patch
+++ b/packages/ppxlib_ast/ppxlib_ast.0.33.0+ox/files/ppxlib+astlib+migrate_999_500.ml.patch
@@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/astlib/migrate_999_500.ml
-@@ -0,0 +1,1696 @@
+@@ -0,0 +1,1706 @@
 +open Stdlib0
 +module From = Ast_999
 +module To = Ast_500
@@ -209,6 +209,10 @@
 +      Ast_500.Parsetree.Pexp_comprehension (copy_comprehension_expression x0)
 +  | Ast_999.Parsetree.Pexp_overwrite (x0, x1) ->
 +      Ast_500.Parsetree.Pexp_overwrite (copy_expression x0, copy_expression x1)
++  | Ast_999.Parsetree.Pexp_quote x0 ->
++      Ast_500.Parsetree.Pexp_quote (copy_expression x0)
++  | Ast_999.Parsetree.Pexp_splice x0 ->
++      Ast_500.Parsetree.Pexp_splice (copy_expression x0)
 +  | Ast_999.Parsetree.Pexp_hole ->
 +      Ast_500.Parsetree.Pexp_hole
 +
@@ -336,12 +340,12 @@
 +and copy_jkind_annotation_desc :
 +  Ast_999.Parsetree.jkind_annotation_desc -> Ast_500.Parsetree.jkind_annotation_desc =
 +  function
-+  | Default -> Default
-+  | Abbreviation x0 -> Abbreviation x0
-+  | Mod (x0, x1) -> Mod (copy_jkind_annotation x0, copy_modes x1)
-+  | With (x0, x1, x2) -> With (copy_jkind_annotation x0, copy_core_type x1, copy_modalities x2)
-+  | Kind_of x0 -> Kind_of (copy_core_type x0)
-+  | Product x0 -> Product (List.map copy_jkind_annotation x0)
++  | Pjk_default -> Pjk_default
++  | Pjk_abbreviation x0 -> Pjk_abbreviation x0
++  | Pjk_mod (x0, x1) -> Pjk_mod (copy_jkind_annotation x0, copy_modes x1)
++  | Pjk_with (x0, x1, x2) -> Pjk_with (copy_jkind_annotation x0, copy_core_type x1, copy_modalities x2)
++  | Pjk_kind_of x0 -> Pjk_kind_of (copy_core_type x0)
++  | Pjk_product x0 -> Pjk_product (List.map copy_jkind_annotation x0)
 +
 +and copy_jkind_annotation :
 +  Ast_999.Parsetree.jkind_annotation -> Ast_500.Parsetree.jkind_annotation =
@@ -452,6 +456,8 @@
 +              | Ptyp_package (longident, lst) ->
 +                  Ptyp_package
 +                    (longident, List.map (fun (n, typ) -> (n, loop typ)) lst)
++              | Ptyp_quote core_type -> Ptyp_quote (loop core_type)
++              | Ptyp_splice core_type -> Ptyp_splice (loop core_type)
 +              | Ptyp_of_kind x1 -> Ptyp_of_kind x1
 +              | Ptyp_extension (s, arg) -> Ptyp_extension (s, arg)
 +            in
@@ -686,6 +692,10 @@
 +         copy_core_type x1)
 +  | Ast_999.Parsetree.Ptyp_package x0 ->
 +      Ast_500.Parsetree.Ptyp_package (copy_package_type x0)
++  | Ast_999.Parsetree.Ptyp_quote x0 ->
++      Ast_500.Parsetree.Ptyp_quote (copy_core_type x0)
++  | Ast_999.Parsetree.Ptyp_splice x0 ->
++      Ast_500.Parsetree.Ptyp_splice (copy_core_type x0)
 +  | Ast_999.Parsetree.Ptyp_of_kind x0 ->
 +      Ast_500.Parsetree.Ptyp_of_kind (copy_jkind_annotation x0)
 +  | Ast_999.Parsetree.Ptyp_extension x0 ->
diff --git a/packages/ppxlib_ast/ppxlib_ast.0.33.0+ox/opam b/packages/ppxlib_ast/ppxlib_ast.0.33.0+ox/opam
index e95e34066c..0a81649eec 100644
--- a/packages/ppxlib_ast/ppxlib_ast.0.33.0+ox/opam
+++ b/packages/ppxlib_ast/ppxlib_ast.0.33.0+ox/opam
@@ -94,15 +94,15 @@ extra-files: [
   ]
   [
     "ppxlib+ast+ast.ml.patch"
-    "sha256=1370418b4381e03d814ee4f379e517778ecce877272b0c6bcf39a036fc494a7a"
+    "sha256=256649e97269f4d2f55e150eb30c53310f9d75e359af8eb7b38da5c4515d8ce8"
   ]
   [
     "ppxlib+ast+ast_helper_lite.ml.patch"
-    "sha256=fcb837e075692245ec576e6a336f20de55020b128bfe5df5d3c543407b823e20"
+    "sha256=15eeb736edb93d9888008bf830dfb92b803f11525271c19a51f21f258c972328"
   ]
   [
     "ppxlib+ast+ast_helper_lite.mli.patch"
-    "sha256=ee1f7dbff5ab1bb5c2ce3635ff948b75de376d9b632d7c5f763eca09e3010cd1"
+    "sha256=1e684c100bc2fd01ca1d23c140ddb36f8fc4db57ba77d76fe8d0810fcf410b7f"
   ]
   [
     "ppxlib+ast+location_error.ml.patch"
@@ -126,7 +126,7 @@ extra-files: [
   ]
   [
     "ppxlib+astlib+ast_414.ml.patch"
-    "sha256=b5feecd4103b31e66342cb6ae70cfd72b0bccf26c9ecea414bc0b6a136eaf19e"
+    "sha256=c4b85059cabbc633a2e9e191709804d9173ece743813ab11411509ba2b9260cc"
   ]
   [
     "ppxlib+astlib+ast_500.ml.patch"
@@ -134,7 +134,7 @@ extra-files: [
   ]
   [
     "ppxlib+astlib+ast_999.ml.patch"
-    "sha256=c7ccba33220660b099d80a528d391655284bc4867c5a3aaed093dbd271afb656"
+    "sha256=0005e7f6075c5245f560eef83dc13bedfef7a5571a81839005f5aaf8ade777d3"
   ]
   [
     "ppxlib+astlib+ast_metadata.mli.patch"
@@ -154,11 +154,11 @@ extra-files: [
   ]
   [
     "ppxlib+astlib+migrate_500_999.ml.patch"
-    "sha256=36947ec4fb25f6fb39ea0787cb89b5ea032ae90134540c851493ef612cb28acd"
+    "sha256=4e40da58c1f159ee59e88e53242028c7ab5a4e6ed5d2f18db4784816634adf67"
   ]
   [
     "ppxlib+astlib+migrate_999_500.ml.patch"
-    "sha256=49ebeb191f409e642d1ff366e83518594560161d26129494cb2c63d561dc72a4"
+    "sha256=ff49f086e13725595b6ac45fae73151c4e3e5278d0e6070365e73682ada82058"
   ]
   [
     "ppxlib+astlib+parse.mli.patch"
diff --git a/packages/ppxlib_jane/ppxlib_jane.v0.18~preview.130.55+197/opam b/packages/ppxlib_jane/ppxlib_jane.v0.18~preview.130.74+175/opam
similarity index 80%
rename from packages/ppxlib_jane/ppxlib_jane.v0.18~preview.130.55+197/opam
rename to packages/ppxlib_jane/ppxlib_jane.v0.18~preview.130.74+175/opam
index ebd1a3b80e..a9de23e806 100644
--- a/packages/ppxlib_jane/ppxlib_jane.v0.18~preview.130.55+197/opam
+++ b/packages/ppxlib_jane/ppxlib_jane.v0.18~preview.130.74+175/opam
@@ -22,7 +22,7 @@ Part of the Jane Street's PPX rewriters collection.
 """
 url {
   src:
-    "https://github.com/janestreet/ppxlib_jane/archive/7897f9316b565aa2382382b72bfc809e4d6e075c.tar.gz"
+    "https://github.com/janestreet/ppxlib_jane/archive/07b7d4c8e6303213cee5abb2e060deb92e4c1731.tar.gz"
   checksum:
-    "sha256=37fe6d17b62d1eeff6b0cd1b6668eac16888dc67e6d683e0c0eeecdba1ce6145"
+    "sha256=f7add4b72f72df9f08046adf4914ff5bbcce07fcf5c0a99bacfd467ee9ff437a"
 }
diff --git a/packages/profunctor/profunctor.v0.18~preview.130.55+197/opam b/packages/profunctor/profunctor.v0.18~preview.130.74+175/opam
similarity index 87%
rename from packages/profunctor/profunctor.v0.18~preview.130.55+197/opam
rename to packages/profunctor/profunctor.v0.18~preview.130.74+175/opam
index 241507e30d..697f872439 100644
--- a/packages/profunctor/profunctor.v0.18~preview.130.55+197/opam
+++ b/packages/profunctor/profunctor.v0.18~preview.130.74+175/opam
@@ -12,9 +12,9 @@ build: [
 ]
 depends: [
   "ocaml"          {>= "5.1.0"}
-  "base"           {= "v0.18~preview.130.55+197"}
-  "ppx_jane"       {= "v0.18~preview.130.55+197"}
-  "record_builder" {= "v0.18~preview.130.55+197"}
+  "base"           {= "v0.18~preview.130.74+175"}
+  "ppx_jane"       {= "v0.18~preview.130.74+175"}
+  "record_builder" {= "v0.18~preview.130.74+175"}
   "dune"           {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/protocol_version_header/protocol_version_header.v0.18~preview.130.55+197/opam b/packages/protocol_version_header/protocol_version_header.v0.18~preview.130.74+175/opam
similarity index 77%
rename from packages/protocol_version_header/protocol_version_header.v0.18~preview.130.55+197/opam
rename to packages/protocol_version_header/protocol_version_header.v0.18~preview.130.74+175/opam
index 2545061999..76fbe35a1f 100644
--- a/packages/protocol_version_header/protocol_version_header.v0.18~preview.130.55+197/opam
+++ b/packages/protocol_version_header/protocol_version_header.v0.18~preview.130.74+175/opam
@@ -12,9 +12,9 @@ build: [
 ]
 depends: [
   "ocaml"              {>= "5.1.0"}
-  "core"               {= "v0.18~preview.130.55+197"}
-  "ppx_jane"           {= "v0.18~preview.130.55+197"}
-  "ppx_stable_witness" {= "v0.18~preview.130.55+197"}
+  "core"               {= "v0.18~preview.130.74+175"}
+  "ppx_jane"           {= "v0.18~preview.130.74+175"}
+  "ppx_stable_witness" {= "v0.18~preview.130.74+175"}
   "dune"               {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -27,7 +27,7 @@ to a service while using the wrong protocol.
 """
 url {
   src:
-    "https://github.com/janestreet/protocol_version_header/archive/616032123173f6dc8be27e9c4fc3d0920b69aa21.tar.gz"
+    "https://github.com/janestreet/protocol_version_header/archive/32d373373e41f36a142fe73b7ee3b3278aa15cbe.tar.gz"
   checksum:
-    "sha256=318ceec08139b1c3492fb98432cb5ba5451ae4f24b4ab5980df176c2ae4f8783"
+    "sha256=098e6048e838f906b5d74aa512011f2ec26e5bb913a070dd86be2294159a4ec8"
 }
diff --git a/packages/re2/re2.v0.18~preview.130.55+197/opam b/packages/re2/re2.v0.18~preview.130.74+175/opam
similarity index 57%
rename from packages/re2/re2.v0.18~preview.130.55+197/opam
rename to packages/re2/re2.v0.18~preview.130.74+175/opam
index 24a1b9d58c..43bfa34bc3 100644
--- a/packages/re2/re2.v0.18~preview.130.55+197/opam
+++ b/packages/re2/re2.v0.18~preview.130.74+175/opam
@@ -11,12 +11,12 @@ build: [
 ]
 depends: [
   "ocaml"              {>= "5.1.0"}
-  "core"               {= "v0.18~preview.130.55+197"}
-  "jane_rope"          {= "v0.18~preview.130.55+197"}
-  "ppx_jane"           {= "v0.18~preview.130.55+197"}
-  "ppx_stable_witness" {= "v0.18~preview.130.55+197"}
-  "regex_parser_intf"  {= "v0.18~preview.130.55+197"}
-  "conf-g++"           {build}
+  "core"               {= "v0.18~preview.130.74+175"}
+  "jane_rope"          {= "v0.18~preview.130.74+175"}
+  "ppx_jane"           {= "v0.18~preview.130.74+175"}
+  "ppx_stable_witness" {= "v0.18~preview.130.74+175"}
+  "regex_parser_intf"  {= "v0.18~preview.130.74+175"}
+  "conf-c++"
   "dune"               {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -25,7 +25,7 @@ description: """
 """
 url {
   src:
-    "https://github.com/janestreet/re2/archive/d3717cc69361b205bd6f6e3438a2dc830d77a938.tar.gz"
+    "https://github.com/janestreet/re2/archive/cf38b5a49d76713b81e5005591d57df468cebdb2.tar.gz"
   checksum:
-    "sha256=347fd1546b27dff20844e60ccc1479eb3bb5b7af6cbccdb34d9e9961bb36eb0b"
+    "sha256=c3cf562eccbaeb9307a07791c01b6d43bb2d50533dac88eec0b5205f3535fd97"
 }
diff --git a/packages/re_parser/re_parser.v0.18~preview.130.55+197/opam b/packages/re_parser/re_parser.v0.18~preview.130.74+175/opam
similarity index 90%
rename from packages/re_parser/re_parser.v0.18~preview.130.55+197/opam
rename to packages/re_parser/re_parser.v0.18~preview.130.74+175/opam
index 97728e7e3b..07e2c83a73 100644
--- a/packages/re_parser/re_parser.v0.18~preview.130.55+197/opam
+++ b/packages/re_parser/re_parser.v0.18~preview.130.74+175/opam
@@ -12,8 +12,8 @@ build: [
 ]
 depends: [
   "ocaml"             {>= "5.1.0"}
-  "base"              {= "v0.18~preview.130.55+197"}
-  "regex_parser_intf" {= "v0.18~preview.130.55+197"}
+  "base"              {= "v0.18~preview.130.74+175"}
+  "regex_parser_intf" {= "v0.18~preview.130.74+175"}
   "dune"              {>= "3.17.0"}
   "re"                {= "1.14.0+ox"}
 ]
diff --git a/packages/record_builder/record_builder.v0.18~preview.130.55+197/opam b/packages/record_builder/record_builder.v0.18~preview.130.74+175/opam
similarity index 93%
rename from packages/record_builder/record_builder.v0.18~preview.130.55+197/opam
rename to packages/record_builder/record_builder.v0.18~preview.130.74+175/opam
index d3a46c6d50..ae2be58b16 100644
--- a/packages/record_builder/record_builder.v0.18~preview.130.55+197/opam
+++ b/packages/record_builder/record_builder.v0.18~preview.130.74+175/opam
@@ -12,8 +12,8 @@ build: [
 ]
 depends: [
   "ocaml"    {>= "5.1.0"}
-  "base"     {= "v0.18~preview.130.55+197"}
-  "ppx_jane" {= "v0.18~preview.130.55+197"}
+  "base"     {= "v0.18~preview.130.74+175"}
+  "ppx_jane" {= "v0.18~preview.130.74+175"}
   "dune"     {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/redis-async/redis-async.v0.18~preview.130.55+197/opam b/packages/redis-async/redis-async.v0.18~preview.130.74+175/opam
similarity index 67%
rename from packages/redis-async/redis-async.v0.18~preview.130.55+197/opam
rename to packages/redis-async/redis-async.v0.18~preview.130.74+175/opam
index 925e71a299..0bb53ddc38 100644
--- a/packages/redis-async/redis-async.v0.18~preview.130.55+197/opam
+++ b/packages/redis-async/redis-async.v0.18~preview.130.74+175/opam
@@ -12,11 +12,11 @@ build: [
 ]
 depends: [
   "ocaml"       {>= "5.1.0"}
-  "async"       {= "v0.18~preview.130.55+197"}
-  "bignum"      {= "v0.18~preview.130.55+197"}
-  "core"        {= "v0.18~preview.130.55+197"}
-  "core_kernel" {= "v0.18~preview.130.55+197"}
-  "ppx_jane"    {= "v0.18~preview.130.55+197"}
+  "async"       {= "v0.18~preview.130.74+175"}
+  "bignum"      {= "v0.18~preview.130.74+175"}
+  "core"        {= "v0.18~preview.130.74+175"}
+  "core_kernel" {= "v0.18~preview.130.74+175"}
+  "ppx_jane"    {= "v0.18~preview.130.74+175"}
   "dune"        {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -31,7 +31,7 @@ Supports client tracking and internally uses the RESP3 protocol.
 """
 url {
   src:
-    "https://github.com/janestreet/redis-async/archive/9830ef5ac10090624f35ae2506ef23f5507b3f2c.tar.gz"
+    "https://github.com/janestreet/redis-async/archive/2cc42b8226799c5e975dbe103b20f4ca3042ddde.tar.gz"
   checksum:
-    "sha256=8ff5215b43cbfa15866c294712a57dce965f445d2456eb29345587032b0fec67"
+    "sha256=57c56a0b06a761f4c6bf4a6cfe0d9d4e4d7b737860e54002a9d7961f7cdf5187"
 }
diff --git a/packages/regex_parser_intf/regex_parser_intf.v0.18~preview.130.55+197/opam b/packages/regex_parser_intf/regex_parser_intf.v0.18~preview.130.74+175/opam
similarity index 95%
rename from packages/regex_parser_intf/regex_parser_intf.v0.18~preview.130.55+197/opam
rename to packages/regex_parser_intf/regex_parser_intf.v0.18~preview.130.74+175/opam
index 38f379c6ab..c5ae77bf9b 100644
--- a/packages/regex_parser_intf/regex_parser_intf.v0.18~preview.130.55+197/opam
+++ b/packages/regex_parser_intf/regex_parser_intf.v0.18~preview.130.74+175/opam
@@ -12,7 +12,7 @@ build: [
 ]
 depends: [
   "ocaml" {>= "5.1.0"}
-  "base"  {= "v0.18~preview.130.55+197"}
+  "base"  {= "v0.18~preview.130.74+175"}
   "dune"  {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/resource_cache/resource_cache.v0.18~preview.130.55+197/opam b/packages/resource_cache/resource_cache.v0.18~preview.130.74+175/opam
similarity index 67%
rename from packages/resource_cache/resource_cache.v0.18~preview.130.55+197/opam
rename to packages/resource_cache/resource_cache.v0.18~preview.130.74+175/opam
index 4c2a5f6027..057e0bbf23 100644
--- a/packages/resource_cache/resource_cache.v0.18~preview.130.55+197/opam
+++ b/packages/resource_cache/resource_cache.v0.18~preview.130.74+175/opam
@@ -12,10 +12,10 @@ build: [
 ]
 depends: [
   "ocaml"            {>= "5.1.0"}
-  "async_kernel"     {= "v0.18~preview.130.55+197"}
-  "async_rpc_kernel" {= "v0.18~preview.130.55+197"}
-  "core"             {= "v0.18~preview.130.55+197"}
-  "ppx_jane"         {= "v0.18~preview.130.55+197"}
+  "async_kernel"     {= "v0.18~preview.130.74+175"}
+  "async_rpc_kernel" {= "v0.18~preview.130.74+175"}
+  "core"             {= "v0.18~preview.130.74+175"}
+  "ppx_jane"         {= "v0.18~preview.130.74+175"}
   "dune"             {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -27,7 +27,7 @@ obeying various limits.
 """
 url {
   src:
-    "https://github.com/janestreet/resource_cache/archive/9213f7471ee2267964244d6302be211eda7bc922.tar.gz"
+    "https://github.com/janestreet/resource_cache/archive/776e817b0c4c82aa95d672519dbf7e8b915dc99b.tar.gz"
   checksum:
-    "sha256=5a6059417c7cac0efdae75b37343e91a6b4e30a5c2ee7d1ac9b329ee4435a738"
+    "sha256=2510d3da1ee3a5228edac60fb6a669d95f54a3b0c6e9b869b7498a7b1205b770"
 }
diff --git a/packages/rpc_parallel/rpc_parallel.v0.18~preview.130.55+197/opam b/packages/rpc_parallel/rpc_parallel.v0.18~preview.130.74+175/opam
similarity index 61%
rename from packages/rpc_parallel/rpc_parallel.v0.18~preview.130.55+197/opam
rename to packages/rpc_parallel/rpc_parallel.v0.18~preview.130.74+175/opam
index 519a8ea689..ccc5739b08 100644
--- a/packages/rpc_parallel/rpc_parallel.v0.18~preview.130.55+197/opam
+++ b/packages/rpc_parallel/rpc_parallel.v0.18~preview.130.74+175/opam
@@ -12,12 +12,13 @@ build: [
 ]
 depends: [
   "ocaml"       {>= "5.1.0"}
-  "async"       {= "v0.18~preview.130.55+197"}
-  "core"        {= "v0.18~preview.130.55+197"}
-  "core_kernel" {= "v0.18~preview.130.55+197"}
-  "core_unix"   {= "v0.18~preview.130.55+197"}
-  "ppx_jane"    {= "v0.18~preview.130.55+197"}
-  "sexplib"     {= "v0.18~preview.130.55+197"}
+  "async"       {= "v0.18~preview.130.74+175"}
+  "core"        {= "v0.18~preview.130.74+175"}
+  "core_kernel" {= "v0.18~preview.130.74+175"}
+  "core_unix"   {= "v0.18~preview.130.74+175"}
+  "current_exe" {= "v0.18~preview.130.74+175"}
+  "ppx_jane"    {= "v0.18~preview.130.74+175"}
+  "sexplib"     {= "v0.18~preview.130.74+175"}
   "dune"        {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -30,7 +31,7 @@ Async Rpc.
 """
 url {
   src:
-    "https://github.com/janestreet/rpc_parallel/archive/174365cb976dd4708d3234f355c19b00817d7925.tar.gz"
+    "https://github.com/janestreet/rpc_parallel/archive/fcaac378b7ce6f39cf6c905e244b8f0a3ec69602.tar.gz"
   checksum:
-    "sha256=8f3c28526ab0cb2cf85685996fb409056975ad5491ac2c6a8ebe59633e8a455e"
+    "sha256=221adc4d83d5535315cfe96ab12cd8399da83f0242dc8e6c270293d1352478b0"
 }
diff --git a/packages/sedlex/sedlex.3.6+ox/files/sedlex+syntax+ppx_sedlex.ml.patch b/packages/sedlex/sedlex.3.6+ox/files/sedlex+syntax+ppx_sedlex.ml.patch
new file mode 100644
index 0000000000..509a1bb8fa
--- /dev/null
+++ b/packages/sedlex/sedlex.3.6+ox/files/sedlex+syntax+ppx_sedlex.ml.patch
@@ -0,0 +1,116 @@
+--- a/src/syntax/ppx_sedlex.ml
++++ b/src/syntax/ppx_sedlex.ml
+@@ -4,7 +4,6 @@
+ 
+ open Ppxlib
+ open Ast_builder.Default
+-open Ast_helper
+ 
+ (* let ocaml_version = Versions.ocaml_408 *)
+ 
+@@ -232,7 +231,8 @@ let gen_state (lexbuf_name, lexbuf) auto
+     [
+       value_binding ~loc
+         ~pat:(pvar ~loc (state_fun i))
+-        ~expr:(Exp.fun_ ~loc Nolabel None lhs body);
++        ~expr:(
++          Ppxlib_jane.Ast_builder.Default.add_fun_param ~loc Nolabel None lhs body);
+     ]
+   in
+   match best_final final with
+@@ -335,7 +335,7 @@ let regexp_of_pattern env =
+   let rec char_pair_op func name ~encoding p tuple =
+     (* Construct something like Sub(a,b) *)
+       match tuple with
+-      | Some { ppat_desc = Ppat_tuple [p0; p1] } -> begin
++      | Some { ppat_desc = Ppat_tuple ([None, p0; None, p1], Closed) } -> begin
+           match func (aux ~encoding p0) (aux ~encoding p1) with
+             | Some r -> r
+             | None ->
+@@ -351,10 +351,14 @@ let regexp_of_pattern env =
+     (* interpret one pattern node *)
+       match p.ppat_desc with
+       | Ppat_or (p1, p2) -> Sedlex.alt (aux ~encoding p1) (aux ~encoding p2)
+-      | Ppat_tuple (p :: pl) ->
+-          List.fold_left
+-            (fun r p -> Sedlex.seq r (aux ~encoding p))
+-            (aux ~encoding p) pl
++      | Ppat_tuple (labeled_pl, Closed) ->
++        (match Ppxlib_jane.as_unlabeled_tuple labeled_pl with
++         | Some (p :: pl) ->
++            List.fold_left
++              (fun r p -> Sedlex.seq r (aux ~encoding p))
++              (aux ~encoding p) pl
++         | Some [] -> err p.ppat_loc "empty tuple unexpected"
++         | None -> err p.ppat_loc "labeled tuples not allowed in regexps")
+       | Ppat_construct ({ txt = Lident "Star" }, Some (_, p)) ->
+           Sedlex.rep (aux ~encoding p)
+       | Ppat_construct ({ txt = Lident "Plus" }, Some (_, p)) ->
+@@ -372,13 +376,13 @@ let regexp_of_pattern env =
+                 {
+                   ppat_desc =
+                     Ppat_tuple
+-                      [
+-                        p0;
+-                        {
++                      ([
++                        None, p0;
++                        None, {
+                           ppat_desc =
+                             Ppat_constant (i1 as i2) | Ppat_interval (i1, i2);
+                         };
+-                      ];
++                      ], Closed);
+                 } ) ) -> begin
+           match (i1, i2) with
+             | Pconst_integer (i1, _), Pconst_integer (i2, _) ->
+@@ -471,6 +475,13 @@ let previous = ref []
+ let regexps = ref []
+ let should_set_cookies = ref false
+ 
++let loc_ghoster =
++  object
++    inherit Ast_traverse.map as super
++    method! location location = super#location { location with loc_ghost = true }
++  end
++;;
++
+ let mapper =
+   object (this)
+     inherit Ast_traverse.map as super
+@@ -509,13 +520,13 @@ let mapper =
+                       err e.pexp_loc "'when' guards are not supported")
+                 cases
+             in
+-            gen_definition lexbuf cases error
++            loc_ghoster#expression @@ gen_definition lexbuf cases error
+         | [%expr
+             let [%p? { ppat_desc = Ppat_var { txt = name } }] =
+               [%sedlex.regexp? [%p? p]]
+             in
+             [%e? body]] ->
+-            (this#define_regexp name p)#expression body
++            loc_ghoster#expression @@ (this#define_regexp name p)#expression body
+         | [%expr [%sedlex [%e? _]]] ->
+             err e.pexp_loc
+               "the %%sedlex extension is only recognized on match expressions"
+@@ -549,7 +560,7 @@ let mapper =
+         let tables = List.map table (get_tables ()) in
+         regexps := regexps';
+         should_set_cookies := true;
+-        tables @ parts @ l)
++        loc_ghoster#structure (tables @ parts) @ l)
+       else fst (this#structure_with_regexps l)
+   end
+ 
+@@ -570,7 +581,9 @@ let extensions =
+   [
+     Extension.declare "sedlex" Extension.Context.expression
+       Ast_pattern.(single_expr_payload __)
+-      (fun ~loc:_ ~path:_ expr -> mapper#expression expr);
++      (fun ~loc:_ ~path:_ expr ->
++        let output = mapper#expression expr in
++        loc_ghoster#expression output);
+   ]
+ 
+ let () =
diff --git a/packages/sedlex/sedlex.3.6+ox/opam b/packages/sedlex/sedlex.3.6+ox/opam
new file mode 100644
index 0000000000..fa7e0cbaee
--- /dev/null
+++ b/packages/sedlex/sedlex.3.6+ox/opam
@@ -0,0 +1,56 @@
+opam-version: "2.0"
+version: "3.6+ox"
+name: "sedlex"
+synopsis: "An OCaml lexer generator for Unicode"
+description: """\
+sedlex is a lexer generator for OCaml. It is similar to ocamllex, but supports
+Unicode. Unlike ocamllex, sedlex allows lexer specifications within regular
+OCaml source files. Lexing specific constructs are provided via a ppx syntax
+extension."""
+maintainer: "Alain Frisch <alain.frisch@lexifi.com>"
+authors: [
+  "Alain Frisch <alain.frisch@lexifi.com>"
+  "https://github.com/ocaml-community/sedlex/graphs/contributors"
+]
+license: "MIT"
+homepage: "https://github.com/ocaml-community/sedlex"
+doc: "https://ocaml-community.github.io/sedlex/index.html"
+bug-reports: "https://github.com/ocaml-community/sedlex/issues"
+depends: [
+  "ocaml"      {>= "4.08"}
+  "dune"       {>= "3.0"}
+  "ppxlib"     {= "0.33.0+ox"}
+  "gen"
+  "ppx_expect" {with-test}
+  "odoc"       {with-doc}
+]
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+]
+dev-repo: "git+https://github.com/ocaml-community/sedlex.git"
+url {
+  src:
+    "https://github.com/ocaml-community/sedlex/archive/refs/tags/v3.6.tar.gz"
+  checksum: [
+    "md5=ad2d0ec91d20171d3a7161a0cc0c2e6a"
+    "sha512=f3062175e9914b692426ddad215efe2d8f3d269a648f1faf86771d56452d8dbd7edb040409773a19e77bd21e4143281dff94a6800ddb7d5fb50170ab5616c63b"
+  ]
+}
+patches: ["sedlex+syntax+ppx_sedlex.ml.patch"]
+extra-files: [
+  [
+    "sedlex+syntax+ppx_sedlex.ml.patch"
+    "sha256=08231e9b4a12d7ce662031b104c91f2765be67da114ea26891a656e254a3e075"
+  ]
+]
diff --git a/packages/semantic_version/semantic_version.v0.18~preview.130.55+197/opam b/packages/semantic_version/semantic_version.v0.18~preview.130.74+175/opam
similarity index 91%
rename from packages/semantic_version/semantic_version.v0.18~preview.130.55+197/opam
rename to packages/semantic_version/semantic_version.v0.18~preview.130.74+175/opam
index 72b52220bd..891c1be837 100644
--- a/packages/semantic_version/semantic_version.v0.18~preview.130.55+197/opam
+++ b/packages/semantic_version/semantic_version.v0.18~preview.130.74+175/opam
@@ -12,8 +12,8 @@ build: [
 ]
 depends: [
   "ocaml"    {>= "5.1.0"}
-  "core"     {= "v0.18~preview.130.55+197"}
-  "ppx_jane" {= "v0.18~preview.130.55+197"}
+  "core"     {= "v0.18~preview.130.74+175"}
+  "ppx_jane" {= "v0.18~preview.130.74+175"}
   "dune"     {>= "3.17.0"}
   "re"       {= "1.14.0+ox"}
 ]
diff --git a/packages/sequencer_table/sequencer_table.v0.18~preview.130.55+197/opam b/packages/sequencer_table/sequencer_table.v0.18~preview.130.74+175/opam
similarity index 68%
rename from packages/sequencer_table/sequencer_table.v0.18~preview.130.55+197/opam
rename to packages/sequencer_table/sequencer_table.v0.18~preview.130.74+175/opam
index 499540af03..64c73d4fb1 100644
--- a/packages/sequencer_table/sequencer_table.v0.18~preview.130.55+197/opam
+++ b/packages/sequencer_table/sequencer_table.v0.18~preview.130.74+175/opam
@@ -12,9 +12,9 @@ build: [
 ]
 depends: [
   "ocaml"        {>= "5.1.0"}
-  "async_kernel" {= "v0.18~preview.130.55+197"}
-  "core"         {= "v0.18~preview.130.55+197"}
-  "ppx_jane"     {= "v0.18~preview.130.55+197"}
+  "async_kernel" {= "v0.18~preview.130.74+175"}
+  "core"         {= "v0.18~preview.130.74+175"}
+  "ppx_jane"     {= "v0.18~preview.130.74+175"}
   "dune"         {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -24,7 +24,7 @@ A single-module library for a data structure.
 """
 url {
   src:
-    "https://github.com/janestreet/sequencer_table/archive/1545b5a6ebfcd80f460fd983527934c4d1b63848.tar.gz"
+    "https://github.com/janestreet/sequencer_table/archive/29e360eb53d476301bcfd8994018f07d8b2d1869.tar.gz"
   checksum:
-    "sha256=a802ba92a69d16182f3f4e7409722c8b45425dc40e38ae16316599ca30370dcf"
+    "sha256=205a27ef231a51b8378fee7640075c91261e829adcc8e98fa15b65df36699ffd"
 }
diff --git a/packages/sexp/sexp.v0.18~preview.130.55+197/opam b/packages/sexp/sexp.v0.18~preview.130.55+197/opam
deleted file mode 100644
index 27a46e2715..0000000000
--- a/packages/sexp/sexp.v0.18~preview.130.55+197/opam
+++ /dev/null
@@ -1,46 +0,0 @@
-opam-version: "2.0"
-maintainer: "Jane Street developers"
-authors: ["Jane Street Group, LLC"]
-homepage: "https://github.com/janestreet/sexp"
-bug-reports: "https://github.com/janestreet/sexp/issues"
-dev-repo: "git+https://github.com/janestreet/sexp.git"
-doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/sexp/index.html"
-license: "MIT"
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-]
-depends: [
-  "ocaml"       {>= "5.1.0"}
-  "async"       {= "v0.18~preview.130.55+197"}
-  "base"        {= "v0.18~preview.130.55+197"}
-  "core"        {= "v0.18~preview.130.55+197"}
-  "core_kernel" {= "v0.18~preview.130.55+197"}
-  "core_unix"   {= "v0.18~preview.130.55+197"}
-  "csvfields"   {= "v0.18~preview.130.55+197"}
-  "jsonaf"      {= "v0.18~preview.130.55+197"}
-  "parsexp"     {= "v0.18~preview.130.55+197"}
-  "ppx_jane"    {= "v0.18~preview.130.55+197"}
-  "re2"         {= "v0.18~preview.130.55+197"}
-  "sexp_diff"   {= "v0.18~preview.130.55+197"}
-  "sexp_macro"  {= "v0.18~preview.130.55+197"}
-  "sexp_pretty" {= "v0.18~preview.130.55+197"}
-  "sexp_select" {= "v0.18~preview.130.55+197"}
-  "sexplib"     {= "v0.18~preview.130.55+197"}
-  "shell"       {= "v0.18~preview.130.55+197"}
-  "angstrom"    {>= "0.15.0"}
-  "dune"        {>= "3.17.0"}
-  "uri"         {>= "3.0.0"}
-]
-available: arch != "arm32" & arch != "x86_32"
-synopsis: "S-expression swiss knife"
-description: """
-A suite of tools for working with s-expressions from the command line.
-It contains subcommands for pretty printing, querying, and modifying
-sexps, as well as some conversions to and from other formats.
-"""
-url {
-  src:
-    "https://github.com/janestreet/sexp/archive/c98d3a53dc4711126031cb66d4f5370a906b762b.tar.gz"
-  checksum:
-    "sha256=eb5d193ae4abc36302728d64da6df861269f07b2b7d43107f8be89d67fcaa986"
-}
diff --git a/packages/sexp/sexp.v0.18~preview.130.74+175/opam b/packages/sexp/sexp.v0.18~preview.130.74+175/opam
new file mode 100644
index 0000000000..0d29f06dbc
--- /dev/null
+++ b/packages/sexp/sexp.v0.18~preview.130.74+175/opam
@@ -0,0 +1,46 @@
+opam-version: "2.0"
+maintainer: "Jane Street developers"
+authors: ["Jane Street Group, LLC"]
+homepage: "https://github.com/janestreet/sexp"
+bug-reports: "https://github.com/janestreet/sexp/issues"
+dev-repo: "git+https://github.com/janestreet/sexp.git"
+doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/sexp/index.html"
+license: "MIT"
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+]
+depends: [
+  "ocaml"       {>= "5.1.0"}
+  "async"       {= "v0.18~preview.130.74+175"}
+  "base"        {= "v0.18~preview.130.74+175"}
+  "core"        {= "v0.18~preview.130.74+175"}
+  "core_kernel" {= "v0.18~preview.130.74+175"}
+  "core_unix"   {= "v0.18~preview.130.74+175"}
+  "csvfields"   {= "v0.18~preview.130.74+175"}
+  "jsonaf"      {= "v0.18~preview.130.74+175"}
+  "parsexp"     {= "v0.18~preview.130.74+175"}
+  "ppx_jane"    {= "v0.18~preview.130.74+175"}
+  "re2"         {= "v0.18~preview.130.74+175"}
+  "sexp_diff"   {= "v0.18~preview.130.74+175"}
+  "sexp_macro"  {= "v0.18~preview.130.74+175"}
+  "sexp_pretty" {= "v0.18~preview.130.74+175"}
+  "sexp_select" {= "v0.18~preview.130.74+175"}
+  "sexplib"     {= "v0.18~preview.130.74+175"}
+  "shell"       {= "v0.18~preview.130.74+175"}
+  "angstrom"    {>= "0.15.0"}
+  "dune"        {>= "3.17.0"}
+  "uri"         {>= "3.0.0"}
+]
+available: arch != "arm32" & arch != "x86_32"
+synopsis: "S-expression swiss knife"
+description: """
+A suite of tools for working with s-expressions from the command line.
+It contains subcommands for pretty printing, querying, and modifying
+sexps, as well as some conversions to and from other formats.
+"""
+url {
+  src:
+    "https://github.com/janestreet/sexp/archive/e612de967b197167371e5b4d87be0fe118c4958e.tar.gz"
+  checksum:
+    "sha256=ad48b769ef5e113c5373f4638022c85325ab77ffbd5936b02ecec3fdaa46bb41"
+}
diff --git a/packages/sexp_diff/sexp_diff.v0.18~preview.130.55+197/opam b/packages/sexp_diff/sexp_diff.v0.18~preview.130.74+175/opam
similarity index 91%
rename from packages/sexp_diff/sexp_diff.v0.18~preview.130.55+197/opam
rename to packages/sexp_diff/sexp_diff.v0.18~preview.130.74+175/opam
index fc8b8dd3a3..6370c446f4 100644
--- a/packages/sexp_diff/sexp_diff.v0.18~preview.130.55+197/opam
+++ b/packages/sexp_diff/sexp_diff.v0.18~preview.130.74+175/opam
@@ -12,8 +12,8 @@ build: [
 ]
 depends: [
   "ocaml"    {>= "5.1.0"}
-  "core"     {= "v0.18~preview.130.55+197"}
-  "ppx_jane" {= "v0.18~preview.130.55+197"}
+  "core"     {= "v0.18~preview.130.74+175"}
+  "ppx_jane" {= "v0.18~preview.130.74+175"}
   "dune"     {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/sexp_grammar/sexp_grammar.v0.18~preview.130.55+197/opam b/packages/sexp_grammar/sexp_grammar.v0.18~preview.130.55+197/opam
deleted file mode 100644
index 778b3c28af..0000000000
--- a/packages/sexp_grammar/sexp_grammar.v0.18~preview.130.55+197/opam
+++ /dev/null
@@ -1,41 +0,0 @@
-opam-version: "2.0"
-maintainer: "Jane Street developers"
-authors: ["Jane Street Group, LLC"]
-homepage: "https://github.com/janestreet/sexp_grammar"
-bug-reports: "https://github.com/janestreet/sexp_grammar/issues"
-dev-repo: "git+https://github.com/janestreet/sexp_grammar.git"
-doc:
-  "https://ocaml.janestreet.com/ocaml-core/latest/doc/sexp_grammar/index.html"
-license: "MIT"
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-]
-depends: [
-  "ocaml"            {>= "5.1.0"}
-  "async_rpc_kernel" {= "v0.18~preview.130.55+197"}
-  "base"             {= "v0.18~preview.130.55+197"}
-  "core"             {= "v0.18~preview.130.55+197"}
-  "dedent"           {= "v0.18~preview.130.55+197"}
-  "parsexp_prefix"   {= "v0.18~preview.130.55+197"}
-  "ppx_bin_prot"     {= "v0.18~preview.130.55+197"}
-  "ppx_compare"      {= "v0.18~preview.130.55+197"}
-  "ppx_hash"         {= "v0.18~preview.130.55+197"}
-  "ppx_jane"         {= "v0.18~preview.130.55+197"}
-  "ppx_let"          {= "v0.18~preview.130.55+197"}
-  "ppx_sexp_conv"    {= "v0.18~preview.130.55+197"}
-  "ppx_sexp_message" {= "v0.18~preview.130.55+197"}
-  "dune"             {>= "3.17.0"}
-  "ppxlib"           {= "0.33.0+ox"}
-  "zarith"           {= "1.12+ox"}
-]
-available: arch != "arm32" & arch != "x86_32"
-synopsis: "Sexp grammar helpers"
-description: """
-Helpers for manipulating [Sexplib.Sexp_grammar] values.
-"""
-url {
-  src:
-    "https://github.com/janestreet/sexp_grammar/archive/66955adea27c219338b3d7985e43e9e8b15ab211.tar.gz"
-  checksum:
-    "sha256=ff27fd4834abb6dda05d98348fea2830093b04bcd813a36dff17d8c718ad9aea"
-}
diff --git a/packages/sexp_grammar/sexp_grammar.v0.18~preview.130.74+175/opam b/packages/sexp_grammar/sexp_grammar.v0.18~preview.130.74+175/opam
new file mode 100644
index 0000000000..63190cdb18
--- /dev/null
+++ b/packages/sexp_grammar/sexp_grammar.v0.18~preview.130.74+175/opam
@@ -0,0 +1,42 @@
+opam-version: "2.0"
+maintainer: "Jane Street developers"
+authors: ["Jane Street Group, LLC"]
+homepage: "https://github.com/janestreet/sexp_grammar"
+bug-reports: "https://github.com/janestreet/sexp_grammar/issues"
+dev-repo: "git+https://github.com/janestreet/sexp_grammar.git"
+doc:
+  "https://ocaml.janestreet.com/ocaml-core/latest/doc/sexp_grammar/index.html"
+license: "MIT"
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+]
+depends: [
+  "ocaml"            {>= "5.1.0"}
+  "async_rpc_kernel" {= "v0.18~preview.130.74+175"}
+  "base"             {= "v0.18~preview.130.74+175"}
+  "core"             {= "v0.18~preview.130.74+175"}
+  "dedent"           {= "v0.18~preview.130.74+175"}
+  "parsexp_prefix"   {= "v0.18~preview.130.74+175"}
+  "ppx_bin_prot"     {= "v0.18~preview.130.74+175"}
+  "ppx_compare"      {= "v0.18~preview.130.74+175"}
+  "ppx_hash"         {= "v0.18~preview.130.74+175"}
+  "ppx_jane"         {= "v0.18~preview.130.74+175"}
+  "ppx_let"          {= "v0.18~preview.130.74+175"}
+  "ppx_sexp_conv"    {= "v0.18~preview.130.74+175"}
+  "ppx_sexp_message" {= "v0.18~preview.130.74+175"}
+  "ppx_template"     {= "v0.18~preview.130.74+175"}
+  "dune"             {>= "3.17.0"}
+  "ppxlib"           {= "0.33.0+ox"}
+  "zarith"           {= "1.12+ox"}
+]
+available: arch != "arm32" & arch != "x86_32"
+synopsis: "Sexp grammar helpers"
+description: """
+Helpers for manipulating [Sexplib.Sexp_grammar] values.
+"""
+url {
+  src:
+    "https://github.com/janestreet/sexp_grammar/archive/e8a2ede7dd46a9d9bb86fa58ff3d88bece5b9ed2.tar.gz"
+  checksum:
+    "sha256=94c46012847281fbcc0a6afdd5d5574ec8339cc95dbaa8f094abc8dd26a1478d"
+}
diff --git a/packages/sexp_macro/sexp_macro.v0.18~preview.130.55+197/opam b/packages/sexp_macro/sexp_macro.v0.18~preview.130.74+175/opam
similarity index 67%
rename from packages/sexp_macro/sexp_macro.v0.18~preview.130.55+197/opam
rename to packages/sexp_macro/sexp_macro.v0.18~preview.130.74+175/opam
index 297958515f..58d4dab4aa 100644
--- a/packages/sexp_macro/sexp_macro.v0.18~preview.130.55+197/opam
+++ b/packages/sexp_macro/sexp_macro.v0.18~preview.130.74+175/opam
@@ -12,10 +12,10 @@ build: [
 ]
 depends: [
   "ocaml"    {>= "5.1.0"}
-  "async"    {= "v0.18~preview.130.55+197"}
-  "core"     {= "v0.18~preview.130.55+197"}
-  "ppx_jane" {= "v0.18~preview.130.55+197"}
-  "sexplib"  {= "v0.18~preview.130.55+197"}
+  "async"    {= "v0.18~preview.130.74+175"}
+  "core"     {= "v0.18~preview.130.74+175"}
+  "ppx_jane" {= "v0.18~preview.130.74+175"}
+  "sexplib"  {= "v0.18~preview.130.74+175"}
   "dune"     {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -26,7 +26,7 @@ include one sexp file in another.
 """
 url {
   src:
-    "https://github.com/janestreet/sexp_macro/archive/cd600e82c554a86e95d7178a7145482b7c24d744.tar.gz"
+    "https://github.com/janestreet/sexp_macro/archive/3b59fd8d4b21b4f43fbe212fb55e58413523ffff.tar.gz"
   checksum:
-    "sha256=c264f8ba6d7149213f1e9c5bf5b023bc769d3a4167b0b07be1d2650012eb3680"
+    "sha256=8dc9104bfd4b0b3841f5452e7ff8c7bc494aec7a3d43cb0d695636102febae1a"
 }
diff --git a/packages/sexp_pretty/sexp_pretty.v0.18~preview.130.55+197/opam b/packages/sexp_pretty/sexp_pretty.v0.18~preview.130.74+175/opam
similarity index 68%
rename from packages/sexp_pretty/sexp_pretty.v0.18~preview.130.55+197/opam
rename to packages/sexp_pretty/sexp_pretty.v0.18~preview.130.74+175/opam
index 7a4efdc98c..56f4dc14d3 100644
--- a/packages/sexp_pretty/sexp_pretty.v0.18~preview.130.55+197/opam
+++ b/packages/sexp_pretty/sexp_pretty.v0.18~preview.130.74+175/opam
@@ -12,10 +12,10 @@ build: [
 ]
 depends: [
   "ocaml"    {>= "5.1.0"}
-  "base"     {= "v0.18~preview.130.55+197"}
-  "parsexp"  {= "v0.18~preview.130.55+197"}
-  "ppx_base" {= "v0.18~preview.130.55+197"}
-  "sexplib"  {= "v0.18~preview.130.55+197"}
+  "base"     {= "v0.18~preview.130.74+175"}
+  "parsexp"  {= "v0.18~preview.130.74+175"}
+  "ppx_base" {= "v0.18~preview.130.74+175"}
+  "sexplib"  {= "v0.18~preview.130.74+175"}
   "dune"     {>= "3.17.0"}
   "re"       {= "1.14.0+ox"}
 ]
@@ -27,7 +27,7 @@ the default pretty printer in Sexplib.
 """
 url {
   src:
-    "https://github.com/janestreet/sexp_pretty/archive/7f0dc7c82be2b89065f11ea804a02a9ad0ae870d.tar.gz"
+    "https://github.com/janestreet/sexp_pretty/archive/239ec81daa6881256ec17b85b04ce162109d53d1.tar.gz"
   checksum:
-    "sha256=bffe9ec1ce269c94959bc46f198f7584f5c272e5d8bb42f16fcd3f9ef4615b71"
+    "sha256=d8ac8810114cfc02e5c564d20d69b0cb9311dcbe79900048c01811ec417411a6"
 }
diff --git a/packages/sexp_select/sexp_select.v0.18~preview.130.55+197/opam b/packages/sexp_select/sexp_select.v0.18~preview.130.74+175/opam
similarity index 67%
rename from packages/sexp_select/sexp_select.v0.18~preview.130.55+197/opam
rename to packages/sexp_select/sexp_select.v0.18~preview.130.74+175/opam
index d21c2adee5..446936e7d1 100644
--- a/packages/sexp_select/sexp_select.v0.18~preview.130.55+197/opam
+++ b/packages/sexp_select/sexp_select.v0.18~preview.130.74+175/opam
@@ -12,10 +12,10 @@ build: [
 ]
 depends: [
   "ocaml"       {>= "5.1.0"}
-  "base"        {= "v0.18~preview.130.55+197"}
-  "core_kernel" {= "v0.18~preview.130.55+197"}
-  "parsexp"     {= "v0.18~preview.130.55+197"}
-  "ppx_jane"    {= "v0.18~preview.130.55+197"}
+  "base"        {= "v0.18~preview.130.74+175"}
+  "core_kernel" {= "v0.18~preview.130.74+175"}
+  "parsexp"     {= "v0.18~preview.130.74+175"}
+  "ppx_jane"    {= "v0.18~preview.130.74+175"}
   "dune"        {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -26,7 +26,7 @@ and return subtrees that match the given program.
 """
 url {
   src:
-    "https://github.com/janestreet/sexp_select/archive/ed9c9526d049f586758981c7ba1b15caee78a814.tar.gz"
+    "https://github.com/janestreet/sexp_select/archive/9a489a5f6f7bee2b3e12eb427143a8128a9ee72b.tar.gz"
   checksum:
-    "sha256=6e50f23dbd2632d090b3569aae19ab5e759f9d0e136e6c004afa510a69531799"
+    "sha256=94aa54288cd472c2633fdde4357588b74e80a5903d189939b96a4a6245d0d839"
 }
diff --git a/packages/sexp_string_quickcheck/sexp_string_quickcheck.v0.18~preview.130.55+197/opam b/packages/sexp_string_quickcheck/sexp_string_quickcheck.v0.18~preview.130.74+175/opam
similarity index 88%
rename from packages/sexp_string_quickcheck/sexp_string_quickcheck.v0.18~preview.130.55+197/opam
rename to packages/sexp_string_quickcheck/sexp_string_quickcheck.v0.18~preview.130.74+175/opam
index 8fac998987..17be098bb8 100644
--- a/packages/sexp_string_quickcheck/sexp_string_quickcheck.v0.18~preview.130.55+197/opam
+++ b/packages/sexp_string_quickcheck/sexp_string_quickcheck.v0.18~preview.130.74+175/opam
@@ -12,9 +12,9 @@ build: [
 ]
 depends: [
   "ocaml"    {>= "5.1.0"}
-  "core"     {= "v0.18~preview.130.55+197"}
-  "parsexp"  {= "v0.18~preview.130.55+197"}
-  "ppx_jane" {= "v0.18~preview.130.55+197"}
+  "core"     {= "v0.18~preview.130.74+175"}
+  "parsexp"  {= "v0.18~preview.130.74+175"}
+  "ppx_jane" {= "v0.18~preview.130.74+175"}
   "dune"     {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/sexplib/sexplib.v0.18~preview.130.55+197/opam b/packages/sexplib/sexplib.v0.18~preview.130.74+175/opam
similarity index 73%
rename from packages/sexplib/sexplib.v0.18~preview.130.55+197/opam
rename to packages/sexplib/sexplib.v0.18~preview.130.74+175/opam
index 81920a9b1e..eae6b89c5e 100644
--- a/packages/sexplib/sexplib.v0.18~preview.130.55+197/opam
+++ b/packages/sexplib/sexplib.v0.18~preview.130.74+175/opam
@@ -11,9 +11,9 @@ build: [
 ]
 depends: [
   "ocaml"    {>= "5.1.0"}
-  "basement" {= "v0.18~preview.130.55+197"}
-  "parsexp"  {= "v0.18~preview.130.55+197"}
-  "sexplib0" {= "v0.18~preview.130.55+197"}
+  "basement" {= "v0.18~preview.130.74+175"}
+  "parsexp"  {= "v0.18~preview.130.74+175"}
+  "sexplib0" {= "v0.18~preview.130.74+175"}
   "dune"     {>= "3.17.0"}
   "num"
 ]
@@ -27,7 +27,7 @@ largest industrial user of OCaml.
 """
 url {
   src:
-    "https://github.com/janestreet/sexplib/archive/4609961ab2a3e2ad6354d93ec537381626b370e5.tar.gz"
+    "https://github.com/janestreet/sexplib/archive/b3f01788bff3913e1cc0faedbe2ac9f802d5d41e.tar.gz"
   checksum:
-    "sha256=ca231cefbd58e90def9a8db1e5848080035b244e9860e38d2681476e6705fdad"
+    "sha256=544b4cef4c89588bb3d576a9319b698bea719187b76fe2243e5e925f837af6e3"
 }
diff --git a/packages/sexplib0/sexplib0.v0.18~preview.130.55+197/opam b/packages/sexplib0/sexplib0.v0.18~preview.130.74+175/opam
similarity index 79%
rename from packages/sexplib0/sexplib0.v0.18~preview.130.55+197/opam
rename to packages/sexplib0/sexplib0.v0.18~preview.130.74+175/opam
index f6a5098574..93e7ad0805 100644
--- a/packages/sexplib0/sexplib0.v0.18~preview.130.55+197/opam
+++ b/packages/sexplib0/sexplib0.v0.18~preview.130.74+175/opam
@@ -11,7 +11,7 @@ build: [
 ]
 depends: [
   "ocaml"    {>= "4.14.0"}
-  "basement" {= "v0.18~preview.130.55+197"}
+  "basement" {= "v0.18~preview.130.74+175"}
   "dune"     {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -25,7 +25,7 @@ largest industrial user of OCaml.
 """
 url {
   src:
-    "https://github.com/janestreet/sexplib0/archive/518da1ac441d047cfa2cbae2f6f593a2e9d94efe.tar.gz"
+    "https://github.com/janestreet/sexplib0/archive/6a4cca980eda4387d95815e70687d7e381cb28ee.tar.gz"
   checksum:
-    "sha256=1258db5fc1d9cd3207daad8c9ad523faeb223646699d96f9b637eeac8e29d004"
+    "sha256=4074ba95ee4281b74b07b568daeaa77e903b27b56fe5f651fb5368b20c1c0738"
 }
diff --git a/packages/shell/shell.v0.18~preview.130.55+197/opam b/packages/shell/shell.v0.18~preview.130.74+175/opam
similarity index 71%
rename from packages/shell/shell.v0.18~preview.130.55+197/opam
rename to packages/shell/shell.v0.18~preview.130.74+175/opam
index 8a3ef6aa33..26e3bf0e28 100644
--- a/packages/shell/shell.v0.18~preview.130.55+197/opam
+++ b/packages/shell/shell.v0.18~preview.130.74+175/opam
@@ -11,11 +11,11 @@ build: [
 ]
 depends: [
   "ocaml"      {>= "5.1.0"}
-  "core"       {= "v0.18~preview.130.55+197"}
-  "core_unix"  {= "v0.18~preview.130.55+197"}
-  "jst-config" {= "v0.18~preview.130.55+197"}
-  "ppx_jane"   {= "v0.18~preview.130.55+197"}
-  "textutils"  {= "v0.18~preview.130.55+197"}
+  "core"       {= "v0.18~preview.130.74+175"}
+  "core_unix"  {= "v0.18~preview.130.74+175"}
+  "jst-config" {= "v0.18~preview.130.74+175"}
+  "ppx_jane"   {= "v0.18~preview.130.74+175"}
+  "textutils"  {= "v0.18~preview.130.74+175"}
   "dune"       {>= "3.17.0"}
   "spawn"      {= "v0.15.1+ox"}
 ]
@@ -27,7 +27,7 @@ This library is a relatively featureful and flexible implementation of fork&exec
 depexts: ["linux-headers"] {os-family = "alpine"}
 url {
   src:
-    "https://github.com/janestreet/shell/archive/0b2c4c7d0e2491e116783c9ed9bb578ed5deea8d.tar.gz"
+    "https://github.com/janestreet/shell/archive/9da6e97e9a6be78680d27e9ce600c526cd2b279b.tar.gz"
   checksum:
-    "sha256=5694d1af21d40a26ab4184cf8fcea07ae1567a6d05d433f0059e80e29b6b8722"
+    "sha256=da40b3e01751db7ccaa48df4809c6f96b6af452a1a465e00cb4ae0e6c1f5b41a"
 }
diff --git a/packages/shexp/shexp.v0.18~preview.130.55+197/opam b/packages/shexp/shexp.v0.18~preview.130.74+175/opam
similarity index 76%
rename from packages/shexp/shexp.v0.18~preview.130.55+197/opam
rename to packages/shexp/shexp.v0.18~preview.130.74+175/opam
index b1c6ba4c8e..d77ff08637 100644
--- a/packages/shexp/shexp.v0.18~preview.130.55+197/opam
+++ b/packages/shexp/shexp.v0.18~preview.130.74+175/opam
@@ -11,8 +11,8 @@ build: [
 ]
 depends: [
   "ocaml"        {>= "5.1.0"}
-  "posixat"      {= "v0.18~preview.130.55+197"}
-  "sexplib0"     {= "v0.18~preview.130.55+197"}
+  "posixat"      {= "v0.18~preview.130.74+175"}
+  "sexplib0"     {= "v0.18~preview.130.74+175"}
   "base-threads"
   "dune"         {>= "3.17.0"}
   "spawn"        {= "v0.15.1+ox"}
@@ -26,7 +26,7 @@ shell interpreter. Shexp works on both Unix and Windows.
 """
 url {
   src:
-    "https://github.com/janestreet/shexp/archive/48789e917f086ef9617620ff8d731242f61c8cf6.tar.gz"
+    "https://github.com/janestreet/shexp/archive/f37f41eb2800988d3c05c7a7a97ac2f14d65ffb3.tar.gz"
   checksum:
-    "sha256=44fa74ef10474f9648ce9784b79b6507d55c75878ed6db28383dd35ca4038800"
+    "sha256=63f06ba82d5c94026699abc9d136bfcdcea390e0d25bfef46fecf92bd95a3a21"
 }
diff --git a/packages/simple_xml/simple_xml.v0.18~preview.130.55+197/opam b/packages/simple_xml/simple_xml.v0.18~preview.130.74+175/opam
similarity index 83%
rename from packages/simple_xml/simple_xml.v0.18~preview.130.55+197/opam
rename to packages/simple_xml/simple_xml.v0.18~preview.130.74+175/opam
index 7771ef568f..0737d62c43 100644
--- a/packages/simple_xml/simple_xml.v0.18~preview.130.55+197/opam
+++ b/packages/simple_xml/simple_xml.v0.18~preview.130.74+175/opam
@@ -12,10 +12,10 @@ build: [
 ]
 depends: [
   "ocaml"              {>= "5.1.0"}
-  "core"               {= "v0.18~preview.130.55+197"}
-  "ppx_jane"           {= "v0.18~preview.130.55+197"}
-  "ppx_stable_witness" {= "v0.18~preview.130.55+197"}
-  "sexplib"            {= "v0.18~preview.130.55+197"}
+  "core"               {= "v0.18~preview.130.74+175"}
+  "ppx_jane"           {= "v0.18~preview.130.74+175"}
+  "ppx_stable_witness" {= "v0.18~preview.130.74+175"}
+  "sexplib"            {= "v0.18~preview.130.74+175"}
   "dune"               {>= "3.17.0"}
   "xmlm"               {>= "1.4.0"}
 ]
diff --git a/packages/splay_tree/splay_tree.v0.18~preview.130.55+197/opam b/packages/splay_tree/splay_tree.v0.18~preview.130.74+175/opam
similarity index 80%
rename from packages/splay_tree/splay_tree.v0.18~preview.130.55+197/opam
rename to packages/splay_tree/splay_tree.v0.18~preview.130.74+175/opam
index 86724c130b..753becc654 100644
--- a/packages/splay_tree/splay_tree.v0.18~preview.130.55+197/opam
+++ b/packages/splay_tree/splay_tree.v0.18~preview.130.74+175/opam
@@ -12,8 +12,8 @@ build: [
 ]
 depends: [
   "ocaml"    {>= "5.1.0"}
-  "core"     {= "v0.18~preview.130.55+197"}
-  "ppx_jane" {= "v0.18~preview.130.55+197"}
+  "core"     {= "v0.18~preview.130.74+175"}
+  "ppx_jane" {= "v0.18~preview.130.74+175"}
   "dune"     {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -33,7 +33,7 @@ which can then be searched by efficiently.
 """
 url {
   src:
-    "https://github.com/janestreet/splay_tree/archive/ecaa5f643c05aa60ab7ea5435018cc15d90f4f7f.tar.gz"
+    "https://github.com/janestreet/splay_tree/archive/415d3930a19a44e9cc5af6375e017f6000820089.tar.gz"
   checksum:
-    "sha256=7137e478f6071ea54f943054dc16776c94bdf16ec0846c63239a87c3aecb007c"
+    "sha256=f51cdb1cfdbf033b04ffb583e8736f259b465ecbe871faf2f01d67abc067848f"
 }
diff --git a/packages/splittable_random/splittable_random.v0.18~preview.130.55+197/opam b/packages/splittable_random/splittable_random.v0.18~preview.130.74+175/opam
similarity index 82%
rename from packages/splittable_random/splittable_random.v0.18~preview.130.55+197/opam
rename to packages/splittable_random/splittable_random.v0.18~preview.130.74+175/opam
index 98388eec45..f84e53edf6 100644
--- a/packages/splittable_random/splittable_random.v0.18~preview.130.55+197/opam
+++ b/packages/splittable_random/splittable_random.v0.18~preview.130.74+175/opam
@@ -12,11 +12,11 @@ build: [
 ]
 depends: [
   "ocaml"            {>= "5.1.0"}
-  "base"             {= "v0.18~preview.130.55+197"}
-  "ppx_assert"       {= "v0.18~preview.130.55+197"}
-  "ppx_bench"        {= "v0.18~preview.130.55+197"}
-  "ppx_inline_test"  {= "v0.18~preview.130.55+197"}
-  "ppx_sexp_message" {= "v0.18~preview.130.55+197"}
+  "base"             {= "v0.18~preview.130.74+175"}
+  "ppx_assert"       {= "v0.18~preview.130.74+175"}
+  "ppx_bench"        {= "v0.18~preview.130.74+175"}
+  "ppx_inline_test"  {= "v0.18~preview.130.74+175"}
+  "ppx_sexp_message" {= "v0.18~preview.130.74+175"}
   "dune"             {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/stdio/stdio.v0.18~preview.130.55+197/opam b/packages/stdio/stdio.v0.18~preview.130.74+175/opam
similarity index 91%
rename from packages/stdio/stdio.v0.18~preview.130.55+197/opam
rename to packages/stdio/stdio.v0.18~preview.130.74+175/opam
index 3f0d6e250e..c3b0ba60bf 100644
--- a/packages/stdio/stdio.v0.18~preview.130.55+197/opam
+++ b/packages/stdio/stdio.v0.18~preview.130.74+175/opam
@@ -11,8 +11,8 @@ build: [
 ]
 depends: [
   "ocaml"    {>= "5.1.0"}
-  "base"     {= "v0.18~preview.130.55+197"}
-  "sexplib0" {= "v0.18~preview.130.55+197"}
+  "base"     {= "v0.18~preview.130.74+175"}
+  "sexplib0" {= "v0.18~preview.130.74+175"}
   "dune"     {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/stored_reversed/stored_reversed.v0.18~preview.130.55+197/opam b/packages/stored_reversed/stored_reversed.v0.18~preview.130.74+175/opam
similarity index 91%
rename from packages/stored_reversed/stored_reversed.v0.18~preview.130.55+197/opam
rename to packages/stored_reversed/stored_reversed.v0.18~preview.130.74+175/opam
index c62193a804..7f603b1559 100644
--- a/packages/stored_reversed/stored_reversed.v0.18~preview.130.55+197/opam
+++ b/packages/stored_reversed/stored_reversed.v0.18~preview.130.74+175/opam
@@ -12,8 +12,8 @@ build: [
 ]
 depends: [
   "ocaml"    {>= "5.1.0"}
-  "core"     {= "v0.18~preview.130.55+197"}
-  "ppx_jane" {= "v0.18~preview.130.55+197"}
+  "core"     {= "v0.18~preview.130.74+175"}
+  "ppx_jane" {= "v0.18~preview.130.74+175"}
   "dune"     {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/streamable/streamable.v0.18~preview.130.55+197/opam b/packages/streamable/streamable.v0.18~preview.130.74+175/opam
similarity index 56%
rename from packages/streamable/streamable.v0.18~preview.130.55+197/opam
rename to packages/streamable/streamable.v0.18~preview.130.74+175/opam
index de0689d8f2..ddd05c1826 100644
--- a/packages/streamable/streamable.v0.18~preview.130.55+197/opam
+++ b/packages/streamable/streamable.v0.18~preview.130.74+175/opam
@@ -12,14 +12,14 @@ build: [
 ]
 depends: [
   "ocaml"            {>= "5.1.0"}
-  "async_kernel"     {= "v0.18~preview.130.55+197"}
-  "async_rpc_kernel" {= "v0.18~preview.130.55+197"}
-  "base"             {= "v0.18~preview.130.55+197"}
-  "bin_prot"         {= "v0.18~preview.130.55+197"}
-  "core"             {= "v0.18~preview.130.55+197"}
-  "core_kernel"      {= "v0.18~preview.130.55+197"}
-  "ppx_jane"         {= "v0.18~preview.130.55+197"}
-  "ppxlib_jane"      {= "v0.18~preview.130.55+197"}
+  "async_kernel"     {= "v0.18~preview.130.74+175"}
+  "async_rpc_kernel" {= "v0.18~preview.130.74+175"}
+  "base"             {= "v0.18~preview.130.74+175"}
+  "bin_prot"         {= "v0.18~preview.130.74+175"}
+  "core"             {= "v0.18~preview.130.74+175"}
+  "core_kernel"      {= "v0.18~preview.130.74+175"}
+  "ppx_jane"         {= "v0.18~preview.130.74+175"}
+  "ppxlib_jane"      {= "v0.18~preview.130.74+175"}
   "dune"             {>= "3.17.0"}
   "ppxlib"           {= "0.33.0+ox"}
 ]
@@ -30,7 +30,7 @@ A collection of types suitable for incremental serialization.
 """
 url {
   src:
-    "https://github.com/janestreet/streamable/archive/f32eaa08d6ed284e89d61bc5690a84ab8dc151fa.tar.gz"
+    "https://github.com/janestreet/streamable/archive/766f1544e013f285b5bd6c6917ac48caebc7bc51.tar.gz"
   checksum:
-    "sha256=491477c2db4b2234d1c20dce490500b58ad9ee8ba75ead8af5ed67fa890e8bca"
+    "sha256=9684b6f933db310c35a74ace10069f732d643402640cd867f2cd56425a524861"
 }
diff --git a/packages/string_dict/string_dict.v0.18~preview.130.55+197/opam b/packages/string_dict/string_dict.v0.18~preview.130.74+175/opam
similarity index 84%
rename from packages/string_dict/string_dict.v0.18~preview.130.55+197/opam
rename to packages/string_dict/string_dict.v0.18~preview.130.74+175/opam
index f3206a6d77..229e910cc5 100644
--- a/packages/string_dict/string_dict.v0.18~preview.130.55+197/opam
+++ b/packages/string_dict/string_dict.v0.18~preview.130.74+175/opam
@@ -12,10 +12,10 @@ build: [
 ]
 depends: [
   "ocaml"       {>= "5.1.0"}
-  "base"        {= "v0.18~preview.130.55+197"}
-  "basement"    {= "v0.18~preview.130.55+197"}
-  "ppx_compare" {= "v0.18~preview.130.55+197"}
-  "ppx_hash"    {= "v0.18~preview.130.55+197"}
+  "base"        {= "v0.18~preview.130.74+175"}
+  "basement"    {= "v0.18~preview.130.74+175"}
+  "ppx_compare" {= "v0.18~preview.130.74+175"}
+  "ppx_hash"    {= "v0.18~preview.130.74+175"}
   "dune"        {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/testable_timeout/testable_timeout.v0.18~preview.130.55+197/opam b/packages/testable_timeout/testable_timeout.v0.18~preview.130.74+175/opam
similarity index 71%
rename from packages/testable_timeout/testable_timeout.v0.18~preview.130.55+197/opam
rename to packages/testable_timeout/testable_timeout.v0.18~preview.130.74+175/opam
index 4f353fa54e..7f9049c37a 100644
--- a/packages/testable_timeout/testable_timeout.v0.18~preview.130.55+197/opam
+++ b/packages/testable_timeout/testable_timeout.v0.18~preview.130.74+175/opam
@@ -12,9 +12,9 @@ build: [
 ]
 depends: [
   "ocaml"           {>= "5.1.0"}
-  "async_kernel"    {= "v0.18~preview.130.55+197"}
-  "core"            {= "v0.18~preview.130.55+197"}
-  "ppx_jane"        {= "v0.18~preview.130.55+197"}
+  "async_kernel"    {= "v0.18~preview.130.74+175"}
+  "core"            {= "v0.18~preview.130.74+175"}
+  "ppx_jane"        {= "v0.18~preview.130.74+175"}
   "dune"            {>= "3.17.0"}
   "js_of_ocaml-ppx" {= "6.0.1+ox"}
 ]
@@ -26,7 +26,7 @@ An API like the browser's setTimeout, but driven by an overridable async time so
 """
 url {
   src:
-    "https://github.com/janestreet/testable_timeout/archive/bbec9b8987648967e768aac7fa67fd8060a38fc2.tar.gz"
+    "https://github.com/janestreet/testable_timeout/archive/df62f55d101b1c47572421a5af18cc67be626a2f.tar.gz"
   checksum:
-    "sha256=48d0048a0f33f9fcffae334b55db5c124cf2ed1f4f86a3dd2067567b3e1f5701"
+    "sha256=4213787e2eedf929548b8438e3a7b505c3b6b9fac2877aba6247347bc055cc14"
 }
diff --git a/packages/textutils/textutils.v0.18~preview.130.55+197/opam b/packages/textutils/textutils.v0.18~preview.130.74+175/opam
similarity index 63%
rename from packages/textutils/textutils.v0.18~preview.130.55+197/opam
rename to packages/textutils/textutils.v0.18~preview.130.74+175/opam
index 2863f20f29..1b0c66faf7 100644
--- a/packages/textutils/textutils.v0.18~preview.130.55+197/opam
+++ b/packages/textutils/textutils.v0.18~preview.130.74+175/opam
@@ -12,10 +12,10 @@ build: [
 ]
 depends: [
   "ocaml"       {>= "5.1.0"}
-  "core"        {= "v0.18~preview.130.55+197"}
-  "core_kernel" {= "v0.18~preview.130.55+197"}
-  "core_unix"   {= "v0.18~preview.130.55+197"}
-  "ppx_jane"    {= "v0.18~preview.130.55+197"}
+  "core"        {= "v0.18~preview.130.74+175"}
+  "core_kernel" {= "v0.18~preview.130.74+175"}
+  "core_unix"   {= "v0.18~preview.130.74+175"}
+  "ppx_jane"    {= "v0.18~preview.130.74+175"}
   "dune"        {>= "3.17.0"}
   "uutf"        {= "1.0.3+ox"}
 ]
@@ -25,7 +25,7 @@ description: """
 """
 url {
   src:
-    "https://github.com/janestreet/textutils/archive/f5a59ad8bc1e17af77b8536dd467991a5f7f87c0.tar.gz"
+    "https://github.com/janestreet/textutils/archive/ee01155b4caff7b0f3360e7539ae30e10bda4516.tar.gz"
   checksum:
-    "sha256=f8e545aad112bbf409054fcb8809fa5144ecfec60270738227e1414be84dfbf2"
+    "sha256=1a4f03b041b1387d9a92e84b931fac83fda610910bc40d18bbcf6da0893210d4"
 }
diff --git a/packages/textutils_kernel/textutils_kernel.v0.18~preview.130.55+197/opam b/packages/textutils_kernel/textutils_kernel.v0.18~preview.130.74+175/opam
similarity index 90%
rename from packages/textutils_kernel/textutils_kernel.v0.18~preview.130.55+197/opam
rename to packages/textutils_kernel/textutils_kernel.v0.18~preview.130.74+175/opam
index 5822a41e9f..bf1ceedee4 100644
--- a/packages/textutils_kernel/textutils_kernel.v0.18~preview.130.55+197/opam
+++ b/packages/textutils_kernel/textutils_kernel.v0.18~preview.130.74+175/opam
@@ -12,8 +12,8 @@ build: [
 ]
 depends: [
   "ocaml"    {>= "5.1.0"}
-  "core"     {= "v0.18~preview.130.55+197"}
-  "ppx_jane" {= "v0.18~preview.130.55+197"}
+  "core"     {= "v0.18~preview.130.74+175"}
+  "ppx_jane" {= "v0.18~preview.130.74+175"}
   "dune"     {>= "3.17.0"}
   "uutf"     {= "1.0.3+ox"}
 ]
diff --git a/packages/tilde_f/tilde_f.v0.18~preview.130.55+197/opam b/packages/tilde_f/tilde_f.v0.18~preview.130.74+175/opam
similarity index 90%
rename from packages/tilde_f/tilde_f.v0.18~preview.130.55+197/opam
rename to packages/tilde_f/tilde_f.v0.18~preview.130.74+175/opam
index 49899143c9..c6f4eb0904 100644
--- a/packages/tilde_f/tilde_f.v0.18~preview.130.55+197/opam
+++ b/packages/tilde_f/tilde_f.v0.18~preview.130.74+175/opam
@@ -11,8 +11,8 @@ build: [
 ]
 depends: [
   "ocaml"    {>= "5.1.0"}
-  "base"     {= "v0.18~preview.130.55+197"}
-  "ppx_jane" {= "v0.18~preview.130.55+197"}
+  "base"     {= "v0.18~preview.130.74+175"}
+  "ppx_jane" {= "v0.18~preview.130.74+175"}
   "dune"     {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/time_ago/time_ago.v0.18~preview.130.55+197/opam b/packages/time_ago/time_ago.v0.18~preview.130.74+175/opam
similarity index 82%
rename from packages/time_ago/time_ago.v0.18~preview.130.55+197/opam
rename to packages/time_ago/time_ago.v0.18~preview.130.74+175/opam
index 823b844822..22fd8a02f0 100644
--- a/packages/time_ago/time_ago.v0.18~preview.130.55+197/opam
+++ b/packages/time_ago/time_ago.v0.18~preview.130.74+175/opam
@@ -11,10 +11,10 @@ build: [
 ]
 depends: [
   "ocaml"           {>= "5.1.0"}
-  "async_kernel"    {= "v0.18~preview.130.55+197"}
-  "core"            {= "v0.18~preview.130.55+197"}
-  "incr_dom"        {= "v0.18~preview.130.55+197"}
-  "ppx_jane"        {= "v0.18~preview.130.55+197"}
+  "async_kernel"    {= "v0.18~preview.130.74+175"}
+  "core"            {= "v0.18~preview.130.74+175"}
+  "incr_dom"        {= "v0.18~preview.130.74+175"}
+  "ppx_jane"        {= "v0.18~preview.130.74+175"}
   "dune"            {>= "3.17.0"}
   "js_of_ocaml"     {= "6.0.1+ox"}
   "js_of_ocaml-ppx" {= "6.0.1+ox"}
diff --git a/packages/time_now/time_now.v0.18~preview.130.55+197/opam b/packages/time_now/time_now.v0.18~preview.130.74+175/opam
similarity index 76%
rename from packages/time_now/time_now.v0.18~preview.130.55+197/opam
rename to packages/time_now/time_now.v0.18~preview.130.74+175/opam
index 56e5a7ad70..25041af4b9 100644
--- a/packages/time_now/time_now.v0.18~preview.130.55+197/opam
+++ b/packages/time_now/time_now.v0.18~preview.130.74+175/opam
@@ -11,11 +11,11 @@ build: [
 ]
 depends: [
   "ocaml"               {>= "5.1.0"}
-  "base"                {= "v0.18~preview.130.55+197"}
-  "jane-street-headers" {= "v0.18~preview.130.55+197"}
-  "jst-config"          {= "v0.18~preview.130.55+197"}
-  "ppx_base"            {= "v0.18~preview.130.55+197"}
-  "ppx_optcomp"         {= "v0.18~preview.130.55+197"}
+  "base"                {= "v0.18~preview.130.74+175"}
+  "jane-street-headers" {= "v0.18~preview.130.74+175"}
+  "jst-config"          {= "v0.18~preview.130.74+175"}
+  "ppx_base"            {= "v0.18~preview.130.74+175"}
+  "ppx_optcomp"         {= "v0.18~preview.130.74+175"}
   "dune"                {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/timezone/timezone.v0.18~preview.130.55+197/opam b/packages/timezone/timezone.v0.18~preview.130.74+175/opam
similarity index 74%
rename from packages/timezone/timezone.v0.18~preview.130.55+197/opam
rename to packages/timezone/timezone.v0.18~preview.130.74+175/opam
index ccd568fe17..616189ade3 100644
--- a/packages/timezone/timezone.v0.18~preview.130.55+197/opam
+++ b/packages/timezone/timezone.v0.18~preview.130.74+175/opam
@@ -11,12 +11,12 @@ build: [
 ]
 depends: [
   "ocaml"              {>= "5.1.0"}
-  "core"               {= "v0.18~preview.130.55+197"}
-  "ppx_diff"           {= "v0.18~preview.130.55+197"}
-  "ppx_jane"           {= "v0.18~preview.130.55+197"}
-  "ppx_stable_witness" {= "v0.18~preview.130.55+197"}
-  "sexplib"            {= "v0.18~preview.130.55+197"}
-  "stdio"              {= "v0.18~preview.130.55+197"}
+  "core"               {= "v0.18~preview.130.74+175"}
+  "ppx_diff"           {= "v0.18~preview.130.74+175"}
+  "ppx_jane"           {= "v0.18~preview.130.74+175"}
+  "ppx_stable_witness" {= "v0.18~preview.130.74+175"}
+  "sexplib"            {= "v0.18~preview.130.74+175"}
+  "stdio"              {= "v0.18~preview.130.74+175"}
   "dune"               {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/toplayer/toplayer.v0.18~preview.130.55+197/opam b/packages/toplayer/toplayer.v0.18~preview.130.74+175/opam
similarity index 59%
rename from packages/toplayer/toplayer.v0.18~preview.130.55+197/opam
rename to packages/toplayer/toplayer.v0.18~preview.130.74+175/opam
index fe5820e9fd..ac8d0a2dd5 100644
--- a/packages/toplayer/toplayer.v0.18~preview.130.55+197/opam
+++ b/packages/toplayer/toplayer.v0.18~preview.130.74+175/opam
@@ -11,14 +11,14 @@ build: [
 ]
 depends: [
   "ocaml"             {>= "5.1.0"}
-  "am_running_how_js" {= "v0.18~preview.130.55+197"}
-  "core"              {= "v0.18~preview.130.55+197"}
-  "incr_dom"          {= "v0.18~preview.130.55+197"}
-  "ppx_css"           {= "v0.18~preview.130.55+197"}
-  "ppx_jane"          {= "v0.18~preview.130.55+197"}
-  "sexplib"           {= "v0.18~preview.130.55+197"}
-  "testable_timeout"  {= "v0.18~preview.130.55+197"}
-  "virtual_dom"       {= "v0.18~preview.130.55+197"}
+  "am_running_how_js" {= "v0.18~preview.130.74+175"}
+  "core"              {= "v0.18~preview.130.74+175"}
+  "incr_dom"          {= "v0.18~preview.130.74+175"}
+  "ppx_css"           {= "v0.18~preview.130.74+175"}
+  "ppx_jane"          {= "v0.18~preview.130.74+175"}
+  "sexplib"           {= "v0.18~preview.130.74+175"}
+  "testable_timeout"  {= "v0.18~preview.130.74+175"}
+  "virtual_dom"       {= "v0.18~preview.130.74+175"}
   "dune"              {>= "3.17.0"}
   "gen_js_api"        {= "1.1.2+ox"}
   "js_of_ocaml"       {= "6.0.1+ox"}
@@ -32,7 +32,7 @@ The floating positioning library itself may be found at https://floating-ui.com/
 """
 url {
   src:
-    "https://github.com/janestreet/toplayer/archive/c9cf1468460ab1bec32c737189ef66eb462088a6.tar.gz"
+    "https://github.com/janestreet/toplayer/archive/307ba90f22db7984b387ed17d037713958f3a5d6.tar.gz"
   checksum:
-    "sha256=fe1bf3160becc98af4607a127064c759bafad3f66a4970527062bf5c2d4619f7"
+    "sha256=d9e394bbda013845d5b13952126891c29302b4ac3f96496b1c28aad72bab7237"
 }
diff --git a/packages/toplevel_backend/toplevel_backend.v0.18~preview.130.55+197/opam b/packages/toplevel_backend/toplevel_backend.v0.18~preview.130.74+175/opam
similarity index 74%
rename from packages/toplevel_backend/toplevel_backend.v0.18~preview.130.55+197/opam
rename to packages/toplevel_backend/toplevel_backend.v0.18~preview.130.74+175/opam
index 0c29e7c07a..f1ceb1b317 100644
--- a/packages/toplevel_backend/toplevel_backend.v0.18~preview.130.55+197/opam
+++ b/packages/toplevel_backend/toplevel_backend.v0.18~preview.130.74+175/opam
@@ -12,13 +12,13 @@ build: [
 ]
 depends: [
   "ocaml"       {>= "5.1.0"}
-  "base"        {= "v0.18~preview.130.55+197"}
-  "core"        {= "v0.18~preview.130.55+197"}
-  "parsexp"     {= "v0.18~preview.130.55+197"}
-  "ppx_here"    {= "v0.18~preview.130.55+197"}
-  "ppx_jane"    {= "v0.18~preview.130.55+197"}
-  "ppx_optcomp" {= "v0.18~preview.130.55+197"}
-  "stdio"       {= "v0.18~preview.130.55+197"}
+  "base"        {= "v0.18~preview.130.74+175"}
+  "core"        {= "v0.18~preview.130.74+175"}
+  "parsexp"     {= "v0.18~preview.130.74+175"}
+  "ppx_here"    {= "v0.18~preview.130.74+175"}
+  "ppx_jane"    {= "v0.18~preview.130.74+175"}
+  "ppx_optcomp" {= "v0.18~preview.130.74+175"}
+  "stdio"       {= "v0.18~preview.130.74+175"}
   "dune"        {>= "3.17.0"}
   "ocamlfind"   {>= "1.7.2"}
 ]
diff --git a/packages/toplevel_expect_test/toplevel_expect_test.v0.18~preview.130.55+197/opam b/packages/toplevel_expect_test/toplevel_expect_test.v0.18~preview.130.74+175/opam
similarity index 64%
rename from packages/toplevel_expect_test/toplevel_expect_test.v0.18~preview.130.55+197/opam
rename to packages/toplevel_expect_test/toplevel_expect_test.v0.18~preview.130.74+175/opam
index a4446a580f..72a692f0d4 100644
--- a/packages/toplevel_expect_test/toplevel_expect_test.v0.18~preview.130.55+197/opam
+++ b/packages/toplevel_expect_test/toplevel_expect_test.v0.18~preview.130.74+175/opam
@@ -12,15 +12,15 @@ build: [
 ]
 depends: [
   "ocaml"               {>= "5.1.0"}
-  "core"                {= "v0.18~preview.130.55+197"}
-  "core_kernel"         {= "v0.18~preview.130.55+197"}
-  "core_unix"           {= "v0.18~preview.130.55+197"}
-  "mlt_parser"          {= "v0.18~preview.130.55+197"}
-  "ppx_expect"          {= "v0.18~preview.130.55+197"}
-  "ppx_inline_test"     {= "v0.18~preview.130.55+197"}
-  "ppx_jane"            {= "v0.18~preview.130.55+197"}
-  "ppx_optcomp"         {= "v0.18~preview.130.55+197"}
-  "toplevel_backend"    {= "v0.18~preview.130.55+197"}
+  "core"                {= "v0.18~preview.130.74+175"}
+  "core_kernel"         {= "v0.18~preview.130.74+175"}
+  "core_unix"           {= "v0.18~preview.130.74+175"}
+  "mlt_parser"          {= "v0.18~preview.130.74+175"}
+  "ppx_expect"          {= "v0.18~preview.130.74+175"}
+  "ppx_inline_test"     {= "v0.18~preview.130.74+175"}
+  "ppx_jane"            {= "v0.18~preview.130.74+175"}
+  "ppx_optcomp"         {= "v0.18~preview.130.74+175"}
+  "toplevel_backend"    {= "v0.18~preview.130.74+175"}
   "base-threads"
   "dune"                {>= "3.17.0"}
   "ocaml-compiler-libs" {= "v0.17.0+ox"}
@@ -37,7 +37,7 @@ the toplevel in a terminal.
 """
 url {
   src:
-    "https://github.com/janestreet/toplevel_expect_test/archive/577dd370d894cdda4a5e75a6cf60db545091eaa6.tar.gz"
+    "https://github.com/janestreet/toplevel_expect_test/archive/9121f152b6b5bcd22c67a15c6093968c65b9c8c6.tar.gz"
   checksum:
-    "sha256=f01166cf599084d2615dce7067c2afcb33dc19575a34540157363f0985929ba0"
+    "sha256=18b01796fb431ab230bcd803fea5d9103b634af5034c09438a0d83c8cdf94ad2"
 }
diff --git a/packages/topological_sort/topological_sort.v0.18~preview.130.55+197/opam b/packages/topological_sort/topological_sort.v0.18~preview.130.74+175/opam
similarity index 87%
rename from packages/topological_sort/topological_sort.v0.18~preview.130.55+197/opam
rename to packages/topological_sort/topological_sort.v0.18~preview.130.74+175/opam
index eab05ac3f5..d5e029cfc2 100644
--- a/packages/topological_sort/topological_sort.v0.18~preview.130.55+197/opam
+++ b/packages/topological_sort/topological_sort.v0.18~preview.130.74+175/opam
@@ -12,9 +12,9 @@ build: [
 ]
 depends: [
   "ocaml"    {>= "5.1.0"}
-  "base"     {= "v0.18~preview.130.55+197"}
-  "ppx_jane" {= "v0.18~preview.130.55+197"}
-  "stdio"    {= "v0.18~preview.130.55+197"}
+  "base"     {= "v0.18~preview.130.74+175"}
+  "ppx_jane" {= "v0.18~preview.130.74+175"}
+  "stdio"    {= "v0.18~preview.130.74+175"}
   "dune"     {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/torch/torch.v0.18~preview.130.55+197/opam b/packages/torch/torch.v0.18~preview.130.74+175/opam
similarity index 54%
rename from packages/torch/torch.v0.18~preview.130.55+197/opam
rename to packages/torch/torch.v0.18~preview.130.74+175/opam
index aca76915c0..9c0041c380 100644
--- a/packages/torch/torch.v0.18~preview.130.55+197/opam
+++ b/packages/torch/torch.v0.18~preview.130.74+175/opam
@@ -11,18 +11,19 @@ build: [
 ]
 depends: [
   "ocaml"               {>= "5.1.0"}
-  "base"                {= "v0.18~preview.130.55+197"}
-  "base_bigstring"      {= "v0.18~preview.130.55+197"}
-  "core"                {= "v0.18~preview.130.55+197"}
-  "core_unix"           {= "v0.18~preview.130.55+197"}
-  "ppx_bench"           {= "v0.18~preview.130.55+197"}
-  "ppx_inline_test"     {= "v0.18~preview.130.55+197"}
-  "ppx_jane"            {= "v0.18~preview.130.55+197"}
-  "ppx_let"             {= "v0.18~preview.130.55+197"}
-  "ppx_string"          {= "v0.18~preview.130.55+197"}
-  "stdio"               {= "v0.18~preview.130.55+197"}
+  "base"                {= "v0.18~preview.130.74+175"}
+  "core"                {= "v0.18~preview.130.74+175"}
+  "core_unix"           {= "v0.18~preview.130.74+175"}
+  "ppx_bench"           {= "v0.18~preview.130.74+175"}
+  "ppx_expect"          {= "v0.18~preview.130.74+175"}
+  "ppx_inline_test"     {= "v0.18~preview.130.74+175"}
+  "ppx_jane"            {= "v0.18~preview.130.74+175"}
+  "ppx_let"             {= "v0.18~preview.130.74+175"}
+  "ppx_module_timer"    {= "v0.18~preview.130.74+175"}
+  "ppx_string"          {= "v0.18~preview.130.74+175"}
+  "stdio"               {= "v0.18~preview.130.74+175"}
   "ctypes"              {= "0.23.0+ox"}
-  "ctypes-foreign"
+  "ctypes-foreign"      {= "0.23.0+ox"}
   "dune"                {>= "3.17.0"}
   "dune-configurator"
   "ocaml-compiler-libs" {= "v0.17.0+ox"}
@@ -40,7 +41,7 @@ tape-based automatic differentiation.
 """
 url {
   src:
-    "https://github.com/janestreet/torch/archive/779d254c7a94ec5c279c0da35cbfc3c91eb1624f.tar.gz"
+    "https://github.com/janestreet/torch/archive/8a70af1d196f7c82fc66ba771f961833c939524c.tar.gz"
   checksum:
-    "sha256=a1eed60b3349054ef33ffce10fbbf98c9a90393123911506acda108fa54e4dea"
+    "sha256=e92bd226b74383614d390f9130766749140d8f3307b2dc2280ed0aaa11fe4dd2"
 }
diff --git a/packages/tracing/tracing.v0.18~preview.130.55+197/opam b/packages/tracing/tracing.v0.18~preview.130.74+175/opam
similarity index 62%
rename from packages/tracing/tracing.v0.18~preview.130.55+197/opam
rename to packages/tracing/tracing.v0.18~preview.130.74+175/opam
index f2a14b0caa..f466502425 100644
--- a/packages/tracing/tracing.v0.18~preview.130.55+197/opam
+++ b/packages/tracing/tracing.v0.18~preview.130.74+175/opam
@@ -11,12 +11,12 @@ build: [
 ]
 depends: [
   "ocaml"        {>= "5.1.0"}
-  "async"        {= "v0.18~preview.130.55+197"}
-  "async_unix"   {= "v0.18~preview.130.55+197"}
-  "core"         {= "v0.18~preview.130.55+197"}
-  "core_kernel"  {= "v0.18~preview.130.55+197"}
-  "core_unix"    {= "v0.18~preview.130.55+197"}
-  "ppx_jane"     {= "v0.18~preview.130.55+197"}
+  "async"        {= "v0.18~preview.130.74+175"}
+  "async_unix"   {= "v0.18~preview.130.74+175"}
+  "core"         {= "v0.18~preview.130.74+175"}
+  "core_kernel"  {= "v0.18~preview.130.74+175"}
+  "core_unix"    {= "v0.18~preview.130.74+175"}
+  "ppx_jane"     {= "v0.18~preview.130.74+175"}
   "cohttp"       {>= "2.5.6"}
   "cohttp-async" {>= "2.5.7" & < "3.0.0" | >= "5.1.1" & < "6.0.0"}
   "dune"         {>= "3.17.0"}
@@ -29,7 +29,7 @@ Utilities for creating and parsing traces in Fuchsia Trace Format.
 """
 url {
   src:
-    "https://github.com/janestreet/tracing/archive/519a286705fb02702a7d606e3052643313cbe60c.tar.gz"
+    "https://github.com/janestreet/tracing/archive/e86b01e8d2b74a1d0756fd065a0b768c5e8ed51b.tar.gz"
   checksum:
-    "sha256=9a08083813bddbdcbd1f15b25a51df1b3bda3dd875e3b8b4cd4329626dd7c77b"
+    "sha256=991d04bd85c9767e16c5b9479202da39ed68fcf020e65bebf744ed0a2823cbc1"
 }
diff --git a/packages/typerep/typerep.v0.18~preview.130.55+197/opam b/packages/typerep/typerep.v0.18~preview.130.74+175/opam
similarity index 69%
rename from packages/typerep/typerep.v0.18~preview.130.55+197/opam
rename to packages/typerep/typerep.v0.18~preview.130.74+175/opam
index d255644836..8ade5df886 100644
--- a/packages/typerep/typerep.v0.18~preview.130.55+197/opam
+++ b/packages/typerep/typerep.v0.18~preview.130.74+175/opam
@@ -11,8 +11,8 @@ build: [
 ]
 depends: [
   "ocaml"        {>= "5.1.0"}
-  "base"         {= "v0.18~preview.130.55+197"}
-  "ppx_template" {= "v0.18~preview.130.55+197"}
+  "base"         {= "v0.18~preview.130.74+175"}
+  "ppx_template" {= "v0.18~preview.130.74+175"}
   "dune"         {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -21,7 +21,7 @@ description: """
 """
 url {
   src:
-    "https://github.com/janestreet/typerep/archive/256c009b920d7ebb683cce13a559f901a310e718.tar.gz"
+    "https://github.com/janestreet/typerep/archive/1d5548aa8f86dce0d7ee79b1a8b75fcb118b8e4d.tar.gz"
   checksum:
-    "sha256=6835bdbebe30298bb4517b8b443807a77329432523f5da22104c9c61a0dbfecc"
+    "sha256=cba79a61b73f120aa382192a3a033089173ef0917086fe0f879dd0ea5268efb4"
 }
diff --git a/packages/unboxed/unboxed.v0.18~preview.130.55+197/opam b/packages/unboxed/unboxed.v0.18~preview.130.74+175/opam
similarity index 50%
rename from packages/unboxed/unboxed.v0.18~preview.130.55+197/opam
rename to packages/unboxed/unboxed.v0.18~preview.130.74+175/opam
index 1e6c93b453..3d29a8918a 100644
--- a/packages/unboxed/unboxed.v0.18~preview.130.55+197/opam
+++ b/packages/unboxed/unboxed.v0.18~preview.130.74+175/opam
@@ -11,14 +11,14 @@ build: [
 ]
 depends: [
   "ocaml"                   {>= "5.2.0"}
-  "base"                    {= "v0.18~preview.130.55+197"}
-  "bin_prot"                {= "v0.18~preview.130.55+197"}
-  "core"                    {= "v0.18~preview.130.55+197"}
-  "float_array"             {= "v0.18~preview.130.55+197"}
-  "ocaml_intrinsics_kernel" {= "v0.18~preview.130.55+197"}
-  "ppx_jane"                {= "v0.18~preview.130.55+197"}
-  "sexplib"                 {= "v0.18~preview.130.55+197"}
-  "typerep"                 {= "v0.18~preview.130.55+197"}
+  "base"                    {= "v0.18~preview.130.74+175"}
+  "bin_prot"                {= "v0.18~preview.130.74+175"}
+  "core"                    {= "v0.18~preview.130.74+175"}
+  "float_array"             {= "v0.18~preview.130.74+175"}
+  "ocaml_intrinsics_kernel" {= "v0.18~preview.130.74+175"}
+  "ppx_jane"                {= "v0.18~preview.130.74+175"}
+  "sexplib"                 {= "v0.18~preview.130.74+175"}
+  "typerep"                 {= "v0.18~preview.130.74+175"}
   "dune"                    {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -28,7 +28,7 @@ description: """
 """
 url {
   src:
-    "https://github.com/janestreet/unboxed/archive/eaff15eaa447a8dd6bfd0adb3889d36acb9a9515.tar.gz"
+    "https://github.com/janestreet/unboxed/archive/8f215207ea41e803d9bd60e37f758c7456b6ca53.tar.gz"
   checksum:
-    "sha256=77e0ece3c342d9b409412ff37414dc485667cce0ffc8b0a9e214f87d82e7e28f"
+    "sha256=7549af46646db7d5bec5974bdc62b06fdf921366b2463d18cddbb13e3289053c"
 }
diff --git a/packages/unique/unique.v0.18~preview.130.55+197/opam b/packages/unique/unique.v0.18~preview.130.74+175/opam
similarity index 64%
rename from packages/unique/unique.v0.18~preview.130.55+197/opam
rename to packages/unique/unique.v0.18~preview.130.74+175/opam
index 2445974af0..7cdaecfd8b 100644
--- a/packages/unique/unique.v0.18~preview.130.55+197/opam
+++ b/packages/unique/unique.v0.18~preview.130.74+175/opam
@@ -11,10 +11,10 @@ build: [
 ]
 depends: [
   "ocaml"        {>= "5.2.0"}
-  "base"         {= "v0.18~preview.130.55+197"}
-  "basement"     {= "v0.18~preview.130.55+197"}
-  "portable"     {= "v0.18~preview.130.55+197"}
-  "ppx_template" {= "v0.18~preview.130.55+197"}
+  "base"         {= "v0.18~preview.130.74+175"}
+  "basement"     {= "v0.18~preview.130.74+175"}
+  "portable"     {= "v0.18~preview.130.74+175"}
+  "ppx_template" {= "v0.18~preview.130.74+175"}
   "dune"         {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -24,7 +24,7 @@ description: """
 """
 url {
   src:
-    "https://github.com/janestreet/unique/archive/5652807c703cf9f023594a76a34ce9edb53e1891.tar.gz"
+    "https://github.com/janestreet/unique/archive/1e4cb58498d1ef41f8ce74d9b7563eaf18c63052.tar.gz"
   checksum:
-    "sha256=2a7707ca48f516dc6cb96e21118af8410b5f35b27dc5f886db0942a987f74085"
+    "sha256=2041e455de7586c80eb2de184aefa23cbb4b7e9698d105ed41b6a2aeafa5a7f1"
 }
diff --git a/packages/univ_map/univ_map.v0.18~preview.130.55+197/opam b/packages/univ_map/univ_map.v0.18~preview.130.74+175/opam
similarity index 78%
rename from packages/univ_map/univ_map.v0.18~preview.130.55+197/opam
rename to packages/univ_map/univ_map.v0.18~preview.130.74+175/opam
index d0980c7149..e0dae8dfb3 100644
--- a/packages/univ_map/univ_map.v0.18~preview.130.55+197/opam
+++ b/packages/univ_map/univ_map.v0.18~preview.130.74+175/opam
@@ -11,12 +11,12 @@ build: [
 ]
 depends: [
   "ocaml"            {>= "5.1.0"}
-  "base"             {= "v0.18~preview.130.55+197"}
-  "ppx_base"         {= "v0.18~preview.130.55+197"}
-  "ppx_here"         {= "v0.18~preview.130.55+197"}
-  "ppx_inline_test"  {= "v0.18~preview.130.55+197"}
-  "ppx_sexp_message" {= "v0.18~preview.130.55+197"}
-  "ppx_sexp_value"   {= "v0.18~preview.130.55+197"}
+  "base"             {= "v0.18~preview.130.74+175"}
+  "ppx_base"         {= "v0.18~preview.130.74+175"}
+  "ppx_here"         {= "v0.18~preview.130.74+175"}
+  "ppx_inline_test"  {= "v0.18~preview.130.74+175"}
+  "ppx_sexp_message" {= "v0.18~preview.130.74+175"}
+  "ppx_sexp_value"   {= "v0.18~preview.130.74+175"}
   "dune"             {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/unsafe_clear/.generated b/packages/unsafe_clear/.generated
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/unsafe_clear/unsafe_clear.v0.18~preview.130.74+175/opam b/packages/unsafe_clear/unsafe_clear.v0.18~preview.130.74+175/opam
new file mode 100644
index 0000000000..6dac4d5d5f
--- /dev/null
+++ b/packages/unsafe_clear/unsafe_clear.v0.18~preview.130.74+175/opam
@@ -0,0 +1,32 @@
+opam-version: "2.0"
+maintainer: "Jane Street developers"
+authors: ["Jane Street Group, LLC"]
+homepage: "https://github.com/janestreet/unsafe_clear"
+bug-reports: "https://github.com/janestreet/unsafe_clear/issues"
+dev-repo: "git+https://github.com/janestreet/unsafe_clear.git"
+doc:
+  "https://ocaml.janestreet.com/ocaml-core/latest/doc/unsafe_clear/index.html"
+license: "MIT"
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+]
+depends: [
+  "ocaml"                    {>= "5.2.0"}
+  "base"                     {= "v0.18~preview.130.74+175"}
+  "core"                     {= "v0.18~preview.130.74+175"}
+  "expect_test_helpers_core" {= "v0.18~preview.130.74+175"}
+  "ppx_jane"                 {= "v0.18~preview.130.74+175"}
+  "dune"                     {>= "3.17.0"}
+]
+available: arch != "arm32" & arch != "x86_32"
+synopsis:
+  "Utilities for data structures that use arrays for backing memory, e.g. [Vec]"
+description: """
+Utilities for data structures that use arrays for backing memory, e.g. [Vec]
+"""
+url {
+  src:
+    "https://github.com/janestreet/unsafe_clear/archive/8506b0548961d2b8144b076355613b319e2f6c2c.tar.gz"
+  checksum:
+    "sha256=9d5c65cf8d815c40be94e6b451d5e704ddd0c07428330e7695996a2769514f1a"
+}
diff --git a/packages/uopt/uopt.v0.18~preview.130.55+197/opam b/packages/uopt/uopt.v0.18~preview.130.74+175/opam
similarity index 92%
rename from packages/uopt/uopt.v0.18~preview.130.55+197/opam
rename to packages/uopt/uopt.v0.18~preview.130.74+175/opam
index 81a1c9e1de..e931422eb7 100644
--- a/packages/uopt/uopt.v0.18~preview.130.55+197/opam
+++ b/packages/uopt/uopt.v0.18~preview.130.74+175/opam
@@ -11,8 +11,8 @@ build: [
 ]
 depends: [
   "ocaml"    {>= "5.1.0"}
-  "base"     {= "v0.18~preview.130.55+197"}
-  "ppx_jane" {= "v0.18~preview.130.55+197"}
+  "base"     {= "v0.18~preview.130.74+175"}
+  "ppx_jane" {= "v0.18~preview.130.74+175"}
   "dune"     {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/uri_parsing/uri_parsing.v0.18~preview.130.55+197/opam b/packages/uri_parsing/uri_parsing.v0.18~preview.130.74+175/opam
similarity index 69%
rename from packages/uri_parsing/uri_parsing.v0.18~preview.130.55+197/opam
rename to packages/uri_parsing/uri_parsing.v0.18~preview.130.74+175/opam
index 52fa0ff9eb..aa55a40a23 100644
--- a/packages/uri_parsing/uri_parsing.v0.18~preview.130.55+197/opam
+++ b/packages/uri_parsing/uri_parsing.v0.18~preview.130.74+175/opam
@@ -12,10 +12,10 @@ build: [
 ]
 depends: [
   "ocaml"            {>= "5.1.0"}
-  "core"             {= "v0.18~preview.130.55+197"}
-  "ppx_jane"         {= "v0.18~preview.130.55+197"}
-  "ppx_typed_fields" {= "v0.18~preview.130.55+197"}
-  "textutils"        {= "v0.18~preview.130.55+197"}
+  "core"             {= "v0.18~preview.130.74+175"}
+  "ppx_jane"         {= "v0.18~preview.130.74+175"}
+  "ppx_typed_fields" {= "v0.18~preview.130.74+175"}
+  "textutils"        {= "v0.18~preview.130.74+175"}
   "base64"           {>= "3.4.0"}
   "dune"             {>= "3.17.0"}
   "js_of_ocaml-ppx"  {= "6.0.1+ox"}
@@ -30,7 +30,7 @@ A library for building composable URI parsers using ppx_typed_fields.
 """
 url {
   src:
-    "https://github.com/janestreet/uri_parsing/archive/651acd0e6732647a1425d945329c62eb7258bc36.tar.gz"
+    "https://github.com/janestreet/uri_parsing/archive/28c7a6712624de0966e2b7906e45d0c6aa2e86ed.tar.gz"
   checksum:
-    "sha256=ad1e6c5d9a67c06f2bf137b0a0f35840e07c6d4689abde1839cc08cef7d91ce4"
+    "sha256=06d494f4ac19310f02e44944c0cd720348da187b37a80bad760e8aa550aa6ef1"
 }
diff --git a/packages/username_kernel/username_kernel.v0.18~preview.130.55+197/opam b/packages/username_kernel/username_kernel.v0.18~preview.130.74+175/opam
similarity index 90%
rename from packages/username_kernel/username_kernel.v0.18~preview.130.55+197/opam
rename to packages/username_kernel/username_kernel.v0.18~preview.130.74+175/opam
index cb0e956a4a..9131daca1c 100644
--- a/packages/username_kernel/username_kernel.v0.18~preview.130.55+197/opam
+++ b/packages/username_kernel/username_kernel.v0.18~preview.130.74+175/opam
@@ -12,8 +12,8 @@ build: [
 ]
 depends: [
   "ocaml"        {>= "5.1.0"}
-  "core"         {= "v0.18~preview.130.55+197"}
-  "ppx_template" {= "v0.18~preview.130.55+197"}
+  "core"         {= "v0.18~preview.130.74+175"}
+  "ppx_template" {= "v0.18~preview.130.74+175"}
   "dune"         {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/variantslib/variantslib.v0.18~preview.130.55+197/opam b/packages/variantslib/variantslib.v0.18~preview.130.74+175/opam
similarity index 95%
rename from packages/variantslib/variantslib.v0.18~preview.130.55+197/opam
rename to packages/variantslib/variantslib.v0.18~preview.130.74+175/opam
index aaa88ded4f..2a878b3ec9 100644
--- a/packages/variantslib/variantslib.v0.18~preview.130.55+197/opam
+++ b/packages/variantslib/variantslib.v0.18~preview.130.74+175/opam
@@ -12,7 +12,7 @@ build: [
 ]
 depends: [
   "ocaml" {>= "5.1.0"}
-  "base"  {= "v0.18~preview.130.55+197"}
+  "base"  {= "v0.18~preview.130.74+175"}
   "dune"  {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
diff --git a/packages/vcaml/vcaml.v0.18~preview.130.55+197/opam b/packages/vcaml/vcaml.v0.18~preview.130.74+175/opam
similarity index 58%
rename from packages/vcaml/vcaml.v0.18~preview.130.55+197/opam
rename to packages/vcaml/vcaml.v0.18~preview.130.74+175/opam
index a3fb200429..23ebd40224 100644
--- a/packages/vcaml/vcaml.v0.18~preview.130.55+197/opam
+++ b/packages/vcaml/vcaml.v0.18~preview.130.74+175/opam
@@ -14,21 +14,21 @@ run-test: [
 ]
 depends: [
   "ocaml"                      {>= "5.1.0"}
-  "async"                      {= "v0.18~preview.130.55+197"}
-  "async_kernel"               {= "v0.18~preview.130.55+197"}
-  "async_unix"                 {= "v0.18~preview.130.55+197"}
-  "base_trie"                  {= "v0.18~preview.130.55+197"}
-  "core"                       {= "v0.18~preview.130.55+197"}
-  "core_kernel"                {= "v0.18~preview.130.55+197"}
-  "core_unix"                  {= "v0.18~preview.130.55+197"}
-  "expect_test_helpers_async"  {= "v0.18~preview.130.55+197"}
-  "expect_test_helpers_core"   {= "v0.18~preview.130.55+197"}
-  "jsonaf"                     {= "v0.18~preview.130.55+197"}
-  "man_in_the_middle_debugger" {= "v0.18~preview.130.55+197"}
-  "ppx_jane"                   {= "v0.18~preview.130.55+197"}
-  "ppx_optcomp"                {= "v0.18~preview.130.55+197"}
-  "semantic_version"           {= "v0.18~preview.130.55+197"}
-  "textutils"                  {= "v0.18~preview.130.55+197"}
+  "async"                      {= "v0.18~preview.130.74+175"}
+  "async_kernel"               {= "v0.18~preview.130.74+175"}
+  "async_unix"                 {= "v0.18~preview.130.74+175"}
+  "base_trie"                  {= "v0.18~preview.130.74+175"}
+  "core"                       {= "v0.18~preview.130.74+175"}
+  "core_kernel"                {= "v0.18~preview.130.74+175"}
+  "core_unix"                  {= "v0.18~preview.130.74+175"}
+  "expect_test_helpers_async"  {= "v0.18~preview.130.74+175"}
+  "expect_test_helpers_core"   {= "v0.18~preview.130.74+175"}
+  "jsonaf"                     {= "v0.18~preview.130.74+175"}
+  "man_in_the_middle_debugger" {= "v0.18~preview.130.74+175"}
+  "ppx_jane"                   {= "v0.18~preview.130.74+175"}
+  "ppx_optcomp"                {= "v0.18~preview.130.74+175"}
+  "semantic_version"           {= "v0.18~preview.130.74+175"}
+  "textutils"                  {= "v0.18~preview.130.74+175"}
   "angstrom"                   {>= "0.15.0"}
   "angstrom-async"             {>= "0.15.0"}
   "bigstringaf"
@@ -56,7 +56,7 @@ for your plugin.
 """
 url {
   src:
-    "https://github.com/janestreet/vcaml/archive/760ae1aa0879a9a1a08da6c4b432bc4f0de592e0.tar.gz"
+    "https://github.com/janestreet/vcaml/archive/a88f7e5fecbd491a4f113816581da8ee34a6b8fd.tar.gz"
   checksum:
-    "sha256=c1ab7a42dfa35d1f2597951dfdc8e38a1b9261fbbfccf8b45860aaf5d946e739"
+    "sha256=e9448d4841212dab25bcb65b65374d79b70648b5e0af74596249d2f6a5cea270"
 }
diff --git a/packages/vec/vec.v0.18~preview.130.55+197/opam b/packages/vec/vec.v0.18~preview.130.74+175/opam
similarity index 57%
rename from packages/vec/vec.v0.18~preview.130.55+197/opam
rename to packages/vec/vec.v0.18~preview.130.74+175/opam
index 8aea6fe951..e8ec7d15d0 100644
--- a/packages/vec/vec.v0.18~preview.130.55+197/opam
+++ b/packages/vec/vec.v0.18~preview.130.74+175/opam
@@ -11,11 +11,11 @@ build: [
 ]
 depends: [
   "ocaml"              {>= "5.2.0"}
-  "core"               {= "v0.18~preview.130.55+197"}
-  "ppx_for_loop"       {= "v0.18~preview.130.55+197"}
-  "ppx_jane"           {= "v0.18~preview.130.55+197"}
-  "ppx_stable_witness" {= "v0.18~preview.130.55+197"}
-  "unboxed"            {= "v0.18~preview.130.55+197"}
+  "core"               {= "v0.18~preview.130.74+175"}
+  "ppx_for_loop"       {= "v0.18~preview.130.74+175"}
+  "ppx_jane"           {= "v0.18~preview.130.74+175"}
+  "ppx_stable_witness" {= "v0.18~preview.130.74+175"}
+  "unboxed"            {= "v0.18~preview.130.74+175"}
   "dune"               {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -25,7 +25,7 @@ Growable array.
 """
 url {
   src:
-    "https://github.com/janestreet/vec/archive/38e38c0322b71d564d361ddbcd29cbceb3bbc454.tar.gz"
+    "https://github.com/janestreet/vec/archive/2e3113bf35eb73d5a62b4cad5162ecfd0e27f1e6.tar.gz"
   checksum:
-    "sha256=03815f2986e84d794b88f33ee04b64f17cf1cb26b814492c874a6831b5396580"
+    "sha256=fe27f55ac1b4acd981b53d88068c0068456fc7e0b675c15f4d5a87ffc109d39d"
 }
diff --git a/packages/versioned_polling_state_rpc/versioned_polling_state_rpc.v0.18~preview.130.55+197/opam b/packages/versioned_polling_state_rpc/versioned_polling_state_rpc.v0.18~preview.130.74+175/opam
similarity index 69%
rename from packages/versioned_polling_state_rpc/versioned_polling_state_rpc.v0.18~preview.130.55+197/opam
rename to packages/versioned_polling_state_rpc/versioned_polling_state_rpc.v0.18~preview.130.74+175/opam
index 07dd1fc9ed..1efc825436 100644
--- a/packages/versioned_polling_state_rpc/versioned_polling_state_rpc.v0.18~preview.130.55+197/opam
+++ b/packages/versioned_polling_state_rpc/versioned_polling_state_rpc.v0.18~preview.130.74+175/opam
@@ -13,11 +13,11 @@ build: [
 ]
 depends: [
   "ocaml"             {>= "5.1.0"}
-  "async_rpc_kernel"  {= "v0.18~preview.130.55+197"}
-  "babel"             {= "v0.18~preview.130.55+197"}
-  "core"              {= "v0.18~preview.130.55+197"}
-  "polling_state_rpc" {= "v0.18~preview.130.55+197"}
-  "ppx_jane"          {= "v0.18~preview.130.55+197"}
+  "async_rpc_kernel"  {= "v0.18~preview.130.74+175"}
+  "babel"             {= "v0.18~preview.130.74+175"}
+  "core"              {= "v0.18~preview.130.74+175"}
+  "polling_state_rpc" {= "v0.18~preview.130.74+175"}
+  "ppx_jane"          {= "v0.18~preview.130.74+175"}
   "dune"              {>= "3.17.0"}
 ]
 available: arch != "arm32" & arch != "x86_32"
@@ -28,7 +28,7 @@ Helper functions for creating stable/versioned `Polling_state_rpc.t`s with babel
 """
 url {
   src:
-    "https://github.com/janestreet/versioned_polling_state_rpc/archive/9fabbf3ec42936b9044e15e5a7e8070800674d2a.tar.gz"
+    "https://github.com/janestreet/versioned_polling_state_rpc/archive/d98689599581a2d804581666d30c6fe8b12decd9.tar.gz"
   checksum:
-    "sha256=1bd508ff4a80690b0e96cc78d9b39e9eced201b2aa796be8052bb402f3bae511"
+    "sha256=3379b219c1c9b607c9403a7b7d0a5dd2b74fe1d8ba45806ba5b85245ed9221cd"
 }
diff --git a/packages/virtual_dom/virtual_dom.v0.18~preview.130.55+197/opam b/packages/virtual_dom/virtual_dom.v0.18~preview.130.74+175/opam
similarity index 59%
rename from packages/virtual_dom/virtual_dom.v0.18~preview.130.55+197/opam
rename to packages/virtual_dom/virtual_dom.v0.18~preview.130.74+175/opam
index 2125c3e51d..b0818eebb1 100644
--- a/packages/virtual_dom/virtual_dom.v0.18~preview.130.55+197/opam
+++ b/packages/virtual_dom/virtual_dom.v0.18~preview.130.74+175/opam
@@ -12,15 +12,15 @@ build: [
 ]
 depends: [
   "ocaml"                     {>= "5.1.0"}
-  "async"                     {= "v0.18~preview.130.55+197"}
-  "async_kernel"              {= "v0.18~preview.130.55+197"}
-  "base"                      {= "v0.18~preview.130.55+197"}
-  "core"                      {= "v0.18~preview.130.55+197"}
-  "core_kernel"               {= "v0.18~preview.130.55+197"}
-  "expect_test_helpers_async" {= "v0.18~preview.130.55+197"}
-  "ppx_jane"                  {= "v0.18~preview.130.55+197"}
-  "sexplib"                   {= "v0.18~preview.130.55+197"}
-  "stdio"                     {= "v0.18~preview.130.55+197"}
+  "async"                     {= "v0.18~preview.130.74+175"}
+  "async_kernel"              {= "v0.18~preview.130.74+175"}
+  "base"                      {= "v0.18~preview.130.74+175"}
+  "core"                      {= "v0.18~preview.130.74+175"}
+  "core_kernel"               {= "v0.18~preview.130.74+175"}
+  "expect_test_helpers_async" {= "v0.18~preview.130.74+175"}
+  "ppx_jane"                  {= "v0.18~preview.130.74+175"}
+  "sexplib"                   {= "v0.18~preview.130.74+175"}
+  "stdio"                     {= "v0.18~preview.130.74+175"}
   "base64"                    {>= "3.4.0"}
   "dune"                      {>= "3.17.0"}
   "gen_js_api"                {= "1.1.2+ox"}
@@ -38,7 +38,7 @@ https://github.com/Matt-Esch/virtual-dom.
 """
 url {
   src:
-    "https://github.com/janestreet/virtual_dom/archive/cf26faae62cd34ea0bd8eaebb63e2a61a86de653.tar.gz"
+    "https://github.com/janestreet/virtual_dom/archive/e6948518c75961340e99794c90e55fd44ba3e500.tar.gz"
   checksum:
-    "sha256=5369b5deb663076605c78f03406613ccda9b8bcc194cc8839999a396d5ca9bda"
+    "sha256=d6bcf9861bd7cb8ce1bbe59f05fc79a9e69b3696114f7f9d2e4c0a7e5a239021"
 }
diff --git a/packages/wasm_of_ocaml-compiler/wasm_of_ocaml-compiler.6.0.1+ox/files/js_of_ocaml-5.2.0-compiler-changes.patch b/packages/wasm_of_ocaml-compiler/wasm_of_ocaml-compiler.6.0.1+ox/files/js_of_ocaml-5.2.0-compiler-changes.patch
index 2ad0a64b33..963ee6f716 100644
--- a/packages/wasm_of_ocaml-compiler/wasm_of_ocaml-compiler.6.0.1+ox/files/js_of_ocaml-5.2.0-compiler-changes.patch
+++ b/packages/wasm_of_ocaml-compiler/wasm_of_ocaml-compiler.6.0.1+ox/files/js_of_ocaml-5.2.0-compiler-changes.patch
@@ -335,7 +335,7 @@
 +
 +//Provides: caml_is_null
 +function caml_is_null(o) {
-+  return o === null;
++  return o === null ? 1 : 0;
 +}
 --- a/runtime/wasm/compare.wat
 +++ b/runtime/wasm/compare.wat
diff --git a/packages/wasm_of_ocaml-compiler/wasm_of_ocaml-compiler.6.0.1+ox/files/js_of_ocaml-iarray-primitives.patch b/packages/wasm_of_ocaml-compiler/wasm_of_ocaml-compiler.6.0.1+ox/files/js_of_ocaml-iarray-primitives.patch
index 8c851caefb..f6ba1a17da 100644
--- a/packages/wasm_of_ocaml-compiler/wasm_of_ocaml-compiler.6.0.1+ox/files/js_of_ocaml-iarray-primitives.patch
+++ b/packages/wasm_of_ocaml-compiler/wasm_of_ocaml-compiler.6.0.1+ox/files/js_of_ocaml-iarray-primitives.patch
@@ -1,6 +1,6 @@
 --- a/runtime/js/array.js
 +++ b/runtime/js/array.js
-@@ -198,6 +198,16 @@ function caml_array_make(len, init) {
+@@ -198,6 +198,16 @@
    return b;
  }
 
diff --git a/packages/wasm_of_ocaml-compiler/wasm_of_ocaml-compiler.6.0.1+ox/files/js_of_ocaml-magic_number.ml.patch b/packages/wasm_of_ocaml-compiler/wasm_of_ocaml-compiler.6.0.1+ox/files/js_of_ocaml-magic_number.ml.patch
index 24ec30b5bb..40ed5f1906 100644
--- a/packages/wasm_of_ocaml-compiler/wasm_of_ocaml-compiler.6.0.1+ox/files/js_of_ocaml-magic_number.ml.patch
+++ b/packages/wasm_of_ocaml-compiler/wasm_of_ocaml-compiler.6.0.1+ox/files/js_of_ocaml-magic_number.ml.patch
@@ -6,7 +6,7 @@
 
 -let v =
 -  let current = Ocaml_version.current in
-+let v = 568
++let v = 569
 +  (* let current = Ocaml_version.current in
    match current with
    | 4 :: 08 :: _ -> 25
diff --git a/packages/wasm_of_ocaml-compiler/wasm_of_ocaml-compiler.6.0.1+ox/files/js_of_ocaml-ocaml_version-ppx.patch b/packages/wasm_of_ocaml-compiler/wasm_of_ocaml-compiler.6.0.1+ox/files/js_of_ocaml-ocaml_version-ppx.patch
new file mode 100644
index 0000000000..d82b9d1fb8
--- /dev/null
+++ b/packages/wasm_of_ocaml-compiler/wasm_of_ocaml-compiler.6.0.1+ox/files/js_of_ocaml-ocaml_version-ppx.patch
@@ -0,0 +1,24 @@
+--- a/toplevel/lib/jsooTop.ml
++++ b/toplevel/lib/jsooTop.ml
+@@ -65,6 +65,7 @@
+     p := !p + len'';
+     len''
+
++[%%if ocaml_version < (4, 14, 0)]
+ let use ffp content =
+   let fname, oc =
+     Filename.open_temp_file ~mode:[ Open_binary ] "jsoo_toplevel" "fake_stdin"
+@@ -78,10 +79,11 @@
+   with e ->
+     Sys.remove fname;
+     raise e
+-[@@if ocaml_version < (4, 14, 0)]
++[%%endif]
+
++[%%if ocaml_version >= (4, 14, 0)]
+ let use ffp content = Toploop.use_silently ffp (String content)
+-[@@if ocaml_version >= (4, 14, 0)]
++[%%endif]
+
+ let execute printval ?pp_code ?highlight_location pp_answer s =
+   let lb = Lexing.from_function (refill_lexbuf s (ref 0) pp_code) in
diff --git a/packages/wasm_of_ocaml-compiler/wasm_of_ocaml-compiler.6.0.1+ox/opam b/packages/wasm_of_ocaml-compiler/wasm_of_ocaml-compiler.6.0.1+ox/opam
index 099b2eeb6c..1fd937da48 100644
--- a/packages/wasm_of_ocaml-compiler/wasm_of_ocaml-compiler.6.0.1+ox/opam
+++ b/packages/wasm_of_ocaml-compiler/wasm_of_ocaml-compiler.6.0.1+ox/opam
@@ -22,7 +22,7 @@ depends: [
   "re"           {with-test & = "1.14.0+ox"}
   "cmdliner"     {>= "1.1.0"}
   "opam-format"  {with-test}
-  "sedlex"       {= "3.3+ox"}
+  "sedlex"       {= "3.6+ox"}
   "menhir"
   "menhirLib"
   "menhirSdk"
@@ -55,6 +55,7 @@ patches: [
   "js_of_ocaml-add-unboxed-and-float-block.patch"
   "js_of_ocaml-ident-is_global.patch"
   "js_of_ocaml-remove-float-externals.patch"
+  "js_of_ocaml-ocaml_version-ppx.patch"
   "js_of_ocaml-test-diffs-caused-by-build-differences.patch"
   "js_of_ocaml-fix-build_fs.patch"
   "js_of_ocaml-iarray-primitives.patch"
@@ -97,7 +98,7 @@ patches: [
 extra-files: [
   [
     "js_of_ocaml-magic_number.ml.patch"
-    "sha256=05e204eac0338a76ca02db89ebb9505d80a7e268b93b746408356be913e219e6"
+    "sha256=aa69b6b6414a6a320e3a5102f24f3bd14199c317b9fd7b3e40ace94deee905e2"
   ]
   [
     "js_of_ocaml-compilation_unit-name.patch"
@@ -123,6 +124,10 @@ extra-files: [
     "js_of_ocaml-remove-float-externals.patch"
     "sha256=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
   ]
+  [
+    "js_of_ocaml-ocaml_version-ppx.patch"
+    "sha256=df6bcb6da8aa3dfd6bd0a178679987d41c400ec1803f4a66659cfc822d1b280f"
+  ]
   [
     "js_of_ocaml-test-diffs-caused-by-build-differences.patch"
     "sha256=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
@@ -133,7 +138,7 @@ extra-files: [
   ]
   [
     "js_of_ocaml-iarray-primitives.patch"
-    "sha256=8c320fb413daad0393347bf6a22ca31fe6f1d3dd34f58e313aa44cd060fc56f8"
+    "sha256=6f7805c3876229168ac8b023783c75226bf57e1a2bc2ded04d0adb9e46def515"
   ]
   [
     "js_of_ocaml-important-config-changes.patch"
@@ -201,7 +206,7 @@ extra-files: [
   ]
   [
     "js_of_ocaml-5.2.0-compiler-changes.patch"
-    "sha256=12626322e63a8eaf68d4c8a1a1d3f428832869fae7020588e0fe40bbd8fd8cf8"
+    "sha256=e6a88c1c3af53b07f273cf6b37ce980042efdc3aca8a371aba8cfdfc3914d97e"
   ]
   [
     "js_of_ocaml-5.3-tests-runtime.patch"
diff --git a/packages/xpath/xpath.v0.18~preview.130.55+197/opam b/packages/xpath/xpath.v0.18~preview.130.74+175/opam
similarity index 87%
rename from packages/xpath/xpath.v0.18~preview.130.55+197/opam
rename to packages/xpath/xpath.v0.18~preview.130.74+175/opam
index 5b5c0b5a0d..95c26cc8f2 100644
--- a/packages/xpath/xpath.v0.18~preview.130.55+197/opam
+++ b/packages/xpath/xpath.v0.18~preview.130.74+175/opam
@@ -11,9 +11,9 @@ build: [
 ]
 depends: [
   "ocaml"      {>= "5.1.0"}
-  "core"       {= "v0.18~preview.130.55+197"}
-  "ppx_jane"   {= "v0.18~preview.130.55+197"}
-  "simple_xml" {= "v0.18~preview.130.55+197"}
+  "core"       {= "v0.18~preview.130.74+175"}
+  "ppx_jane"   {= "v0.18~preview.130.74+175"}
+  "simple_xml" {= "v0.18~preview.130.74+175"}
   "angstrom"   {>= "0.15.0"}
   "dune"       {>= "3.17.0"}
 ]
diff --git a/packages/zarith_stubs_js/zarith_stubs_js.v0.18~preview.130.55+197/opam b/packages/zarith_stubs_js/zarith_stubs_js.v0.18~preview.130.74+175/opam
similarity index 80%
rename from packages/zarith_stubs_js/zarith_stubs_js.v0.18~preview.130.55+197/opam
rename to packages/zarith_stubs_js/zarith_stubs_js.v0.18~preview.130.74+175/opam
index 253ea93242..612e6f7ce0 100644
--- a/packages/zarith_stubs_js/zarith_stubs_js.v0.18~preview.130.55+197/opam
+++ b/packages/zarith_stubs_js/zarith_stubs_js.v0.18~preview.130.74+175/opam
@@ -22,7 +22,7 @@ all of the Zarith C stubs in Javascript for use in Js_of_ocaml
 """
 url {
   src:
-    "https://github.com/janestreet/zarith_stubs_js/archive/55f3445d744c49ec3e143bbfcdf9582e0bb2caa5.tar.gz"
+    "https://github.com/janestreet/zarith_stubs_js/archive/6f00508b1d2ba3a74b83b8ce4e6f0f1b1973da87.tar.gz"
   checksum:
-    "sha256=7f8e62e623a5e9ac2c9f0a2405b3a3eef9bd01884c6ebcb1237ca3631014b7f4"
+    "sha256=1d0a113318b4d0367f2c03bb5d229ef67cca16ab9f1e06cf3eb37640fb2147b8"
 }
diff --git a/packages/zstandard/zstandard.v0.18~preview.130.55+197/opam b/packages/zstandard/zstandard.v0.18~preview.130.74+175/opam
similarity index 70%
rename from packages/zstandard/zstandard.v0.18~preview.130.55+197/opam
rename to packages/zstandard/zstandard.v0.18~preview.130.74+175/opam
index 17a5541ed8..7b4e5cb04b 100644
--- a/packages/zstandard/zstandard.v0.18~preview.130.55+197/opam
+++ b/packages/zstandard/zstandard.v0.18~preview.130.74+175/opam
@@ -12,9 +12,9 @@ build: [
 ]
 depends: [
   "ocaml"       {>= "5.1.0"}
-  "core"        {= "v0.18~preview.130.55+197"}
-  "core_kernel" {= "v0.18~preview.130.55+197"}
-  "ppx_jane"    {= "v0.18~preview.130.55+197"}
+  "core"        {= "v0.18~preview.130.74+175"}
+  "core_kernel" {= "v0.18~preview.130.74+175"}
+  "ppx_jane"    {= "v0.18~preview.130.74+175"}
   "conf-zstd"
   "ctypes"      {= "0.23.0+ox"}
   "dune"        {>= "3.17.0"}
@@ -27,7 +27,7 @@ Zstandard is a real-time compression algorithm which provides high compression r
 available: (arch = "x86_64" | arch = "arm64") & os = "linux"
 url {
   src:
-    "https://github.com/janestreet/zstandard/archive/f251a7b2caa8c03b293b9654a9eaea576df1c330.tar.gz"
+    "https://github.com/janestreet/zstandard/archive/0cfb3ea84f9ca60bdcaa0fad1e45be65cab53d38.tar.gz"
   checksum:
-    "sha256=46297c640665f09376a66415c71308ce75b1507ce2acdde8a7a76a18ce4f9626"
+    "sha256=b23c89aac1dbcd8f23f6056d4e41b3cc44bd8a8498860ec9d7d1f9a893e39596"
 }