From f7194fcd3549f8ffb45b849fc77d71df9949778a Mon Sep 17 00:00:00 2001
From: Thomas Gazagnaire <thomas@gazagnaire.org>
Date: Fri, 29 Jan 2021 15:50:41 +0100
Subject: [PATCH] fixup: CI fixes

---
 .github/workflows/workflow.yml |  4 ----
 README.md                      | 10 ++++------
 cohttp-async.opam              |  1 -
 cohttp-lwt-unix.opam           |  5 +----
 4 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index f32ad5a1c5..6a0fd44bf0 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -35,8 +35,6 @@ jobs:
       - run: |
           opam pin add cohttp-async.dev . --no-action
           opam pin add cohttp-lwt-jsoo.dev . --no-action
-          opam pin add cohttp-lwt-unix-nossl.dev . --no-action
-          opam pin add cohttp-lwt-unix-ssl.dev . --no-action
           opam pin add cohttp-lwt-unix.dev . --no-action
           opam pin add cohttp-lwt.dev . --no-action
           opam pin add cohttp-mirage.dev . --no-action
@@ -50,8 +48,6 @@ jobs:
           cohttp-lwt \
           cohttp-lwt-jsoo \
           cohttp-lwt-unix \
-          cohttp-lwt-unix-nossl \
-          cohttp-lwt-unix-ssl \
           cohttp-mirage \
           cohttp-top \
 
diff --git a/README.md b/README.md
index 77cff5144f..4af58afe24 100644
--- a/README.md
+++ b/README.md
@@ -132,9 +132,7 @@ findlib (`ocamlfind`) libraries:
 * `cohttp` - Base `Cohttp` module. No platform specific functionality
 * `cohttp-async` - Async backend `Cohttp_async`
 * `cohttp-lwt` - Lwt backend without unix specifics
-* `cohttp-lwt-unix` - Unix based lwt backend with `tls` support
-* `cohttp-lwt-unix-ssl` - Unix based lwt backend with `lwt_ssl` support
-* `cohttp-lwt-unix-nossl` - Unix based lwt backend (only `http`)
+* `cohttp-lwt-unix` - Unix based lwt backend
 * `cohttp-lwt-jsoo` - Jsoo (XHR) client
 * `cohttp-top` - Print cohttp types in the toplevel (`#require "cohttp-top"`)
 
@@ -160,7 +158,7 @@ You can use [`Lwt.pick`](https://ocsigen.org/lwt/4.1.0/api/Lwt) to set a timeout
 on the execution of a thread. For example, say that you want to set a timeout on
 the `Client.get` thread in the example above, then you could modify the get call
 as follows
- 
+
 ```ocaml
 (* [...] *)
 
@@ -247,7 +245,7 @@ To build and execute with `dune`, first create the following `dune` file
 ```
 cat - > dune <<EOF
 (executable
-  ;(public_name docker_example) 
+  ;(public_name docker_example)
   (name docker_example)
   (libraries cohttp-lwt-unix conduit-lwt))
 EOF
@@ -256,7 +254,7 @@ then run the example with
 ```
 dune exec ./docker_example.exe
 ```
-Even though conduit is transitively there, for this example we are explicitly 
+Even though conduit is transitively there, for this example we are explicitly
 mentioning it to emphasize that we are creating a new Conduit resolver. Refer to
 [conduit's README](https://github.com/mirage/ocaml-conduit/) for examples of use and
 links to up-to-date conduit documentation.
diff --git a/cohttp-async.opam b/cohttp-async.opam
index eae8a391c8..61821c20c0 100644
--- a/cohttp-async.opam
+++ b/cohttp-async.opam
@@ -32,7 +32,6 @@ depends: [
   "core" {with-test}
   "cohttp" {=version}
   "conduit-async" {>="3.0.0"}
-  "conduit-async-ssl"
   "magic-mime"
   "mirage-crypto" {with-test}
   "logs"
diff --git a/cohttp-lwt-unix.opam b/cohttp-lwt-unix.opam
index d0cc1288bd..f0c0f412ad 100644
--- a/cohttp-lwt-unix.opam
+++ b/cohttp-lwt-unix.opam
@@ -27,15 +27,12 @@ bug-reports: "https://github.com/mirage/ocaml-cohttp/issues"
 depends: [
   "ocaml" {>= "4.08"}
   "dune" {>= "1.1.0"}
-  "conduit-lwt" {>= "3.0.0"}
-  "conduit-lwt-tls"
-  "ca-certs"
+  "conduit-lwt-unix" {>= "1.0.3"}
   "cmdliner"
   "magic-mime"
   "logs"
   "fmt" {>= "0.8.2"}
   "cohttp-lwt" {=version}
-  "cohttp-lwt-unix-nossl" {=version}
   "ppx_sexp_conv" {>= "v0.13.0"}
   "lwt" {>= "3.0.0"}
   "base-unix"