Merge pull request #85161 from sternenseemann/irmin

ocamlPackages.irmin*: 2.0.0 -> 2.1.0, add ppx_irmin, ocaml-syntax-shims, index: 1.0.1 -> 1.2.0

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

···
-{ lib, fetchurl, buildDunePackage, fmt, logs }:
+{ lib, fetchurl, buildDunePackage, fmt, logs, stdlib-shims }:
 
 buildDunePackage rec {
   pname = "index";
-  version = "1.0.1";
+  version = "1.2.0";
 
   minimumOCamlVersion = "4.07";
 
   src = fetchurl {
     url = "https://github.com/mirage/index/releases/download/${version}/index-${version}.tbz";
-    sha256 = "1006wr3g21s4j2vsd73gphhkrh1fy4swh6gqvlsa9c6q7vz9wbvz";
+    sha256 = "0d44s1d2mpxvpg0zh57c928wf1w1wd33l1fw5r62al5zmi710ff6";
   };
 
+  buildInputs = [ stdlib-shims ];
   propagatedBuildInputs = [ fmt logs ];
 
   meta = {

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

···
 buildDunePackage rec {
 
   pname = "irmin";
-  version = "2.0.0";
+  version = "2.1.0";
 
-  minimumOCamlVersion = "4.06";
+  minimumOCamlVersion = "4.07";
 
   src = fetchurl {
     url = "https://github.com/mirage/irmin/releases/download/${version}/irmin-${version}.tbz";
-    sha256 = "09qffvgi5yrm3ghiywlbdhjly8xb5x5njnan213q8j033fzmf2dr";
+    sha256 = "1ji8r7zbdmhbk8r8w2hskd9z7pnvirzbhincfxndxgdaxbfkff5g";
   };
 
   propagatedBuildInputs = [ astring base64 digestif fmt jsonm logs ocaml_lwt ocamlgraph uri ];

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

···
-{ lib, buildDunePackage, alcotest-lwt, index, irmin, irmin-test }:
+{ lib, buildDunePackage, alcotest-lwt, index, irmin, irmin-test, ocaml_lwt }:
 
 buildDunePackage rec {
+  minimumOCamlVersion = "4.02.3";
 
   pname = "irmin-pack";
 
   inherit (irmin) version src;
 
-  propagatedBuildInputs = [ index irmin ];
+  propagatedBuildInputs = [ index irmin ocaml_lwt ];
 
   checkInputs = lib.optionals doCheck [ alcotest-lwt irmin-test ];
 

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

···
+{ lib, buildDunePackage, ppxlib, ocaml-syntax-shims, irmin }:
+
+buildDunePackage {
+  pname = "ppx_irmin";
+
+  inherit (irmin) version src minimumOCamlVersion;
+
+  buildInputs = [ ocaml-syntax-shims ];
+  propagatedBuildInputs = [ ppxlib ];
+
+  meta = irmin.meta // {
+    description = "PPX deriver for Irmin generics";
+  };
+}

pkgs/development/ocaml-modules/ocaml-syntax-shims/default.nix

···
+{ stdenv, buildDunePackage, fetchurl }:
+
+buildDunePackage rec {
+  minimumOCamlVersion = "4.02.3";
+
+  pname = "ocaml-syntax-shims";
+  version = "1.0.0";
+
+  src = fetchurl {
+    url = "https://github.com/ocaml-ppx/${pname}/releases/download/${version}/${pname}-${version}.tbz";
+    sha256 = "1j7848khli4p7j8i2kmnvhdnhcwhy3zgdpf5ds5ic30ax69y3cl9";
+  };
+
+  useDune2 = true;
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/ocaml-ppx/ocaml-syntax-shims";
+    description = "Backport new syntax to older OCaml versions";
+    license = licenses.mit;
+    maintainers = with maintainers; [ sternenseemann ];
+  };
+}

pkgs/top-level/ocaml-packages.nix

···
 
     ocaml_sqlite3 = callPackage ../development/ocaml-modules/sqlite3 { };
 
+    ocaml-syntax-shims = callPackage ../development/ocaml-modules/ocaml-syntax-shims { };
+
     syslog = callPackage ../development/ocaml-modules/syslog { };
 
     ocaml_text = callPackage ../development/ocaml-modules/ocaml-text { };
···
     ppx_gen_rec = callPackage ../development/ocaml-modules/ppx_gen_rec {};
 
     ppx_import = callPackage ../development/ocaml-modules/ppx_import {};
+
+    ppx_irmin = callPackage ../development/ocaml-modules/irmin/ppx.nix {
+      ppxlib = ppxlib.override { version = "0.12.0"; };
+    };
 
     ppx_sqlexpr = callPackage ../development/ocaml-modules/sqlexpr/ppx.nix {};