opam: update to qcow.0.10.4 (and sha.1.10)

.circleci/config.yml

@@ -8,7 +8,7 @@ jobs:
       TERM: vt100
       MACOSX_DEPLOYMENT_TARGET: "10.11"
       OPAM_REPO: repo/darwin
-      OPAM_COMP: 4.03.0
+      OPAM_COMP: 4.07.0
       OPAMVERBOSE: 1
       OPAMYES: 1
     steps:

hyperkit.opam

@@ -2,9 +2,9 @@ opam-version: "1.2"
 
 depends: [
   "uri"
-  "qcow"              {= "0.10.3"}
+  "qcow"              {= "0.10.4"}
   "qcow-tool"
-  "sha"               {= "1.9"}
+  "sha"               {= "1.10"}
   "conduit"           {= "1.0.0"}
   "lwt"               {= "3.1.0"}
   "mirage-block-unix" {= "2.9.0"}

repo/darwin/compilers/4.07.0.comp

@@ -0,0 +1,22 @@
+opam-version: "1"
+version: "4.07.0"
+src: "https://github.com/ocaml/ocaml/archive/4.07.0.tar.gz"
+build: [
+  ["./configure"
+    "-prefix" prefix "-with-debug-runtime"
+  ] { os != "openbsd" & os  != "freebsd" & os  != "darwin" }
+  ["./configure"
+    "-prefix" prefix "-with-debug-runtime"
+    "-cc" "cc"
+    "-aspp" "cc -c"
+  ] { os  = "openbsd" | os  = "freebsd" | os  = "darwin" }
+  [make "world"]
+  [make "world.opt"]
+  [make "install"]
+]
+packages: [
+  "base-unix"
+  "base-bigarray"
+  "base-threads"
+]
+env: [[CAML_LD_LIBRARY_PATH = "%{lib}%/stublibs"]]

repo/darwin/compilers/4.07.0.descr

@@ -0,0 +1,2 @@
+Official release 4.07.0
+

repo/darwin/packages/upstream/alcotest.0.8.3/descr

@@ -0,0 +1,11 @@
+Alcotest is a lightweight and colourful test framework.
+
+Alcotest exposes simple interface to perform unit tests. It exposes
+a simple TESTABLE module type, a check function to assert test
+predicates and a run function to perform a list of unit -> unit
+test callbacks.
+
+Alcotest provides a quiet and colorful output where only faulty runs
+are fully displayed at the end of the run (with the full logs ready to
+inspect), with a simple (yet expressive) query language to select the
+tests to run.

repo/darwin/packages/upstream/alcotest.0.8.1/opam → repo/darwin/packages/upstream/alcotest.0.8.3/opam

@@ -8,7 +8,7 @@ license:     "ISC"
 doc:         "https://mirage.github.io/alcotest/"
 
 build: [
-  ["jbuilder" "subst" "-n" name] {pinned}
+  ["jbuilder" "subst" "-p" name] {pinned}
   ["jbuilder" "build" "-p" name "-j" jobs]
 ]
 build-test: [["jbuilder" "runtest" "-p" name "-j" jobs]]

repo/darwin/packages/upstream/alcotest.0.8.3/url

@@ -0,0 +1,2 @@
+archive: "https://github.com/mirage/alcotest/releases/download/0.8.3/alcotest-0.8.3.tbz"
+checksum: "597e6bb271bd42062f95aa67afdb9185"

repo/darwin/packages/upstream/astring.0.8.3/opam

@@ -11,7 +11,8 @@ available: [ ocaml-version >= "4.01.0"]
 depends: [
   "ocamlfind" {build}
   "ocamlbuild" {build}
-  "topkg" {build} ]
+  "topkg" {build}
+  "base-bytes" ]
 build: [[
   "ocaml" "pkg/pkg.ml" "build"
           "--pinned" "%{pinned}%" ]]

repo/darwin/packages/upstream/base.v0.9.3/descr → repo/darwin/packages/upstream/base.v0.11.1/descr

@@ -1,5 +1,7 @@
 Full standard library replacement for OCaml
 
+Full standard library replacement for OCaml
+
 Base is a complete and portable alternative to the OCaml standard
 library. It provides all standard functionalities one would expect
 from a language standard library. It uses consistent conventions

repo/darwin/packages/upstream/base.v0.11.1/opam

@@ -0,0 +1,18 @@
+opam-version: "1.2"
+maintainer: "opensource@janestreet.com"
+authors: ["Jane Street Group, LLC <opensource@janestreet.com>"]
+homepage: "https://github.com/janestreet/base"
+bug-reports: "https://github.com/janestreet/base/issues"
+dev-repo: "git+https://github.com/janestreet/base.git"
+license: "Apache-2.0"
+build: [
+  ["jbuilder" "build" "-p" name "-j" jobs]
+]
+depends: [
+  "sexplib0"          {>= "v0.11" & < "v0.12"}
+  "jbuilder"          {build & >= "1.0+beta18.1"}
+]
+depopts: [
+  "base-native-int63"
+]
+available: [ ocaml-version >= "4.04.1" ]

