ocaml: update to mirage 4.0

Some of the dependencies have been renamed (e.g. cstruct.lwt to
cstruct-lwt).

Signed-off-by: David Scott <dave@recoil.org>

Author: djs55

.circleci/config.yml

@@ -27,6 +27,9 @@ jobs:
       - run: make test
       - run: brew install opam libev libffi pkg-config
       - run: opam init -v -n --comp="${OPAM_COMP}" --switch="${OPAM_COMP}" local "${OPAM_REPO}"
+      # Needed until the packages are released in ocaml/opam-repository
+      - run: opam pin add qcow.0.11.0 git://github.com/mirage/ocaml-qcow -n
+      - run: opam pin add qcow-tool.0.11.0 git://github.com/mirage/ocaml-qcow -n
       - run: opam pin add hyperkit .
       - run: opam config exec -- make clean
       - run: opam config exec -- make all

Makefile

@@ -105,9 +105,9 @@ OCAML_C_SRC := \
 	src/lib/mirage_block_c.c
 
 OCAML_WHERE := $(shell ocamlc -where)
-OCAML_PACKS := cstruct cstruct.lwt io-page io-page.unix uri mirage-block \
+OCAML_PACKS := cstruct cstruct-lwt io-page io-page.unix uri mirage-block \
 	mirage-block-unix qcow unix threads lwt lwt.unix logs logs.fmt   \
-	mirage-unix prometheus-app conduit-lwt cohttp.lwt
+	mirage-unix prometheus-app conduit-lwt cohttp-lwt-unix
 OCAML_LDLIBS := -L $(OCAML_WHERE) \
 	$(shell ocamlfind query cstruct)/cstruct.a \
 	$(shell ocamlfind query cstruct)/libcstruct_stubs.a \
@@ -116,12 +116,12 @@ OCAML_LDLIBS := -L $(OCAML_WHERE) \
 	$(shell ocamlfind query io-page-unix)/libio_page_unix_stubs.a \
 	$(shell ocamlfind query lwt.unix)/liblwt_unix_stubs.a \
 	$(shell ocamlfind query lwt.unix)/lwt_unix.a \
-	$(shell ocamlfind query lwt.unix)/lwt.a \
+	$(shell ocamlfind query lwt)/lwt.a \
 	$(shell ocamlfind query threads)/libthreadsnat.a \
 	$(shell ocamlfind query mirage-block-unix)/libmirage_block_unix_stubs.a \
 	$(shell ocamlfind query base)/libbase_stubs.a \
         $(LIBEV) \
-	-lasmrun -lbigarray -lunix
+	-lasmrun -lunix
 
 build/hyperkit.o: CFLAGS += -I$(OCAML_WHERE)
 endif

README.md

@@ -37,8 +37,10 @@ via `brew` and using `opam` to install the appropriate libraries:
 
     $ brew install opam libev
     $ opam init
-    $ eval `opam config env`
-    $ opam install uri qcow.0.10.4 conduit.1.0.0 lwt.3.1.0 qcow-tool mirage-block-unix.2.9.0 conf-libev logs fmt mirage-unix prometheus-app
+    $ eval `opam env`
+    $ opam pin add qcow.0.11.0 git://github.com/mirage/ocaml-qcow -n
+    $ opam pin add qcow-tool.0.11.0 git://github.com/mirage/ocaml-qcow -n
+    $ opam install uri qcow.0.11.0 conduit.2.1.0 lwt.5.3.0 qcow-tool mirage-block-unix.2.12.0 conf-libev logs fmt mirage-unix prometheus-app
 
 Notes:
 

hyperkit.opam

@@ -1,16 +1,24 @@
-opam-version: "1.2"
+opam-version: "2.0"
+maintainer: "dave@recoil.org"
+authors: [ "see github source" ]
+license: "BSD 2 clause"
+homepage: "https://github.com/moby/hyperkit"
+dev-repo: "git+https://github.com/moby/hyperkit.git"
+bug-reports: "https://github.com/moby/hyperkit/issues"
+doc: "https://github.com/moby/hyperkit"
 
 depends: [
   "uri"
-  "qcow"              {= "0.10.4"}
+  "qcow"              {= "0.11.0"}
   "qcow-tool"
-  "sha"               {= "1.10"}
-  "conduit"           {= "1.0.0"}
-  "lwt"               {= "3.1.0"}
-  "mirage-block-unix" {= "2.9.0"}
+  "sha"
+  "conduit"           {= "2.1.0"}
+  "lwt"               {= "5.3.0"}
+  "mirage-block-unix" {= "2.12.0"}
   "conf-libev"
   "logs"
   "fmt"
   "mirage-unix"
   "prometheus-app"
 ]
+synopsis: "Uses the Hypervisor.framework on macOS to run Linux VMs"

src/lib/mirage_block_c.c

@@ -26,7 +26,7 @@ mirage_block_unregister_thread(){
 /* Convenience macro to cache the OCaml callback and immediately abort()
    if it can't be found -- this would indicate a fundamental linking error. */
 #define OCAML_NAMED_FUNCTION(name) \
-static value *fn = NULL; \
+static const value *fn = NULL; \
 if (fn == NULL) { \
 	fn = caml_named_value(name); \
 } \