Merge pull request #642 from mirage/fix-mimic-0.0.8

Fix the compilation with mimic-happy-eyeballs.0.0.8
mirage · Jun 11, 2024 · c70a4df · c70a4df
2 parents 7f99931 + 403a699
commit c70a4df
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/git-unix.opam b/git-unix.opam
@@ -41,7 +41,7 @@ depends: [
   "mirage-flow" {>= "4.0.0"}
   "ke" {>= "0.4" & with-test}
   "mirage-crypto-rng" {>= "0.11.0" & with-test}
-  "mimic"
+  "mimic" {>= "0.0.8"}
   "tls" {>= "0.14.0"}
 ]
 conflicts: [ "result" {< "1.5"} ]

diff --git a/src/git-unix/git_unix_mimic.ml b/src/git-unix/git_unix_mimic.ml
@@ -8,8 +8,9 @@ module Happy_eyeballs = struct
 
   let happy_eyeballs = Mimic.make ~name:"happy-eyeballs-lwt"
 
-  let resolve t addr ports =
-    Happy_eyeballs_lwt.connect t addr ports >|= Rresult.R.open_error_msg
+  let resolve t ?aaaa_timeout ?connect_delay ?connect_timeout ?resolve_timeout ?resolve_retries addr ports =
+    Happy_eyeballs_lwt.connect ?aaaa_timeout ?connect_delay ?connect_timeout ?resolve_timeout ?resolve_retries
+      t addr ports >|= Rresult.R.open_error_msg
 end
 
 module TCP = struct