From adbc3de727cd305f9b3d62af589a9838b2a0112f Mon Sep 17 00:00:00 2001 From: Romain Calascibetta Date: Sun, 18 May 2025 14:17:43 +0200 Subject: [PATCH] Use Git_net module instead of Git_mirage --- lib/devices/git.ml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/devices/git.ml b/lib/devices/git.ml index b5362cc85..7ede27367 100644 --- a/lib/devices/git.ml +++ b/lib/devices/git.ml @@ -18,19 +18,19 @@ let git_merge_clients = let git_tcp = let packages = - [ package "git-mirage" ~sublibs:[ "tcp" ] ~min:"3.18.0" ~max:"3.19.0" ] + [ package "git-net" ] in let connect _ modname = function | [ _tcpv4v6; ctx ] -> code ~pos:__POS__ {ocaml|%s.connect %s|ocaml} modname ctx | _ -> connect_err "git_tcp" 2 in - impl ~packages ~connect "Git_mirage_tcp.Make" + impl ~packages ~connect "Git_net.TCP.Make" (tcpv4v6 @-> mimic @-> git_client) let git_ssh ?group ?authenticator ?key ?password () = let packages = - [ package "git-mirage" ~sublibs:[ "ssh" ] ~min:"3.18.0" ~max:"3.19.0" ] + [ package "git-net" ] in let key = Runtime_arg.ssh_key ?group key and password = Runtime_arg.ssh_password ?group password @@ -43,12 +43,12 @@ let git_ssh ?group ?authenticator ?key ?password () = modname ctx modname authenticator key password | _ -> connect_err "git_ssh" 5 in - impl ~packages ~connect ~runtime_args "Git_mirage_ssh.Make" + impl ~packages ~connect ~runtime_args "Git_net.SSH.Make" (tcpv4v6 @-> mimic @-> git_client) let git_http ?group ?authenticator ?headers () = let packages = - [ package "git-mirage" ~sublibs:[ "http" ] ~min:"3.18.0" ~max:"3.19.0" ] + [ package "git-net" ] in let authenticator = Runtime_arg.tls_authenticator ?group authenticator and headers = Runtime_arg.http_headers ?group headers in @@ -60,5 +60,5 @@ let git_http ?group ?authenticator ?headers () = modname ctx modname headers authenticator | _ -> connect_err "git_http" 4 in - impl ~packages ~connect ~runtime_args "Git_mirage_http.Make" + impl ~packages ~connect ~runtime_args "Git_net.HTTP.Make" (tcpv4v6 @-> mimic @-> git_client)