dune-project: Move vhd-format.opam to be generated by dune, add yojson dependency (#6827)

Corresponding xs-opam PR:
xapi-project/xs-opam#751

Author: psafont

dune-project

@@ -541,7 +541,28 @@
   yojson))
 
 (package
- (name vhd-format))
+ (name vhd-format)
+ (synopsis "Pure OCaml library to read/write VHD format data")
+ (description "A pure OCaml library to read and write [vhd](http://en.wikipedia.org/wiki/VHD_(file_format)) format data, plus a simple command-line tool which allows vhd files to be interrogated, manipulated, format-converted and streamed to and from files and remote servers.")
+ (authors "Jon Ludlam" "Dave Scott")
+ (maintainers "Dave Scott <dave@recoil.org>")
+ (homepage "https://github.com/mirage/ocaml-vhd")
+ (tags
+  ("org:mirage" "org:xapi-project"))
+ (depends
+  (ocaml (>= "4.10.0"))
+  (bigarray-compat (>= "1.1.0"))
+  (cstruct (>= "6.0.0"))
+  io-page
+  yojson
+  (rresult
+   (>= "0.3.0"))
+  (uuidm (>= "0.9.9"))
+  stdlib-shims
+  dune
+  (ppx_cstruct (and :build (>= "3.0.0")))
+ )
+)
 
 (package
  (name vhd-format-lwt)

opam/vhd-format.opam

@@ -1,37 +1,45 @@
 # This file is generated by dune, edit dune-project instead
-x-maintenance-intent: ["(latest)"]
 opam-version: "2.0"
-name: "vhd-format"
 synopsis: "Pure OCaml library to read/write VHD format data"
-description: """
-A pure OCaml library to read and write
-[vhd](http://en.wikipedia.org/wiki/VHD_(file_format)) format data, plus a
-simple command-line tool which allows vhd files to be interrogated,
-manipulated, format-converted and streamed to and from files and remote
-servers.
-"""
-maintainer: "dave@recoil.org"
-authors: ["Dave Scott" "Jon Ludlam"]
+description:
+  "A pure OCaml library to read and write [vhd](http://en.wikipedia.org/wiki/VHD_(file_format)) format data, plus a simple command-line tool which allows vhd files to be interrogated, manipulated, format-converted and streamed to and from files and remote servers."
+maintainer: ["Dave Scott <dave@recoil.org>"]
+authors: ["Jon Ludlam" "Dave Scott"]
 license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 tags: ["org:mirage" "org:xapi-project"]
 homepage: "https://github.com/mirage/ocaml-vhd"
-doc: "https://mirage.github.io/ocaml-vhd/"
-bug-reports: "https://github.com/mirage/ocaml-vhd/issues"
+bug-reports: "https://github.com/xapi-project/xen-api/issues"
 depends: [
   "ocaml" {>= "4.10.0"}
   "bigarray-compat" {>= "1.1.0"}
   "cstruct" {>= "6.0.0"}
   "io-page"
+  "yojson"
   "rresult" {>= "0.3.0"}
   "uuidm" {>= "0.9.9"}
   "stdlib-shims"
-  "dune" {>= "2.8"}
+  "dune" {>= "3.20"}
   "ppx_cstruct" {build & >= "3.0.0"}
+  "odoc" {with-doc}
+]
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
 ]
+dev-repo: "git+https://github.com/xapi-project/xen-api.git"
+x-maintenance-intent: ["(latest)"]
 available: os = "linux" | os = "macos"
-build: ["dune" "build" "-p" name "-j" jobs]
 depexts: ["linux-headers"] {os-distribution = "alpine"}
-dev-repo: "git+https://github.com/xapi-project/xen-api.git"
 url {
   src:
     "https://github.com/xapi-project/xen-api/archive/master.tar.gz"

opam/vhd-format.opam.template

@@ -1,35 +1,5 @@
-opam-version: "2.0"
-name: "vhd-format"
-synopsis: "Pure OCaml library to read/write VHD format data"
-description: """
-A pure OCaml library to read and write
-[vhd](http://en.wikipedia.org/wiki/VHD_(file_format)) format data, plus a
-simple command-line tool which allows vhd files to be interrogated,
-manipulated, format-converted and streamed to and from files and remote
-servers.
-"""
-maintainer: "dave@recoil.org"
-authors: ["Dave Scott" "Jon Ludlam"]
-license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
-tags: ["org:mirage" "org:xapi-project"]
-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.10.0"}
-  "bigarray-compat" {>= "1.1.0"}
-  "cstruct" {>= "6.0.0"}
-  "io-page"
-  "rresult" {>= "0.3.0"}
-  "uuidm" {>= "0.9.9"}
-  "stdlib-shims"
-  "dune" {>= "2.8"}
-  "ppx_cstruct" {build & >= "3.0.0"}
-]
 available: os = "linux" | os = "macos"
-build: ["dune" "build" "-p" name "-j" jobs]
 depexts: ["linux-headers"] {os-distribution = "alpine"}
-dev-repo: "git+https://github.com/xapi-project/xen-api.git"
 url {
   src:
     "https://github.com/xapi-project/xen-api/archive/master.tar.gz"