From 0775095fea067e2df09bf934b130a57a10bc238a Mon Sep 17 00:00:00 2001 From: David Scott Date: Wed, 15 Nov 2017 13:47:10 +0000 Subject: [PATCH 1/3] Rename mirage-http to cohttp-mirage Related to [mirage/ocaml-cohttp#572] Signed-off-by: David Scott --- device-usage/conduit_server/config.ml | 2 +- device-usage/http-fetch/config.ml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-usage/conduit_server/config.ml b/device-usage/conduit_server/config.ml index 5cc49027..99d347bc 100644 --- a/device-usage/conduit_server/config.ml +++ b/device-usage/conduit_server/config.ml @@ -1,7 +1,7 @@ open Mirage let handler = - let packages = [package "mirage-http"] in + let packages = [package "cohttp-mirage"] in foreign ~packages "Unikernel.Main" (conduit @-> job) diff --git a/device-usage/http-fetch/config.ml b/device-usage/http-fetch/config.ml index 94f8ffda..889a853d 100644 --- a/device-usage/http-fetch/config.ml +++ b/device-usage/http-fetch/config.ml @@ -1,7 +1,7 @@ open Mirage let client = - let packages = [ package "mirage-http"; package "duration" ] in + let packages = [ package "cohttp-mirage"; package "duration" ] in foreign ~packages "Unikernel.Client" @@ time @-> console @-> resolver @-> conduit @-> job From 7aa3e1313803c667039b79282671054187b8b64e Mon Sep 17 00:00:00 2001 From: David Scott Date: Wed, 15 Nov 2017 15:49:07 +0000 Subject: [PATCH 2/3] travis: use the mirage-dev remote This is needed for cohttp-mirage: it's not possible to PIN and create a new package because the CI blocks. Signed-off-by: David Scott --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 2f8183ba..bd0c2d5d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,8 @@ env: global: - TESTS=false - PINS="lwt.dev:https://github.com/mirage/lwt.git#tracing" + # Needed until the cohttp-mirage (formerly mirage-http) is merged + - EXTRA_REMOTES="git://github.com/djs55/mirage-dev.git#cohttp" - UPDATE_GCC_BINUTILS=1 matrix: - OCAML_VERSION=4.03 WITH_TRACING=1 POST_INSTALL_HOOK="make MODE=unix && make testrun SUDO=sudo && make clean" From 9ed766ca6498ad07b80fc52093df71cab6464114 Mon Sep 17 00:00:00 2001 From: David Scott Date: Wed, 15 Nov 2017 17:30:40 +0000 Subject: [PATCH 3/3] Rename Cohttp_lwt.Server to Cohttp_lwt.S.Server Signed-off-by: David Scott --- applications/static_website_tls/dispatch.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/static_website_tls/dispatch.ml b/applications/static_website_tls/dispatch.ml index b919b575..a5659644 100644 --- a/applications/static_website_tls/dispatch.ml +++ b/applications/static_website_tls/dispatch.ml @@ -1,7 +1,7 @@ open Lwt.Infix (** Common signature for http and https. *) -module type HTTP = Cohttp_lwt.Server +module type HTTP = Cohttp_lwt.S.Server (* Logging *) let https_src = Logs.Src.create "https" ~doc:"HTTPS server"