robur/opam-mirror
4
0
Fork 0
Code Issues 6 Pull requests 2 Projects Releases Packages Wiki Activity Actions

Fix the compilation of opam-mirror with lastest version of packages

Browse source
This commit is contained in:
Romain Calascibetta 2022-10-21 15:56:20 +02:00
parent 7d3ab77494
commit 7d1c9b0814
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mirage/config.ml
View file

@ -89,11 +89,11 @@ let http_client =
let packages = let packages =
[ package ~pin:"git+https://git.robur.io/robur/http-mirage-client.git#main" "http-mirage-client" ] in [ package ~pin:"git+https://git.robur.io/robur/http-mirage-client.git#main" "http-mirage-client" ] in
let connect _ modname = function let connect _ modname = function
| [ _time; _pclock; _tcpv4v6; ctx ] -> | [ _pclock; _tcpv4v6; ctx ] ->
Fmt.str {ocaml|%s.connect %s|ocaml} modname ctx Fmt.str {ocaml|%s.connect %s|ocaml} modname ctx
| _ -> assert false in | _ -> assert false in
impl ~packages ~connect "Http_mirage_client.Make" impl ~packages ~connect "Http_mirage_client.Make"
(time @-> pclock @-> tcpv4v6 @-> git_client @-> http_client) (pclock @-> tcpv4v6 @-> git_client @-> http_client)
(* XXX(dinosaure): [git_client] seems bad but it becames from a long discussion (* XXX(dinosaure): [git_client] seems bad but it becames from a long discussion
when a "mimic" device seems not accepted by everyone. We can copy [git_happy_eyeballs] when a "mimic" device seems not accepted by everyone. We can copy [git_happy_eyeballs]
and provide an [http_client] instead of a [git_client] but that mostly means that and provide an [http_client] instead of a [git_client] but that mostly means that
@ -104,7 +104,7 @@ let git_client, http_client =
let happy_eyeballs = git_happy_eyeballs stack dns (generic_happy_eyeballs stack dns) in let happy_eyeballs = git_happy_eyeballs stack dns (generic_happy_eyeballs stack dns) in
merge_git_clients (git_tcp tcp happy_eyeballs) merge_git_clients (git_tcp tcp happy_eyeballs)
(git_http ~authenticator:tls_authenticator tcp happy_eyeballs), (git_http ~authenticator:tls_authenticator tcp happy_eyeballs),
http_client $ default_time $ default_posix_clock $ tcp $ happy_eyeballs http_client $ default_posix_clock $ tcp $ happy_eyeballs
let program_block_size = let program_block_size =
let doc = Key.Arg.info [ "program-block-size" ] in let doc = Key.Arg.info [ "program-block-size" ] in

4
mirage/unikernel.ml
View file

@ -11,9 +11,9 @@ module Make
(HTTP : Http_mirage_client.S) = struct (HTTP : Http_mirage_client.S) = struct
module Part = Mirage_block_partition.Make(BLOCK) module Part = Mirage_block_partition.Make(BLOCK)
module KV = Tar_mirage.Make_KV_RW(Part) module KV = Tar_mirage.Make_KV_RW(Pclock)(Part)
module Cache = OneFFS.Make(Part) module Cache = OneFFS.Make(Part)
module Store = Git_kv.Make (Pclock) module Store = Git_kv.Make(Pclock)
module SM = Map.Make(String) module SM = Map.Make(String)
module SSet = Set.Make(String) module SSet = Set.Make(String)