repo/darwin/packages/upstream/base.v0.11.1/url

@@ -0,0 +1,2 @@
+archive: "https://github.com/janestreet/base/releases/download/v0.11.1/base-v0.11.1.tbz"
+checksum: "e7e7dc5db3f1fea19d74a31bbd4ac621"

repo/darwin/packages/upstream/base64.2.2.0/opam

@@ -13,10 +13,10 @@ depends: [
   "jbuilder" {build & >= "1.0+beta10"}
   "bos" {test}
   "rresult" {test}
-  "alcotest" {test}
+  "alcotest" {test & >= "0.4.0"}
 ]
 build: [
-  ["jbuilder" "subst"] {pinned}
+  ["jbuilder" "subst" "-p" name] {pinned}
   ["jbuilder" "build" "-p" name "-j" jobs]
 ]
 build-test: [

repo/darwin/packages/upstream/bos.0.1.6/opam → repo/darwin/packages/upstream/bos.0.2.0/opam

@@ -12,7 +12,6 @@ depends: [
   "ocamlfind" {build}
   "ocamlbuild" {build}
   "topkg" {build & >= "0.9.0"}
-  "conf-which"
   "base-unix"
   "rresult" {>= "0.4.0"}
   "astring"

repo/darwin/packages/upstream/bos.0.2.0/url

@@ -0,0 +1,2 @@
+archive: "http://erratique.ch/software/bos/releases/bos-0.2.0.tbz"
+checksum: "aeae7447567db459c856ee41b5a66fd2"

repo/darwin/packages/upstream/cohttp-lwt.0.99.0/descr → repo/darwin/packages/upstream/cohttp-lwt-unix.1.0.2/descr

@@ -6,17 +6,16 @@ Cohttp is an OCaml library for creating HTTP daemons. It has a portable
 HTTP parser, and implementations using various asynchronous programming
 libraries:
 
-* `Cohttp_lwt_unix` uses the [Lwt](http://ocsigen.org/lwt) library, and
+* `Cohttp_lwt_unix` uses the [Lwt](https://ocsigen.org/lwt/) library, and
   specifically the UNIX bindings.
 * `Cohttp_async` uses the [Async](https://realworldocaml.org/v1/en/html/concurrent-programming-with-async.html)
   library.
 * `Cohttp_lwt` exposes an OS-independent Lwt interface, which is used
-  by the [Mirage](http://www.openmirage.org) interface
-  to generate standalone microkernels (see the [mirage-http](https://github.com/mirage/mirage-http)
-  repository).
+  by the [Mirage](https://mirage.io/) interface to generate standalone
+  microkernels (use the cohttp-mirage subpackage).
 * `Cohttp_lwt_xhr` compiles to a JavaScript module that maps the Cohttp
-   calls to XMLHTTPRequests.  This is used to compile OCaml libraries like
-   the GitHub bindings to JavaScript and still run efficiently.
+  calls to XMLHTTPRequests.  This is used to compile OCaml libraries like
+  the GitHub bindings to JavaScript and still run efficiently.
 
 You can implement other targets using the parser very easily. Look at the `IO`
 signature in `lib/s.mli` and implement that in the desired backend.

repo/darwin/packages/upstream/cohttp-lwt-unix.0.99.0/opam → repo/darwin/packages/upstream/cohttp-lwt-unix.1.0.2/opam

@@ -15,18 +15,18 @@ license: "ISC"
 tags: ["org:mirage" "org:xapi-project"]
 dev-repo: "https://github.com/mirage/ocaml-cohttp.git"
 build: [
-  ["jbuilder" "subst" "-n" name] {pinned}
+  ["jbuilder" "subst" "-p" name] {pinned}
   ["jbuilder" "build" "-p" name "-j" jobs]
 ]
-build-test: [["jbuilder" "runtest" "-p" name "-j" jobs]]
 depends: [
   "jbuilder" {build & >= "1.0+beta10"}
-  "conduit-lwt-unix"
+  "conduit-lwt-unix" {>="1.0.3"}
   "cmdliner"
+  "magic-mime"
   "logs"
-  "fmt"
-  "cohttp-lwt" {>="0.99" & < "1.0"}
-  "lwt" {>="3.0.0"}
+  "fmt" {>="0.8.2"}
+  "cohttp-lwt" {>="1.0.2"}
+  "lwt" {>="3.0.0" & < "4.0.0"}
   "base-unix"
   "ounit" {test}
 ]

repo/darwin/packages/upstream/cohttp-lwt-unix.1.0.2/url

@@ -0,0 +1,2 @@
+archive: "https://github.com/mirage/ocaml-cohttp/releases/download/v1.0.2/cohttp-1.0.2.tbz"
+checksum: "d0a46e32911773862e1a9b420c0058bc"

repo/darwin/packages/upstream/cohttp.0.99.0/descr → repo/darwin/packages/upstream/cohttp-lwt.1.0.2/descr

@@ -6,17 +6,16 @@ Cohttp is an OCaml library for creating HTTP daemons. It has a portable
 HTTP parser, and implementations using various asynchronous programming
 libraries:
 
-* `Cohttp_lwt_unix` uses the [Lwt](http://ocsigen.org/lwt) library, and
+* `Cohttp_lwt_unix` uses the [Lwt](https://ocsigen.org/lwt/) library, and
   specifically the UNIX bindings.
 * `Cohttp_async` uses the [Async](https://realworldocaml.org/v1/en/html/concurrent-programming-with-async.html)
   library.
 * `Cohttp_lwt` exposes an OS-independent Lwt interface, which is used
-  by the [Mirage](http://www.openmirage.org) interface
-  to generate standalone microkernels (see the [mirage-http](https://github.com/mirage/mirage-http)
-  repository).
+  by the [Mirage](https://mirage.io/) interface to generate standalone
+  microkernels (use the cohttp-mirage subpackage).
 * `Cohttp_lwt_xhr` compiles to a JavaScript module that maps the Cohttp
-   calls to XMLHTTPRequests.  This is used to compile OCaml libraries like
-   the GitHub bindings to JavaScript and still run efficiently.
+  calls to XMLHTTPRequests.  This is used to compile OCaml libraries like
+  the GitHub bindings to JavaScript and still run efficiently.
 
 You can implement other targets using the parser very easily. Look at the `IO`
 signature in `lib/s.mli` and implement that in the desired backend.

repo/darwin/packages/upstream/cohttp-lwt.0.99.0/opam → repo/darwin/packages/upstream/cohttp-lwt.1.0.2/opam

@@ -15,15 +15,14 @@ license: "ISC"
 tags: ["org:mirage" "org:xapi-project"]
 dev-repo: "https://github.com/mirage/ocaml-cohttp.git"
 build: [
-  ["jbuilder" "subst" "-n" name] {pinned}
+  ["jbuilder" "subst" "-p" name] {pinned}
   ["jbuilder" "build" "-p" name "-j" jobs]
 ]
 build-test: [["jbuilder" "runtest" "-p" name "-j" jobs]]
 depends: [
   "jbuilder" {build & >= "1.0+beta10"}
-  "conduit" {>= "0.14.0"}
-  "cohttp" {>="0.99.0" & < "1.0"}
-  "lwt"
+  "cohttp" {>="1.0.0"}
+  "lwt" 
 ]
 conflicts: [
   "lwt" {< "2.5.0"}

repo/darwin/packages/upstream/cohttp-lwt.1.0.2/url

@@ -0,0 +1,2 @@
+archive: "https://github.com/mirage/ocaml-cohttp/releases/download/v1.0.2/cohttp-1.0.2.tbz"
+checksum: "d0a46e32911773862e1a9b420c0058bc"

repo/darwin/packages/upstream/cohttp-lwt-unix.0.99.0/descr → repo/darwin/packages/upstream/cohttp.1.1.0/descr

@@ -6,17 +6,16 @@ Cohttp is an OCaml library for creating HTTP daemons. It has a portable
 HTTP parser, and implementations using various asynchronous programming
 libraries:
 
-* `Cohttp_lwt_unix` uses the [Lwt](http://ocsigen.org/lwt) library, and
+* `Cohttp_lwt_unix` uses the [Lwt](https://ocsigen.org/lwt/) library, and
   specifically the UNIX bindings.
 * `Cohttp_async` uses the [Async](https://realworldocaml.org/v1/en/html/concurrent-programming-with-async.html)
   library.
 * `Cohttp_lwt` exposes an OS-independent Lwt interface, which is used
-  by the [Mirage](http://www.openmirage.org) interface
-  to generate standalone microkernels (see the [mirage-http](https://github.com/mirage/mirage-http)
-  repository).
+  by the [Mirage](https://mirage.io/) interface to generate standalone
+  microkernels (use the cohttp-mirage subpackage).
 * `Cohttp_lwt_xhr` compiles to a JavaScript module that maps the Cohttp
-   calls to XMLHTTPRequests.  This is used to compile OCaml libraries like
-   the GitHub bindings to JavaScript and still run efficiently.
+  calls to XMLHTTPRequests.  This is used to compile OCaml libraries like
+  the GitHub bindings to JavaScript and still run efficiently.
 
 You can implement other targets using the parser very easily. Look at the `IO`
 signature in `lib/s.mli` and implement that in the desired backend.