ocamlPackages.git: 3.2.0 -> 3.3.0; ocamlPackages.irmin: 2.4.0 -> 2.5.1 (#113717)

* ocamlPackages.git: 3.2.0 -> 3.3.0

* minor fixes to tests (while introducing new failures in the nix
  sandbox we have to patch)
* compatibility fixes to commit messages with git fsck and github at the
  expense of potentially breaking older ocaml-git managed repositories.

https://github.com/mirage/ocaml-git/releases/tag/3.3.0

* ocamlPackages.irmin: 2.4.0 -> 2.5.1

* irmin-graphql: enable tests as they now work without network
* irmin-layers: tests were removed
* ppx_irmin: tests were removed

Compatibility with git 3.3.0 and improved performance.

https://github.com/mirage/irmin/releases/tag/2.5.0
https://github.com/mirage/irmin/releases/tag/2.5.1

* ocamlPackages.{git, irmin}: add myself to maintainers
This commit is contained in:
sternenseemann 2021-02-19 22:19:24 +01:00 committed by GitHub
parent 8005587c64
commit 85c606d097
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 32 additions and 26 deletions

View File

@ -1,23 +1,26 @@
{ stdenv, lib, fetchurl, buildDunePackage
, alcotest, mtime, mirage-crypto-rng, tls, git-binary
, angstrom, astring, cstruct, decompress, digestif, encore, duff, fmt, checkseum
, fpath, ke, logs, lwt, ocamlgraph, uri, rresult
, fpath, ke, logs, lwt, ocamlgraph, uri, rresult, base64
, result, bigstringaf, optint, mirage-flow, domain-name, emile
, mimic, carton, carton-lwt, carton-git, ipaddr, psq, crowbar, alcotest-lwt
}:
buildDunePackage rec {
pname = "git";
version = "3.2.0";
version = "3.3.0";
minimumOCamlVersion = "4.08";
useDune2 = true;
src = fetchurl {
url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz";
sha256 = "14rq7h1n5v2n0507ycbac8sq21xnzhgirxmlmqv4j5k3aajdcj16";
sha256 = "090b67e8f8a02fb52b4d0c7aa445b5ff7353fdb2da00fb37b908f089c6776cd0";
};
buildInputs = [
base64
];
propagatedBuildInputs = [
angstrom astring checkseum cstruct decompress digestif encore duff fmt fpath
ke logs lwt ocamlgraph uri rresult result bigstringaf optint mirage-flow
@ -31,7 +34,7 @@ buildDunePackage rec {
meta = {
description = "Git format and protocol in pure OCaml";
license = lib.licenses.isc;
maintainers = [ lib.maintainers.vbgl ];
maintainers = with lib.maintainers; [ sternenseemann vbgl ];
homepage = "https://github.com/mirage/ocaml-git";
};
}

View File

@ -6,6 +6,7 @@
, tcpip, awa-mirage, mirage-flow
, alcotest, alcotest-lwt, base64, cstruct
, ke, mirage-crypto-rng, ocurl, git-binary
, ptime
}:
buildDunePackage {
@ -14,6 +15,14 @@ buildDunePackage {
useDune2 = true;
patches = [
# https://github.com/mirage/ocaml-git/pull/472
(fetchpatch {
url = "https://github.com/sternenseemann/ocaml-git/commit/54998331eb9d5c61afe8901fabe0c74c2877f096.patch";
sha256 = "12kd45mlfaj4hxh33k9920a22mq1q2sdrin2j41w1angvg00d3my";
})
];
buildInputs = [
awa awa-mirage cmdliner git-cohttp-unix
mirage-clock mirage-clock-unix tcpip
@ -26,17 +35,10 @@ buildDunePackage {
];
checkInputs = [
alcotest alcotest-lwt base64 cstruct ke
mirage-crypto-rng ocurl git-binary
mirage-crypto-rng ocurl git-binary ptime
];
doCheck = true;
patches = [
(fetchpatch {
url = "https://github.com/mirage/ocaml-git/commit/09b41073fa869c0a595e1d8ed7224d539682af1c.patch";
sha256 = "1avbxv60gbrll9gny1pl6jwbx5b8282h3frhzy2ghb0fx1pggp6w";
})
];
meta = {
description = "Unix backend for the Git protocol(s)";
inherit (git.meta) homepage license maintainers;

View File

@ -1,5 +1,5 @@
{ lib, buildDunePackage
, astring, base64, digestif, fmt, jsonm, logs, ocaml_lwt, ocamlgraph, uri
, astring, digestif, fmt, jsonm, logs, ocaml_lwt, ocamlgraph, uri
, repr, ppx_irmin, bheap
}:
@ -13,7 +13,6 @@ buildDunePackage {
propagatedBuildInputs = [
astring
base64
digestif
fmt
jsonm

View File

@ -1,4 +1,6 @@
{ lib, buildDunePackage, cohttp-lwt, graphql-cohttp, graphql-lwt, irmin }:
{ lib, buildDunePackage, cohttp-lwt, graphql-cohttp, graphql-lwt, irmin
, alcotest, alcotest-lwt, logs, yojson, cohttp-lwt-unix
}:
buildDunePackage rec {
@ -10,8 +12,14 @@ buildDunePackage rec {
propagatedBuildInputs = [ cohttp-lwt graphql-cohttp graphql-lwt irmin ];
# test requires network
doCheck = false;
doCheck = true;
checkInputs = [
alcotest
alcotest-lwt
logs
cohttp-lwt-unix
yojson
];
meta = irmin.meta // {
description = "GraphQL server for Irmin";

View File

@ -12,9 +12,6 @@ buildDunePackage {
lwt
];
# mutual dependency on irmin-test
doCheck = false;
meta = irmin.meta // {
description = "Combine different Irmin stores into a single, layered store";
};

View File

@ -2,11 +2,11 @@
buildDunePackage rec {
pname = "ppx_irmin";
version = "2.4.0";
version = "2.5.1";
src = fetchurl {
url = "https://github.com/mirage/irmin/releases/download/${version}/irmin-${version}.tbz";
sha256 = "1b6lav5br1b83cwdc3gj9mqkzhlbfjrbyjx0107zvj54m82dbrxb";
sha256 = "131pcgmpys6danprcbxzf4pdsl0ka74bpmmxz8db4507cvxhsz3n";
};
minimumOCamlVersion = "4.08";
@ -18,13 +18,10 @@ buildDunePackage rec {
ppxlib
];
# tests depend on irmin, would create mutual dependency
doCheck = false;
meta = {
homepage = "https://irmin.org/";
description = "PPX deriver for Irmin generics";
license = lib.licenses.isc;
maintainers = [ lib.maintainers.vbgl ];
maintainers = with lib.maintainers; [ vbgl sternenseemann ];
};
}