public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ocamlPackages: irmin 2.2.0 → 2.4.0; git: 2.13 → 3.2.0; and related changes (#110184)

Browse Source 
* ocamlPackages.index: 1.2.1 -> 1.3.0

* ocamlPackages.decompress: 0.9.0 -> 1.2.0

* ocamlPackages.imagelib-unix: remove at 20191011

* ocamlPackages.imagelib: 20191011 -> 20200929

* ocamlPackages.duff: 0.2 -> 0.3

* ocamlPackages.carton{,-git,-lwt}: init at 0.2.0

* ocamlPackages.encore: 0.5 → 0.7

* ocamlPackages.git-http: remove at 2.1.3

* ocamlPackages.git-unix: move into git directory

* ocamlPackages.irmin-mem: remove at 2.2.0

Replaced by irmin.mem contained in ocamlPackages.irmin >= 2.4.0

* ocamlPackages.git*: 2.1.3 -> 3.2.0

ocamlPackages.git-unix: 2.1.3 -> 3.2.0

ocamlPackages.git-cohttp{,-unix,-mirage}: init at 3.2.0

* ocamlPackages.irmin*: 2.2.0 -> 2.4.0

ocamlPackages.irmin-containers: init at 2.4.0
ocamlPackages.irmin-layers: init at 2.4.0
ocamlPackages.irmin-mirage: init at 2.4.0
ocamlPackages.irmin-mirage-git: init at 2.4.0
ocamlPackages.irmin-mirage-graphql: init at 2.4.0

* ocamlPackages.wodan-irmin: mark as broken
This commit is contained in:
sternenseemann
2021-02-16 08:39:46 +01:00
committed by GitHub
parent 8572994486
commit c59b8ce9c3
32 changed files with 513 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/ocaml-modules/irmin/chunk.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, buildDunePackage, irmin, irmin-mem, irmin-test }:
{ lib, buildDunePackage, irmin, irmin-test, alcotest }:
buildDunePackage rec {
@@ -8,7 +8,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ irmin ];
doCheck = true;
checkInputs = [ irmin-mem irmin-test ];
checkInputs = [ alcotest irmin-test ];
meta = irmin.meta // {
description = "Irmin backend which allow to store values into chunks";
pkgs/development/ocaml-modules/irmin/containers.nix
+27
View File
@@ -0,0 +1,27 @@
{ buildDunePackage
, irmin, irmin-unix, irmin-git, ppx_irmin, lwt, mtime
, alcotest, alcotest-lwt
}:
buildDunePackage {
pname = "irmin-containers";
inherit (ppx_irmin) src version useDune2;
nativeBuildInputs = [
ppx_irmin
];
propagatedBuildInputs = [
irmin irmin-unix irmin-git ppx_irmin lwt mtime
];
doCheck = true;
checkInputs = [
alcotest alcotest-lwt
];
meta = ppx_irmin.meta // {
description = "Mergeable Irmin data structures";
};
}
pkgs/development/ocaml-modules/irmin/default.nix
+18 -5
View File
@@ -1,6 +1,6 @@
{ lib, fetchurl, buildDunePackage
{ lib, buildDunePackage
, astring, base64, digestif, fmt, jsonm, logs, ocaml_lwt, ocamlgraph, uri
, alcotest, hex, ppx_irmin
, repr, ppx_irmin, bheap
}:
buildDunePackage {
@@ -11,10 +11,23 @@ buildDunePackage {
useDune2 = true;
minimumOCamlVersion = "4.07";
propagatedBuildInputs = [ astring base64 digestif fmt jsonm logs ocaml_lwt ocamlgraph uri ];
propagatedBuildInputs = [
astring
base64
digestif
fmt
jsonm
logs
ocaml_lwt
ocamlgraph
uri
repr
bheap
ppx_irmin
];
checkInputs = [ alcotest hex ppx_irmin ];
doCheck = true;
# circular dependency on irmin-mem
doCheck = false;
meta = ppx_irmin.meta // {
description = "A distributed database built on the same principles as Git";
pkgs/development/ocaml-modules/irmin/git.nix
+20 -4
View File
@@ -1,6 +1,10 @@
{ lib, buildDunePackage, git, irmin, irmin-mem, irmin-test, git-unix }:
{ lib, buildDunePackage
, git, irmin, irmin-test, ppx_irmin, git-cohttp-unix, git-unix
, digestif, cstruct, fmt, astring, fpath, logs, lwt, uri
, mtime, alcotest
}:
buildDunePackage rec {
buildDunePackage {
pname = "irmin-git";
@@ -8,9 +12,21 @@ buildDunePackage rec {
useDune2 = true;
propagatedBuildInputs = [ git irmin ];
propagatedBuildInputs = [
git
irmin
ppx_irmin
digestif
cstruct
fmt
astring
fpath
logs
lwt
uri
];
checkInputs = lib.optionals doCheck [ git-unix irmin-mem irmin-test ];
checkInputs = [ mtime alcotest git-cohttp-unix git-unix irmin-test ];
doCheck = true;
pkgs/development/ocaml-modules/irmin/http.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ lib, buildDunePackage, cohttp-lwt, irmin, webmachine
, checkseum, git-unix, irmin-git, irmin-mem, irmin-test
, checkseum, git-unix, irmin-git, irmin-test, digestif, git-cohttp-unix
}:
buildDunePackage rec {
@@ -12,7 +12,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ cohttp-lwt irmin webmachine ];
checkInputs = lib.optionals doCheck [ checkseum git-unix irmin-git irmin-mem irmin-test ];
checkInputs = [ digestif checkseum git-cohttp-unix git-unix irmin-git irmin-test ];
doCheck = true;
pkgs/development/ocaml-modules/irmin/layers.nix
+21
View File
@@ -0,0 +1,21 @@
{ buildDunePackage, irmin, mtime, logs, lwt }:
buildDunePackage {
pname = "irmin-layers";
inherit (irmin) version src useDune2;
propagatedBuildInputs = [
irmin
mtime
logs
lwt
];
# mutual dependency on irmin-test
doCheck = false;
meta = irmin.meta // {
description = "Combine different Irmin stores into a single, layered store";
};
}
pkgs/development/ocaml-modules/irmin/mem.nix
-21
View File
@@ -1,21 +0,0 @@
{ lib, buildDunePackage, irmin, irmin-test }:
buildDunePackage rec {
pname = "irmin-mem";
inherit (irmin) version src;
useDune2 = true;
propagatedBuildInputs = [ irmin ];
checkInputs = lib.optional doCheck irmin-test;
doCheck = true;
meta = irmin.meta // {
description = "Generic in-memory Irmin stores";
};
}
pkgs/development/ocaml-modules/irmin/mirage-git.nix
+27
View File
@@ -0,0 +1,27 @@
{ buildDunePackage, irmin-mirage, irmin-git
, mirage-kv, cohttp, conduit-lwt, conduit-mirage
, git-cohttp-mirage, fmt, git, lwt, mirage-clock, uri
}:
buildDunePackage {
pname = "irmin-mirage-git";
inherit (irmin-mirage) version src useDune2;
propagatedBuildInputs = [
irmin-mirage
irmin-git
mirage-kv
cohttp
conduit-lwt
conduit-mirage
git-cohttp-mirage
fmt
git
lwt
mirage-clock
uri
];
inherit (irmin-mirage) meta;
}
pkgs/development/ocaml-modules/irmin/mirage-graphql.nix
+21
View File
@@ -0,0 +1,21 @@
{ buildDunePackage, irmin-mirage, irmin-graphql
, mirage-clock, cohttp-lwt, lwt, uri, git
}:
buildDunePackage {
pname = "irmin-mirage-graphql";
inherit (irmin-mirage) version src useDune2;
propagatedBuildInputs = [
irmin-mirage
irmin-graphql
mirage-clock
cohttp-lwt
lwt
uri
git
];
inherit (irmin-mirage) meta;
}
pkgs/development/ocaml-modules/irmin/mirage.nix
+15
View File
@@ -0,0 +1,15 @@
{ buildDunePackage, irmin, fmt, ptime, mirage-clock }:
buildDunePackage {
pname = "irmin-mirage";
inherit (irmin) version src useDune2;
propagatedBuildInputs = [
irmin fmt ptime mirage-clock
];
meta = irmin.meta // {
description = "MirageOS-compatible Irmin stores";
};
}
pkgs/development/ocaml-modules/irmin/pack.nix
+6 -3
View File
@@ -1,4 +1,6 @@
{ lib, buildDunePackage, alcotest-lwt, index, irmin, irmin-test, ocaml_lwt }:
{ lib, buildDunePackage
, alcotest-lwt, index, irmin, irmin-layers, irmin-test, ocaml_lwt, fpath
}:
buildDunePackage rec {
minimumOCamlVersion = "4.02.3";
@@ -9,9 +11,10 @@ buildDunePackage rec {
useDune2 = true;
propagatedBuildInputs = [ index irmin ocaml_lwt ];
buildInputs = [ fpath ];
propagatedBuildInputs = [ index irmin irmin-layers ocaml_lwt ];
checkInputs = lib.optionals doCheck [ alcotest-lwt irmin-test ];
checkInputs = [ alcotest-lwt irmin-test ];
doCheck = true;
pkgs/development/ocaml-modules/irmin/ppx.nix
+8 -7
View File
@@ -1,23 +1,24 @@
{ lib, fetchurl, buildDunePackage, ppxlib, ocaml-syntax-shims }:
{ lib, fetchurl, buildDunePackage, ppxlib, ppx_repr }:
buildDunePackage rec {
pname = "ppx_irmin";
version = "2.2.0";
version = "2.4.0";
src = fetchurl {
url = "https://github.com/mirage/irmin/releases/download/${version}/irmin-${version}.tbz";
sha256 = "0gzw918b661qkvd140hilww9jsc49rxsxz1k4iihyvikjn202km4";
sha256 = "1b6lav5br1b83cwdc3gj9mqkzhlbfjrbyjx0107zvj54m82dbrxb";
};
minimumOCamlVersion = "4.06";
minimumOCamlVersion = "4.08";
useDune2 = true;
buildInputs = [ ocaml-syntax-shims ];
propagatedBuildInputs = [ ppxlib ];
propagatedBuildInputs = [
ppx_repr
ppxlib
];
# tests depend on irmin, would create mutual dependency
# opt to test irmin instead of ppx_irmin
doCheck = false;
meta = {
pkgs/development/ocaml-modules/irmin/test.nix
+6 -2
View File
@@ -1,4 +1,6 @@
{ buildDunePackage, alcotest, cmdliner, irmin, metrics-unix, mtime }:
{ buildDunePackage
, alcotest, cmdliner, irmin, metrics-unix, mtime, irmin-layers
}:
buildDunePackage {
@@ -8,7 +10,9 @@ buildDunePackage {
useDune2 = true;
propagatedBuildInputs = [ alcotest cmdliner irmin metrics-unix mtime ];
propagatedBuildInputs = [
alcotest cmdliner irmin metrics-unix mtime irmin-layers
];
meta = irmin.meta // {
description = "Irmin test suite";
pkgs/development/ocaml-modules/irmin/unix.nix
+7 -5
View File
@@ -1,7 +1,7 @@
{ lib, buildDunePackage
, checkseum, cmdliner, git-unix, yaml
, irmin, irmin-fs, irmin-git, irmin-graphql, irmin-http, irmin-mem, irmin-pack, irmin-watcher
, irmin-test
, checkseum, cmdliner, git-unix, git-cohttp-unix, yaml, fpath
, irmin, irmin-fs, irmin-git, irmin-graphql, irmin-http
, irmin-pack, irmin-watcher, irmin-test
}:
buildDunePackage rec {
@@ -12,8 +12,10 @@ buildDunePackage rec {
useDune2 = true;
propagatedBuildInputs = [ checkseum cmdliner git-unix yaml
irmin irmin-fs irmin-git irmin-graphql irmin-http irmin-mem irmin-pack irmin-watcher
propagatedBuildInputs = [
checkseum cmdliner git-unix yaml fpath
irmin irmin-fs irmin-git irmin-graphql irmin-http
irmin-pack irmin-watcher git-cohttp-unix
];
checkInputs = lib.optional doCheck irmin-test;