ocamlPackages.irmin*: 2.1.0 → 2.2.0

source now inherit ppx_irmin instead of irmin, since we can test irmin
using ppx_irmin and this way we avoid circular dependencies.
This commit is contained in:
sternenseemann 2020-06-29 14:28:45 +02:00 committed by Vincent Laporte
parent 1c04554e4b
commit e3936ac9c1
7 changed files with 34 additions and 21 deletions

View file

@ -1,31 +1,22 @@
{ lib, fetchurl, buildDunePackage
, astring, base64, digestif, fmt, jsonm, logs, ocaml_lwt, ocamlgraph, uri
, alcotest, hex
, alcotest, hex, ppx_irmin
}:
buildDunePackage rec {
buildDunePackage {
pname = "irmin";
version = "2.1.0";
inherit (ppx_irmin) src version;
useDune2 = true;
minimumOCamlVersion = "4.07";
src = fetchurl {
url = "https://github.com/mirage/irmin/releases/download/${version}/irmin-${version}.tbz";
sha256 = "1ji8r7zbdmhbk8r8w2hskd9z7pnvirzbhincfxndxgdaxbfkff5g";
};
propagatedBuildInputs = [ astring base64 digestif fmt jsonm logs ocaml_lwt ocamlgraph uri ];
checkInputs = lib.optionals doCheck [ alcotest hex ];
checkInputs = [ alcotest hex ppx_irmin ];
doCheck = true;
meta = {
homepage = "https://irmin.org/";
meta = ppx_irmin.meta // {
description = "A distributed database built on the same principles as Git";
license = lib.licenses.isc;
maintainers = [ lib.maintainers.vbgl ];
};
}

View file

@ -8,6 +8,8 @@ buildDunePackage rec {
propagatedBuildInputs = [ irmin ];
useDune2 = true;
checkInputs = lib.optional doCheck irmin-test;
doCheck = true;

View file

@ -10,7 +10,8 @@ buildDunePackage rec {
propagatedBuildInputs = [ cohttp-lwt graphql-cohttp graphql-lwt irmin ];
doCheck = true;
# test requires network
doCheck = false;
meta = irmin.meta // {
description = "GraphQL server for Irmin";

View file

@ -6,6 +6,8 @@ buildDunePackage rec {
inherit (irmin) version src;
useDune2 = true;
propagatedBuildInputs = [ irmin ];
checkInputs = lib.optional doCheck irmin-test;

View file

@ -7,6 +7,8 @@ buildDunePackage rec {
inherit (irmin) version src;
useDune2 = true;
propagatedBuildInputs = [ index irmin ocaml_lwt ];
checkInputs = lib.optionals doCheck [ alcotest-lwt irmin-test ];

View file

@ -1,16 +1,29 @@
{ lib, buildDunePackage, ppxlib, ocaml-syntax-shims, irmin }:
{ lib, fetchurl, buildDunePackage, ppxlib, ocaml-syntax-shims }:
buildDunePackage {
buildDunePackage rec {
pname = "ppx_irmin";
version = "2.2.0";
inherit (irmin) version src minimumOCamlVersion;
src = fetchurl {
url = "https://github.com/mirage/irmin/releases/download/${version}/irmin-${version}.tbz";
sha256 = "0gzw918b661qkvd140hilww9jsc49rxsxz1k4iihyvikjn202km4";
};
minimumOCamlVersion = "4.06";
useDune2 = true;
buildInputs = [ ocaml-syntax-shims ];
propagatedBuildInputs = [ ppxlib ];
meta = irmin.meta // {
# tests depend on irmin, would create mutual dependency
# opt to test irmin instead of ppx_irmin
doCheck = false;
meta = {
homepage = "https://irmin.org/";
description = "PPX deriver for Irmin generics";
license = lib.licenses.isc;
maintainers = [ lib.maintainers.vbgl ];
};
}

View file

@ -6,6 +6,8 @@ buildDunePackage {
inherit (irmin) version src;
useDune2 = true;
propagatedBuildInputs = [ alcotest cmdliner irmin metrics-unix mtime ];
meta = irmin.meta // {