From a3ef0820d29dffa90cbcc09ffc8e37499000792e Mon Sep 17 00:00:00 2001 From: Anil Madhavapeddy Date: Thu, 19 Jan 2017 10:44:41 +0000 Subject: [PATCH 1/4] Use the MirageOS 3 specialised type names Signed-off-by: Anil Madhavapeddy --- datakit-server.opam | 2 +- src/datakit-server/fs9p.ml | 2 +- src/datakit-server/fs9p.mli | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/datakit-server.opam b/datakit-server.opam index be0844835..94a5016bb 100644 --- a/datakit-server.opam +++ b/datakit-server.opam @@ -19,5 +19,5 @@ depends: [ "base-bytes" "astring" "logs" "uri" "rresult" "cstruct" "fmt" "protocol-9p" {>= "0.7.4"} - "sexplib" "mirage-types-lwt" + "sexplib" "mirage-flow-lwt" ] diff --git a/src/datakit-server/fs9p.ml b/src/datakit-server/fs9p.ml index 087838edc..363bccb43 100644 --- a/src/datakit-server/fs9p.ml +++ b/src/datakit-server/fs9p.ml @@ -188,7 +188,7 @@ module Op9p = struct end -module Make (Flow: V1_LWT.FLOW) = struct +module Make (Flow: Mirage_flow_lwt.S) = struct type flow = Flow.flow diff --git a/src/datakit-server/fs9p.mli b/src/datakit-server/fs9p.mli index 8d0a02a3f..98eee61aa 100644 --- a/src/datakit-server/fs9p.mli +++ b/src/datakit-server/fs9p.mli @@ -14,4 +14,4 @@ module type S = sig end (** Server builder. *) -module Make (Flow: V1_LWT.FLOW): S with type flow = Flow.flow +module Make (Flow: Mirage_flow_lwt.S): S with type flow = Flow.flow From f9b960e9ecdda28fa87cee464be7476a85e52a77 Mon Sep 17 00:00:00 2001 From: Anil Madhavapeddy Date: Thu, 19 Jan 2017 11:39:07 +0000 Subject: [PATCH 2/4] datakit-ci: depend on mirage-channel instead of channel This is part of the MirageOS 3 API renaming. Signed-off-by: Anil Madhavapeddy --- datakit-ci.opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datakit-ci.opam b/datakit-ci.opam index 71c3164d1..7bba6a107 100644 --- a/datakit-ci.opam +++ b/datakit-ci.opam @@ -30,7 +30,7 @@ depends: [ "logs" "tyxml" {>= "4.0.0"} "tls" - "channel" + "mirage-channel" "conduit" "io-page" "pbkdf" From af4862372227f1151a040cb5a45d73af54492b3a Mon Sep 17 00:00:00 2001 From: Anil Madhavapeddy Date: Sun, 22 Jan 2017 17:16:30 +0000 Subject: [PATCH 3/4] datakit: require mirage-types >= 3.0.0 for the mirage-dev branch Signed-off-by: Anil Madhavapeddy --- opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opam b/opam index 3b780f557..b72c09e23 100644 --- a/opam +++ b/opam @@ -22,7 +22,7 @@ depends: [ "rresult" "astring" "fmt" "asetmap" "git" {>= "1.9.3"} "mirage-tc" "uri" - "mirage-types" {< "3.0.0"} + "mirage-types" {>= "3.0.0"} "irmin" {>= "0.12.0"} "camlzip" {>= "1.06"} "cstruct" {>= "2.2"} From 2a31707469e0883a09b2e078bb3981826fbe6965 Mon Sep 17 00:00:00 2001 From: Anil Madhavapeddy Date: Mon, 30 Jan 2017 09:10:50 +0000 Subject: [PATCH 4/4] datakit: depend on irmin-http explicitly Signed-off-by: Anil Madhavapeddy --- opam | 1 + 1 file changed, 1 insertion(+) diff --git a/opam b/opam index b72c09e23..875a1d8fe 100644 --- a/opam +++ b/opam @@ -24,6 +24,7 @@ depends: [ "mirage-tc" "uri" "mirage-types" {>= "3.0.0"} "irmin" {>= "0.12.0"} + "irmin-http" {>= "1.0.0"} "camlzip" {>= "1.06"} "cstruct" {>= "2.2"} "result"