tls is multi-packages now

mirage · Aug 15, 2019 · bf64252 · bf64252
1 parent afacd81
commit bf64252
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/conduit-lwt-unix.opam b/conduit-lwt-unix.opam
@@ -18,7 +18,7 @@ depends: [
   "ipaddr" {>= "4.0.0"}
   "ipaddr-sexp"
 ]
-depopts: ["tls" "lwt_ssl" "launchd"]
+depopts: ["tls-lwt" "lwt_ssl" "launchd"]
 conflicts: [
   "tls" {< "0.8.0"}
   "ssl" {< "0.5.9"}

diff --git a/conduit-mirage.opam b/conduit-mirage.opam
@@ -20,6 +20,7 @@ depends: [
   "vchan" {>= "3.0.0"}
   "xenstore"
   "tls" {>= "0.8.0"}
+  "tls-mirage"
   "ipaddr" {>= "3.0.0"}
   "ipaddr-sexp"
   "awa-mirage"

diff --git a/lwt-unix/dune b/lwt-unix/dune
@@ -10,7 +10,7 @@ let v ~launchd ~ssl ~tls () =
     else "conduit_lwt_unix_ssl_dummy", ""
   in
   let tls, tls_d =
-    if tls then "conduit_lwt_tls_real", "tls.lwt "
+    if tls then "conduit_lwt_tls_real", "tls-lwt "
     else "conduit_lwt_tls_dummy", ""
   in
   Printf.sprintf {|
@@ -34,7 +34,7 @@ let main () =
   let is_installed s = Printf.kprintf Sys.command "ocamlfind query %s" s = 0 in
   let launchd = is_installed "launchd.lwt" in
   let ssl = is_installed "lwt_ssl" in
-  let tls = Sys.unix && is_installed "tls.lwt" in
+  let tls = Sys.unix && is_installed "tls-lwt" in
   Printf.printf
     "Configuration\n\
     \  launchd: %b\n\

diff --git a/mirage/dune b/mirage/dune
@@ -6,5 +6,5 @@
   (wrapped     false)
   (libraries   conduit conduit-lwt mirage-stack-lwt mirage-time-lwt
                mirage-random mirage-flow-lwt dns-client.mirage ipaddr-sexp
-               vchan tls tls.mirage xenstore.client uri.services
+               vchan tls tls-mirage xenstore.client uri.services
                awa-mirage mirage-clock))