mirage · dinosaure · Jan 5, 2021 · Dec 19, 2020 · Dec 19, 2020 · Dec 19, 2020
diff --git a/.test-mirage.sh b/.test-mirage.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+set -ex
+
+opam install -y mirage
+(cd unikernel && mirage configure -t unix && make depends && mirage build && mirage clean && cd ..) || exit 1
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ install: wget https://raw.githubusercontent.com/ocaml/ocaml-ci-scripts/master/.t
 script: bash -ex .travis-opam.sh
 env:
   global:
-    - PINS="carton.dev:. carton-lwt.dev:. carton-git.dev:. git-nss.dev:. git.dev:. git-unix.dev:. git-cohttp.dev:. git-cohttp-unix.dev:."
+    - PINS="mimic.dev:. carton.dev:. carton-lwt.dev:. carton-git.dev:. git-nss.dev:. git.dev:. git-unix.dev:. git-cohttp.dev:. git-cohttp-unix.dev:."
   matrix:
     - OCAML_VERSION=4.08 PACKAGE="git.dev"
     - OCAML_VERSION=4.09 PACKAGE="git.dev"

diff --git a/appveyor.yml b/appveyor.yml
@@ -7,7 +7,7 @@ environment:
     FORK_BRANCH: master
     CYG_ROOT: C:\cygwin64
     OPAM_SWITCH: 4.08.1+mingw64c
-    PINS: "carton.dev:. carton-lwt.dev:. carton-git.dev:. git-nss.dev:. git.dev:. git-cohttp.dev:. git-cohttp-unix.dev:. git-unix.dev:."
+    PINS: "mimic.dev:. carton.dev:. carton-lwt.dev:. carton-git.dev:. git-nss.dev:. git.dev:. git-cohttp.dev:. git-cohttp-unix.dev:. git-unix.dev:."
   matrix:
   - PACKAGE: "git.dev"
   - PACKAGE: "git-unix.dev"

diff --git a/carton-git.opam b/carton-git.opam
@@ -1,26 +1,19 @@
 opam-version: "2.0"
-name:         "carton"
-maintainer:   "Romain Calascibetta <romain.calascibetta@gmail.com>"
-authors:      "Romain Calascibetta <romain.calascibetta@gmail.com>"
-homepage:     "https://github.com/dinosaure/carton"
-bug-reports:  "https://github.com/dinosaure/carton/issues"
-dev-repo:     "git+https://github.com/dinosaure/carton.git"
-doc:          "https://dinosaure.github.io/carton/"
-license:      "MIT"
-synopsis:     "Implementation of PACK file in OCaml"
-description: """Carton is an implementation of the PACK file
+name: "carton"
+synopsis: "Implementation of PACK file in OCaml"
+description: """\
+Carton is an implementation of the PACK file
 in OCaml. PACK file is used by Git to store Git objects. Carton is more
