adapt to API changes of mirage-conduit (dns resolver now has a timeout)

arenadotio · May 12, 2020 · 315a4ee · 315a4ee
1 parent cc67529
commit 315a4ee
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/dune-project b/dune-project
@@ -152,9 +152,10 @@
    (>= 4.08))
   logs
   mirage-channel
-  conduit-mirage
+  (conduit-mirage (>= 2.2.0))
   dns-client
   mirage-random
+  mirage-time
   mirage-clock
   mirage-stack
   (pgx

diff --git a/pgx_lwt_mirage.opam b/pgx_lwt_mirage.opam
@@ -14,9 +14,10 @@ depends: [
   "ocaml" {>= "4.08"}
   "logs"
   "mirage-channel"
-  "conduit-mirage"
+  "conduit-mirage" {>= "2.2.0"}
   "dns-client"
   "mirage-random"
+  "mirage-time"
   "mirage-clock"
   "mirage-stack"
   "pgx" {= version}

diff --git a/pgx_lwt_mirage/src/dune b/pgx_lwt_mirage/src/dune
@@ -10,6 +10,6 @@ let () = Jbuild_plugin.V1.send @@ {|
 
 (library
  (public_name pgx_lwt_mirage)
- (libraries pgx_lwt lwt logs.lwt pgx mirage-channel conduit-mirage dns-client mirage-random mirage-clock mirage-stack)
+ (libraries pgx_lwt lwt logs.lwt pgx mirage-channel conduit-mirage dns-client mirage-random mirage-time mirage-clock mirage-stack)
  |} ^ preprocess ^ {|)
 |}
diff --git a/pgx_lwt_mirage/src/pgx_lwt_mirage.ml b/pgx_lwt_mirage/src/pgx_lwt_mirage.ml
@@ -80,10 +80,11 @@ end
 
 module Make
     (RANDOM : Mirage_random.S)
+    (TIME : Mirage_time.S)
     (MCLOCK : Mirage_clock.MCLOCK)
     (STACK : Mirage_stack.V4) =
 struct
-  module Dns = Dns_client_mirage.Make (RANDOM) (MCLOCK) (STACK)
+  module Dns = Dns_client_mirage.Make (RANDOM) (TIME) (MCLOCK) (STACK)
 
   type sockaddr = Thread.sockaddr =
     | Unix of string

diff --git a/pgx_lwt_mirage/src/pgx_lwt_mirage.mli b/pgx_lwt_mirage/src/pgx_lwt_mirage.mli
@@ -19,6 +19,7 @@
 
 module Make
     (RANDOM : Mirage_random.S)
+    (TIME : Mirage_time.S)
     (CLOCK : Mirage_clock.MCLOCK)
     (STACK : Mirage_stack.V4) : sig
   val connect : STACK.t -> (module Pgx_lwt.S)