From 46b46ec1db4ac5fd71e3edfdf496ffafcfcb8c0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antonin=20D=C3=A9cimo?= <antonin@tarides.com>
Date: Tue, 5 Jul 2022 10:20:09 +0200
Subject: [PATCH] Require lwt.5.6.1 for bugfixes

---
 .gitmodules           | 1 +
 Dockerfile            | 4 ++--
 current_ocluster.opam | 2 +-
 dune-project          | 6 +++---
 obuilder              | 2 +-
 ocluster-api.opam     | 2 +-
 ocluster.opam         | 2 +-
 7 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index c5d87069..c3ff424b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,4 @@
 [submodule "obuilder"]
 	path = obuilder
 	url = https://github.com/ocurrent/obuilder.git
+	branch = master
diff --git a/Dockerfile b/Dockerfile
index 3234a560..c5c2d27a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
-FROM ocaml/opam:debian-11-ocaml-4.14@sha256:b83fcce3b715fe10ee2d3060763379e1ad9be76832d67203652f2c0abd6ae50d AS build
+FROM ocaml/opam:debian-11-ocaml-4.14@sha256:5b9de826b22c77a0654519d0959536f93a6ffd7020712a8b1c3437445e031e04 AS build
 RUN sudo apt-get update && sudo apt-get install libev-dev capnproto m4 pkg-config libsqlite3-dev libgmp-dev -y --no-install-recommends
-RUN cd ~/opam-repository && git pull origin -q master && git reset --hard 11e634fd946c90fdb26c14ae5f7759e644c898f0 && opam update
+RUN cd ~/opam-repository && git pull origin -q master && git reset --hard 97da9a1b68b824a65a09e5f7d071fcf2da35bd1b && opam update
 COPY --chown=opam ocluster-api.opam ocluster.opam /src/
 COPY --chown=opam obuilder/obuilder.opam obuilder/obuilder-spec.opam /src/obuilder/
 RUN opam pin -yn /src/obuilder/
diff --git a/current_ocluster.opam b/current_ocluster.opam
index aa43164d..bf8b6e96 100644
--- a/current_ocluster.opam
+++ b/current_ocluster.opam
@@ -11,7 +11,7 @@ depends: [
   "dune" {>= "2.8"}
   "ppx_deriving"
   "ocluster-api" {= version}
-  "lwt" {>= "5.5.0"}
+  "lwt" {>= "5.6.1"}
   "current" {>= "0.3"}
   "current_git" {>= "0.3"}
   "current_web" {>= "0.3" & with-test}
diff --git a/dune-project b/dune-project
index 3c2d04a4..55f335a8 100644
--- a/dune-project
+++ b/dune-project
@@ -11,7 +11,7 @@
  (description "OCaml bindings for the OCluster Cap'n Proto API.")
  (depends
   ppx_deriving
-  (lwt (>= 5.5.0))
+  (lwt (>= 5.6.1))
   (capnp-rpc-lwt (>= 1.2))
   fmt
   ppx_deriving_yojson
@@ -27,7 +27,7 @@
   ppx_sexp_conv
   dune-build-info
   (ocluster-api (= :version))
-  (lwt (>= 5.5.0))
+  (lwt (>= 5.6.1))
   capnp-rpc-lwt
   capnp-rpc-net
   (capnp-rpc-unix (>= 1.2))
@@ -58,7 +58,7 @@
  (depends
   ppx_deriving
   (ocluster-api (= :version))
-  (lwt (>= 5.5.0))
+  (lwt (>= 5.6.1))
   (current (>= 0.3))
   (current_git (>= 0.3))
   (current_web (and (>= 0.3) :with-test))
diff --git a/obuilder b/obuilder
index c8319955..ab58e15e 160000
--- a/obuilder
+++ b/obuilder
@@ -1 +1 @@
-Subproject commit c8319955acc039bab6d3c3d4c27bdd856cf6ed79
+Subproject commit ab58e15efae2d9266f493ca3a07ca533153988e7
diff --git a/ocluster-api.opam b/ocluster-api.opam
index a653d038..14468f4f 100644
--- a/ocluster-api.opam
+++ b/ocluster-api.opam
@@ -9,7 +9,7 @@ bug-reports: "https://github.com/ocurrent/ocluster/issues"
 depends: [
   "dune" {>= "2.8"}
   "ppx_deriving"
-  "lwt" {>= "5.5.0"}
+  "lwt" {>= "5.6.1"}
   "capnp-rpc-lwt" {>= "1.2"}
   "fmt"
   "ppx_deriving_yojson"
diff --git a/ocluster.opam b/ocluster.opam
index d5f8abde..b4a71b6e 100644
--- a/ocluster.opam
+++ b/ocluster.opam
@@ -22,7 +22,7 @@ depends: [
   "ppx_sexp_conv"
   "dune-build-info"
   "ocluster-api" {= version}
-  "lwt" {>= "5.5.0"}
+  "lwt" {>= "5.6.1"}
   "capnp-rpc-lwt"
   "capnp-rpc-net"
   "capnp-rpc-unix" {>= "1.2"}