Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[followup #433] MirageOS 3 working branch #459

Closed
wants to merge 4 commits into from
Closed

[followup #433] MirageOS 3 working branch #459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a3ef082
Use the MirageOS 3 specialised type names
avsm Jan 19, 2017
f9b960e
datakit-ci: depend on mirage-channel instead of channel
avsm Jan 19, 2017
af48623
datakit: require mirage-types >= 3.0.0 for the mirage-dev branch
avsm Jan 22, 2017
2a31707
datakit: depend on irmin-http explicitly
avsm Jan 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion datakit-ci.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ depends: [
"logs"
"tyxml" {>= "4.0.0"}
"tls"
"channel"
"mirage-channel"
"conduit"
"io-page"
"pbkdf"
Expand Down
2 changes: 1 addition & 1 deletion datakit-server.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
3 changes: 2 additions & 1 deletion opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@ 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"}
"irmin-http" {>= "1.0.0"}
"camlzip" {>= "1.06"}
"cstruct" {>= "2.2"}
"result"
Expand Down
2 changes: 1 addition & 1 deletion src/datakit-server/fs9p.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/datakit-server/fs9p.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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