From 1eee5cf48a5af522ee9766ab1624e0cd784d3da4 Mon Sep 17 00:00:00 2001
From: Calascibetta Romain <romain.calascibetta@gmail.com>
Date: Tue, 11 Jun 2024 02:24:31 +0200
Subject: [PATCH 1/2] Fix the compilation with mimic-happy-eyeballs.0.0.8

---
 src/git-unix/git_unix_mimic.ml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/git-unix/git_unix_mimic.ml b/src/git-unix/git_unix_mimic.ml
index b62617000..b95ec75c9 100644
--- 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

From 403a699b1800478c6c296641f50012de60181e36 Mon Sep 17 00:00:00 2001
From: Calascibetta Romain <romain.calascibetta@gmail.com>
Date: Tue, 11 Jun 2024 02:25:53 +0200
Subject: [PATCH 2/2] git-unix requires, at least, mimic.0.0.8

---
 git-unix.opam | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git-unix.opam b/git-unix.opam
index 8b00a4bed..0e2bfc30d 100644
--- 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"} ]