-abstracted when it can store any objects.
-"""
-
-build: [
-  [ "dune" "build" "-p" name "-j" jobs ]
-  [ "dune" "runtest" "-p" name "-j" jobs ] {with-test}
-]
-
+abstracted when it can store any objects."""
+maintainer: "Romain Calascibetta <romain.calascibetta@gmail.com>"
+authors: "Romain Calascibetta <romain.calascibetta@gmail.com>"
+license: "MIT"
+homepage: "https://github.com/dinosaure/carton"
+doc: "https://dinosaure.github.io/carton/"
+bug-reports: "https://github.com/dinosaure/carton/issues"
 depends: [
-  "ocaml"      {>= "4.07.0"}
-  "dune"       {>= "2.6.0"}
+  "ocaml" {>= "4.07.0"}
+  "dune" {>= "2.6.0"}
   "carton"
   "carton-lwt"
   "bigarray-compat"
@@ -29,7 +22,19 @@ depends: [
   "fpath"
   "result"
   "mmap"
-  "fmt"        {>= "0.8.7"}
+  "fmt" {>= "0.8.7"}
   "base-unix"
   "decompress" {>= "1.2.0"}
+  "astring" {>= "0.8.5"}
+  "alcotest" {>= "1.2.3" & with-test}
+  "alcotest-lwt" {>= "1.2.3" & with-test}
+  "cstruct" {>= "6.0.0" & with-test}
+  "logs" {>= "0.7.0" & with-test}
+  "mirage-flow" {>= "2.0.1" & with-test}
+  "rresult" {>= "0.6.0" & with-test}
+]
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
+dev-repo: "git+https://github.com/dinosaure/carton.git"
diff --git a/carton-lwt.opam b/carton-lwt.opam
@@ -1,29 +1,35 @@
 opam-version: "2.0"
-name:         "carton"
-maintainer:   "Romain Calascibetta <romain.calascibetta@gmail.com>"
-authors:      "Romain Calascibetta <romain.calascibetta@gmail.com>"
-homepage:     "https://github.com/dinosaure/carton"
-bug-reports:  "https://github.com/dinosaure/carton/issues"
-dev-repo:     "git+https://github.com/dinosaure/carton.git"
-doc:          "https://dinosaure.github.io/carton/"
-license:      "MIT"
-synopsis:     "Implementation of PACK file in OCaml"
-description: """Carton is an implementation of the PACK file
+name: "carton"
+synopsis: "Implementation of PACK file in OCaml"
+description: """\
+Carton is an implementation of the PACK file
 in OCaml. PACK file is used by Git to store Git objects. Carton is more
-abstracted when it can store any objects.
-"""
-
-build: [
-  [ "dune" "build" "-p" name "-j" jobs ]
-  [ "dune" "runtest" "-p" name "-j" jobs ] {with-test}
-]
-
+abstracted when it can store any objects."""
+maintainer: "Romain Calascibetta <romain.calascibetta@gmail.com>"
+authors: "Romain Calascibetta <romain.calascibetta@gmail.com>"
+license: "MIT"
+homepage: "https://github.com/dinosaure/carton"
+doc: "https://dinosaure.github.io/carton/"
+bug-reports: "https://github.com/dinosaure/carton/issues"
 depends: [
-  "ocaml"      {>= "4.07.0"}
-  "dune"       {>= "2.6.0"}
+  "ocaml" {>= "4.07.0"}
+  "dune" {>= "2.6.0"}
   "carton"
   "lwt"
   "decompress" {>= "1.2.0"}
-  "optint"     {>= "0.0.4"}
+  "optint" {>= "0.0.4"}
   "bigstringaf"
+  "alcotest" {>= "1.2.3" & with-test}
+  "alcotest-lwt" {>= "1.2.3" & with-test}
+  "cstruct" {>= "6.0.0" & with-test}
+  "fmt" {>= "0.8.9" & with-test}
+  "logs" {>= "0.7.0" & with-test}
+  "mirage-flow" {>= "2.0.1" & with-test}
+  "result" {>= "1.5" & with-test}
+  "rresult" {>= "0.6.0" & with-test}
+]
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
+dev-repo: "git+https://github.com/dinosaure/carton.git"
diff --git a/carton.opam b/carton.opam
@@ -1,48 +1,50 @@
 opam-version: "2.0"
-name:         "carton"
-maintainer:   "Romain Calascibetta <romain.calascibetta@gmail.com>"
-authors:      "Romain Calascibetta <romain.calascibetta@gmail.com>"
-homepage:     "https://github.com/mirage/ocaml-git"
-bug-reports:  "https://github.com/mirage/ocaml-git/issues"
-dev-repo:     "git+https://github.com/mirage/ocaml-git.git"
-doc:          "https://mirage.github.io/ocaml-git/"
-license:      "MIT"
-synopsis:     "Implementation of PACKv2 file in OCaml"
-description: """Carton is an implementation of the PACKv2 file
+name: "carton"
+synopsis: "Implementation of PACKv2 file in OCaml"
+description: """\
+Carton is an implementation of the PACKv2 file
 in OCaml. PACKv2 file is used by Git to store Git objects.
-Carton is more abstracted when it can store any objects.
-"""
-
-build: [
-  [ "dune" "build" "-p" name "-j" jobs ]
-  [ "dune" "runtest" "-p" name "-j" jobs ] {with-test}
-]
-
+Carton is more abstracted when it can store any objects."""
+maintainer: "Romain Calascibetta <romain.calascibetta@gmail.com>"
+authors: "Romain Calascibetta <romain.calascibetta@gmail.com>"
+license: "MIT"
+homepage: "https://github.com/mirage/ocaml-git"
+doc: "https://mirage.github.io/ocaml-git/"
+bug-reports: "https://github.com/mirage/ocaml-git/issues"
 depends: [
-  "ocaml"        {>= "4.07.0"}
-  "dune"         {>= "2.6.0"}
-  "ke"           {>= "0.4"}
-  "duff"         {>= "0.3"}
-  "decompress"   {>= "1.2.0"}
-  "cstruct"      {>= "5.0.0"}
-  "optint"       {>= "0.0.4"}
+  "ocaml" {>= "4.07.0"}
+  "dune" {>= "2.6.0"}
+  "ke" {>= "0.4"}
+  "duff" {>= "0.3"}
+  "decompress" {>= "1.2.0"}
+  "cstruct" {>= "5.0.0"}
+  "optint" {>= "0.0.4"}
   "bigstringaf"
   "stdlib-shims"
   "bigarray-compat"
-  "checkseum"    {>= "0.2.1"}
+  "checkseum" {>= "0.2.1"}
   "logs"
   "bigstringaf"
-  "psq"          {>= "0.2.0"}
-  "fmt"          {>= "0.8.7"}
-  "result"       {with-test}
-  "rresult"      {with-test}
-  "fpath"        {with-test}
-  "base64"       {with-test & >= "3.0.0"}
-  "bos"          {with-test}
-  "digestif"     {with-test & >= "0.8.1"}
-  "mmap"         {with-test}
-  "base-unix"    {with-test}
+  "psq" {>= "0.2.0"}
+  "fmt" {>= "0.8.7"}
+  "result" {with-test}
+  "rresult" {with-test}
+  "fpath" {with-test}
+  "base64" {with-test & >= "3.0.0"}
+  "bos" {with-test}
+  "digestif" {with-test & >= "0.8.1"}
+  "mmap" {with-test}
+  "base-unix" {with-test}
   "base-threads" {with-test}
-  "alcotest"     {with-test}
-  "crowbar"      {with-test & >= "0.2"}
+  "alcotest" {with-test}
+  "crowbar" {with-test & >= "0.2"}
+  "alcotest-lwt" {>= "1.2.3" & with-test}
+  "lwt" {>= "5.3.0" & with-test}
+  "ocamlfind" {>= "1.8.1" & with-test}
+  "mirage-flow" {>= "2.0.1" & with-test}
+]
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
+dev-repo: "git+https://github.com/mirage/ocaml-git.git"
diff --git a/git-cohttp-mirage.opam b/git-cohttp-mirage.opam
@@ -1,33 +1,34 @@
 opam-version: "2.0"
-maintainer:   [ "thomas@gazagnaire.org"
-                "romain.calascibetta@gmail.com" ]
-authors:      "Thomas Gazagnaire"
-license:      "ISC"
-homepage:     "https://github.com/mirage/ocaml-git"
-bug-reports:  "https://github.com/mirage/ocaml-git/issues"
-dev-repo:     "git+https://github.com/mirage/ocaml-git.git"
-doc:          "https://mirage.github.io/ocaml-git/"
-synopsis:     "A package to use HTTP-based ocaml-git with MirageOS backend"
-
-build: [
-  ["dune" "subst"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j1" "--no-buffer"] {with-test}
-]
-
+synopsis: "A package to use HTTP-based ocaml-git with MirageOS backend"
+maintainer: ["thomas@gazagnaire.org" "romain.calascibetta@gmail.com"]
+authors: "Thomas Gazagnaire"
+license: "ISC"
+homepage: "https://github.com/mirage/ocaml-git"
+doc: "https://mirage.github.io/ocaml-git/"
+bug-reports: "https://github.com/mirage/ocaml-git/issues"
 depends: [
-  "ocaml"             {>= "4.07.0"}
-  "dune"              {>= "2.6.0"}
+  "ocaml" {>= "4.07.0"}
+  "dune" {>= "2.6.0"}
   "git"
-  "git-cohttp"
+  "mimic"
   "cohttp-mirage"
+  "cohttp" {>= "2.5.4"}
+  "cohttp-lwt" {>= "2.5.4"}
+  "fmt" {>= "0.8.9"}
+  "lwt" {>= "5.3.0"}
+  "result" {>= "1.5"}
+  "rresult" {>= "0.6.0"}
+  "uri" {>= "4.0.0"}
+  "alcotest" {>= "1.2.3" & with-test}
+  "alcotest-lwt" {>= "1.2.3" & with-test}
+  "bigstringaf" {>= "0.7.0" & with-test}
+  "cstruct" {>= "6.0.0" & with-test}
+  "logs" {>= "0.7.0" & with-test}
+  "mirage-flow" {>= "2.0.1" & with-test}
 ]
-
-pin-depends: [
-  [ "conduit.dev" "git+https://github.com/mirage/ocaml-conduit.git#8912d458b2f3e43245e99cf3cb74e9c00712a8b0" ]
-  [ "conduit-tls.dev" "git+https://github.com/mirage/ocaml-conduit.git#8912d458b2f3e43245e99cf3cb74e9c00712a8b0" ]
-  [ "conduit-mirage.dev" "git+https://github.com/mirage/ocaml-conduit.git#8912d458b2f3e43245e99cf3cb74e9c00712a8b0" ]
-  [ "cohttp.dev" "git+https://github.com/dinosaure/ocaml-cohttp.git#7f0efc6d7e0420e3abff99d29633519785c41f4b" ]
-  [ "cohttp-lwt.dev" "git+https://github.com/dinosaure/ocaml-cohttp.git#7f0efc6d7e0420e3abff99d29633519785c41f4b" ]
-  [ "cohttp-mirage.dev" "git+https://github.com/dinosaure/ocaml-cohttp.git#7f0efc6d7e0420e3abff99d29633519785c41f4b" ]
+build: [
+  ["dune" "subst"]
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j1" "--no-buffer"] {with-test}
 ]
+dev-repo: "git+https://github.com/mirage/ocaml-git.git"
diff --git a/git-cohttp-unix.opam b/git-cohttp-unix.opam
@@ -1,34 +1,34 @@
 opam-version: "2.0"
-maintainer:   [ "thomas@gazagnaire.org"
-                "romain.calascibetta@gmail.com" ]
-authors:      "Thomas Gazagnaire"
-license:      "ISC"
-homepage:     "https://github.com/mirage/ocaml-git"
-bug-reports:  "https://github.com/mirage/ocaml-git/issues"
-dev-repo:     "git+https://github.com/mirage/ocaml-git.git"
-doc:          "https://mirage.github.io/ocaml-git/"
-synopsis:     "A package to use HTTP-based ocaml-git with Unix backend"
-
-build: [
-  ["dune" "subst"]
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j1" "--no-buffer"] {with-test}
-]
-
+synopsis: "A package to use HTTP-based ocaml-git with Unix backend"
+maintainer: ["thomas@gazagnaire.org" "romain.calascibetta@gmail.com"]
+authors: "Thomas Gazagnaire"
+license: "ISC"
+homepage: "https://github.com/mirage/ocaml-git"
+doc: "https://mirage.github.io/ocaml-git/"
+bug-reports: "https://github.com/mirage/ocaml-git/issues"
 depends: [
-  "ocaml"             {>= "4.07.0"}
-  "dune"              {>= "2.6.0"}
+  "ocaml" {>= "4.07.0"}
+  "dune" {>= "2.6.0"}
   "git"
   "git-cohttp"
   "cohttp-lwt-unix"
+  "cohttp" {>= "2.5.4"}
+  "cohttp-lwt" {>= "2.5.4"}
+  "fmt" {>= "0.8.9"}
+  "lwt" {>= "5.3.0"}
+  "result" {>= "1.5"}
+  "rresult" {>= "0.6.0"}
+  "uri" {>= "4.0.0"}
+  "alcotest" {>= "1.2.3" & with-test}
+  "alcotest-lwt" {>= "1.2.3" & with-test}
+  "bigstringaf" {>= "0.7.0" & with-test}
+  "cstruct" {>= "6.0.0" & with-test}
+  "logs" {>= "0.7.0" & with-test}
+  "mirage-flow" {>= "2.0.1" & with-test}
 ]
-
-pin-depends: [
-  [ "conduit.dev" "git+https://github.com/mirage/ocaml-conduit.git#8912d458b2f3e43245e99cf3cb74e9c00712a8b0" ]
-  [ "conduit-tls.dev" "git+https://github.com/mirage/ocaml-conduit.git#8912d458b2f3e43245e99cf3cb74e9c00712a8b0" ]
-  [ "conduit-lwt.dev" "git+https://github.com/mirage/ocaml-conduit.git#8912d458b2f3e43245e99cf3cb74e9c00712a8b0" ]
-  [ "conduit-lwt-tls.dev" "git+https://github.com/mirage/ocaml-conduit.git#8912d458b2f3e43245e99cf3cb74e9c00712a8b0" ]
-  [ "cohttp.dev" "git+https://github.com/dinosaure/ocaml-cohttp.git#7f0efc6d7e0420e3abff99d29633519785c41f4b" ]
-  [ "cohttp-lwt.dev" "git+https://github.com/dinosaure/ocaml-cohttp.git#7f0efc6d7e0420e3abff99d29633519785c41f4b" ]
-  [ "cohttp-lwt-unix.dev" "git+https://github.com/dinosaure/ocaml-cohttp.git#7f0efc6d7e0420e3abff99d29633519785c41f4b" ]
+build: [
+  ["dune" "subst"]
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j1" "--no-buffer"] {with-test}
 ]
+dev-repo: "git+https://github.com/mirage/ocaml-git.git"