diff options
Diffstat (limited to 'nixpkgs/pkgs/development/ocaml-modules/irmin')
10 files changed, 44 insertions, 21 deletions
diff --git a/nixpkgs/pkgs/development/ocaml-modules/irmin/default.nix b/nixpkgs/pkgs/development/ocaml-modules/irmin/default.nix index cba67759167..2e3e27df7ff 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/irmin/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/irmin/default.nix @@ -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"; - minimumOCamlVersion = "4.07"; + inherit (ppx_irmin) src version; - src = fetchurl { - url = "https://github.com/mirage/irmin/releases/download/${version}/irmin-${version}.tbz"; - sha256 = "1ji8r7zbdmhbk8r8w2hskd9z7pnvirzbhincfxndxgdaxbfkff5g"; - }; + useDune2 = true; + minimumOCamlVersion = "4.07"; 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 ]; }; - } diff --git a/nixpkgs/pkgs/development/ocaml-modules/irmin/fs.nix b/nixpkgs/pkgs/development/ocaml-modules/irmin/fs.nix index b1987aa7cbc..0e9596751b8 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/irmin/fs.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/irmin/fs.nix @@ -8,6 +8,8 @@ buildDunePackage rec { propagatedBuildInputs = [ irmin ]; + useDune2 = true; + checkInputs = lib.optional doCheck irmin-test; doCheck = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/irmin/git.nix b/nixpkgs/pkgs/development/ocaml-modules/irmin/git.nix index bb28042a1f6..b222bc53e3a 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/irmin/git.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/irmin/git.nix @@ -6,6 +6,8 @@ buildDunePackage rec { inherit (irmin) version src; + useDune2 = true; + propagatedBuildInputs = [ git irmin ]; checkInputs = lib.optionals doCheck [ git-unix irmin-mem irmin-test ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/irmin/graphql.nix b/nixpkgs/pkgs/development/ocaml-modules/irmin/graphql.nix index abcdc3d58dd..6e4598dd986 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/irmin/graphql.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/irmin/graphql.nix @@ -6,9 +6,12 @@ buildDunePackage rec { inherit (irmin) version src; + useDune2 = true; + propagatedBuildInputs = [ cohttp-lwt graphql-cohttp graphql-lwt irmin ]; - doCheck = true; + # test requires network + doCheck = false; meta = irmin.meta // { description = "GraphQL server for Irmin"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/irmin/http.nix b/nixpkgs/pkgs/development/ocaml-modules/irmin/http.nix index c8db6d563c9..24e9f52aa08 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/irmin/http.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/irmin/http.nix @@ -8,6 +8,8 @@ buildDunePackage rec { inherit (irmin) version src; + useDune2 = true; + propagatedBuildInputs = [ cohttp-lwt irmin webmachine ]; checkInputs = lib.optionals doCheck [ checkseum git-unix irmin-git irmin-mem irmin-test ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/irmin/mem.nix b/nixpkgs/pkgs/development/ocaml-modules/irmin/mem.nix index b7040b9db0d..1b8947849a9 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/irmin/mem.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/irmin/mem.nix @@ -6,6 +6,8 @@ buildDunePackage rec { inherit (irmin) version src; + useDune2 = true; + propagatedBuildInputs = [ irmin ]; checkInputs = lib.optional doCheck irmin-test; diff --git a/nixpkgs/pkgs/development/ocaml-modules/irmin/pack.nix b/nixpkgs/pkgs/development/ocaml-modules/irmin/pack.nix index c374b1a2275..b0081eb366e 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/irmin/pack.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/irmin/pack.nix @@ -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 ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/irmin/ppx.nix b/nixpkgs/pkgs/development/ocaml-modules/irmin/ppx.nix index c28532b49a9..35aa659fbc8 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/irmin/ppx.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/irmin/ppx.nix @@ -1,14 +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 ]; }; } diff --git a/nixpkgs/pkgs/development/ocaml-modules/irmin/test.nix b/nixpkgs/pkgs/development/ocaml-modules/irmin/test.nix index 57e33e2db8a..b8a3f3ae245 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/irmin/test.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/irmin/test.nix @@ -6,6 +6,8 @@ buildDunePackage { inherit (irmin) version src; + useDune2 = true; + propagatedBuildInputs = [ alcotest cmdliner irmin metrics-unix mtime ]; meta = irmin.meta // { diff --git a/nixpkgs/pkgs/development/ocaml-modules/irmin/unix.nix b/nixpkgs/pkgs/development/ocaml-modules/irmin/unix.nix index 5793678bfcf..7a09eaabd3e 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/irmin/unix.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/irmin/unix.nix @@ -10,6 +10,8 @@ buildDunePackage rec { inherit (irmin) version src; + useDune2 = true; + propagatedBuildInputs = [ checkseum cmdliner git-unix yaml irmin irmin-fs irmin-git irmin-graphql irmin-http irmin-mem irmin-pack irmin-watcher ]; |