Merge pull request #75 from mirage/cstruct

opam: resync cstruct constraints with upstream
mirage · Jun 19, 2022 · 8efec5c · 8efec5c
2 parents 95f7d1b + 63cca10
commit 8efec5c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/vhd-format-lwt.opam b/vhd-format-lwt.opam
@@ -2,7 +2,7 @@ opam-version: "2.0"
 maintainer: "dave@recoil.org"
 authors: ["Dave Scott" "Jon Ludlam"]
 tags: ["org:mirage" "org:xapi-project"]
-license: "LGPL-2.1only WITH OCaml-LGPL-linking-exception"
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 homepage: "https://github.com/mirage/ocaml-vhd"
 doc: "https://mirage.github.io/ocaml-vhd/"
 bug-reports: "https://github.com/mirage/ocaml-vhd/issues"

diff --git a/vhd-format.opam b/vhd-format.opam
@@ -2,16 +2,16 @@ opam-version: "2.0"
 maintainer: "dave@recoil.org"
 authors: ["Dave Scott" "Jon Ludlam"]
 tags: ["org:mirage" "org:xapi-project"]
-license: "LGPL-2.1only WITH OCaml-LGPL-linking-exception"
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 homepage: "https://github.com/mirage/ocaml-vhd"
 doc: "https://mirage.github.io/ocaml-vhd/"
 bug-reports: "https://github.com/mirage/ocaml-vhd/issues"
 depends: [
   "ocaml" {>= "4.03.0"}
-  "cstruct" {>= "1.9"}
+  "cstruct" {>= "1.9" & < "6.0.0"}
   "io-page"
   "rresult" {>= "0.3.0"}
-  "uuidm"
+  "uuidm" {>= "0.9.6"}
   "stdlib-shims"
   "dune" {>= "1.0"}
   "ppx_cstruct" {build & >= "3.0.0"}

diff --git a/vhd_format/f.ml b/vhd_format/f.ml
@@ -350,7 +350,7 @@ module Footer = struct
     ?(creator_host_os = Host_OS.Other 0l)
     ~current_size ?original_size
     ~disk_type
-    ?(uid = Uuidm.create `V4) ?(saved_state = false) () =
+    ?(uid = Uuidm.v `V4) ?(saved_state = false) () =
   let original_size = match original_size with
     | None -> current_size
     | Some x -> x in
@@ -1672,7 +1672,7 @@ module From_file = functor(F: S.FILE) -> struct
       return t
 
     let create_dynamic ~filename ~size
-      ?(uuid = Uuidm.create `V4)
+      ?(uuid = Uuidm.v `V4)
       ?(saved_state=false)
       ?(features=[]) () =
 
@@ -1723,7 +1723,7 @@ module From_file = functor(F: S.FILE) -> struct
 
     let create_difference ~filename ~parent
       ?(relative_path = true)
-      ?(uuid=Uuidm.create `V4)
+      ?(uuid=Uuidm.v `V4)
       ?(saved_state=false)
       ?(features=[]) () =