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

pkgs/development/ocaml-modules/irmin/default.nix

@@ -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

pkgs/development/ocaml-modules/irmin/graphql.nix

@@ -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";

pkgs/development/ocaml-modules/irmin/layers.nix

@@ -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";
   };

pkgs/development/ocaml-modules/irmin/ppx.nix

@@ -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 ];
   };
 }