ocamlPackages.git: 3.5.0 -> 3.9.1 (#188389)

* ocamlPackages.cstruct: 6.0.1 -> 6.1.1

* ocamlPackages.git: 3.5.0 -> 3.9.1

* ocamlPackages.carton: 0.4.3 -> 0.4.4

* ocamlPackages.bigstringaf: 0.7.0 -> 0.9.0

* ocamlPackages.decompress: 1.4.2 -> 1.5.1

* ocamlPackages.repr: 0.5.0 -> 0.6.0

* ocamlPackages.irmin: 2.9.1 -> 3.4.1

* ligo: 0.36.0 -> 0.47.0

ocamlPackages.ringo: 0.5 → 0.9
ocamlPackages.data-encoding: 0.4.0 → 0.5.3
ocamlPackages.bls12-381: 1.1.0 -> 3.0.0

Co-authored-by: bezmuth <benkel97@protonmail.com>

6 files changed, 122 insertions, 65 deletions

diff --git a/pkgs/development/ocaml-modules/git/cohttp-unix.nix b/pkgs/development/ocaml-modules/git/cohttp-unix.nix
deleted file mode 100644
index ac6d423d58ae4..0000000000000
--- a/pkgs/development/ocaml-modules/git/cohttp-unix.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ buildDunePackage, git, git-cohttp
-, cohttp-lwt-unix, cohttp-lwt, fmt, lwt, result, rresult, uri
-}:
-
-buildDunePackage {
-  pname = "git-cohttp-unix";
-
-  inherit (git) version src minimumOCamlVersion useDune2;
-
-  propagatedBuildInputs = [
-    git git-cohttp cohttp-lwt-unix cohttp-lwt fmt lwt result rresult uri
-  ];
-
-  meta = git.meta // {
-    description = "A package to use HTTP-based ocaml-git with Unix backend";
-  };
-}
diff --git a/pkgs/development/ocaml-modules/git/cohttp.nix b/pkgs/development/ocaml-modules/git/cohttp.nix
deleted file mode 100644
index e9126ba4becec..0000000000000
--- a/pkgs/development/ocaml-modules/git/cohttp.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ buildDunePackage, git
-, cohttp, cohttp-lwt, fmt, lwt, result, rresult, uri
-, alcotest, alcotest-lwt, bigstringaf, cstruct, logs
-, mirage-flow, ke
-}:
-
-buildDunePackage rec {
-  pname = "git-cohttp";
-
-  inherit (git) version minimumOCamlVersion src useDune2;
-
-  propagatedBuildInputs = [
-    git cohttp cohttp-lwt fmt lwt result rresult uri
-  ];
-
-  meta = git.meta // {
-    description = "A package to use HTTP-based ocaml-git with Unix backend";
-  };
-}
diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix
index b359a397f313e..1e886e94dd163 100644
--- a/pkgs/development/ocaml-modules/git/default.nix
+++ b/pkgs/development/ocaml-modules/git/default.nix
@@ -1,21 +1,20 @@
 { stdenv, lib, fetchurl, buildDunePackage
-, alcotest, mtime, mirage-crypto-rng, tls, git-binary
-, angstrom, astring, cstruct, decompress, digestif, encore, duff, fmt, checkseum
+, alcotest, mirage-crypto-rng, git-binary
+, angstrom, astring, cstruct, decompress, digestif, encore, fmt, checkseum
 , fpath, ke, logs, lwt, ocamlgraph, uri, rresult, base64, hxd
 , result, bigstringaf, optint, mirage-flow, domain-name, emile
-, mimic, carton, carton-lwt, carton-git, ipaddr, psq, crowbar, alcotest-lwt
+, mimic, carton, carton-lwt, carton-git, ipaddr, psq, crowbar, alcotest-lwt, cmdliner
 }:
 
 buildDunePackage rec {
   pname = "git";
-  version = "3.5.0";
+  version = "3.9.1";
 
-  minimumOCamlVersion = "4.08";
-  useDune2 = true;
+  minimalOCamlVersion = "4.08";
 
   src = fetchurl {
     url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz";
-    sha256 = "bcd5a0aef9957193cbaeeb17c22201e5ca4e815e67bbc696e88efdb38c25ec03";
+    sha256 = "sha256-OyeMW5gsq4fMEWRmhzPq2qardFZtMjoQk6mMKz5+Ds4=";
   };
 
   # remove changelog for the carton package
@@ -27,12 +26,12 @@ buildDunePackage rec {
     base64
   ];
   propagatedBuildInputs = [
-    angstrom astring checkseum cstruct decompress digestif encore duff fmt fpath
+    angstrom astring checkseum cstruct decompress digestif encore fmt fpath
     ke logs lwt ocamlgraph uri rresult result bigstringaf optint mirage-flow
     domain-name emile mimic carton carton-lwt carton-git ipaddr psq hxd
   ];
   checkInputs = [
-    alcotest alcotest-lwt mtime mirage-crypto-rng tls git-binary crowbar
+    alcotest alcotest-lwt mirage-crypto-rng git-binary crowbar cmdliner
   ];
   doCheck = !stdenv.isAarch64;
 
diff --git a/pkgs/development/ocaml-modules/git/mirage.nix b/pkgs/development/ocaml-modules/git/mirage.nix
new file mode 100644
index 0000000000000..e7398d0d1dac6
--- /dev/null
+++ b/pkgs/development/ocaml-modules/git/mirage.nix
@@ -0,0 +1,95 @@
+{ lib, buildDunePackage
+, git
+, mimic
+, mimic-happy-eyeballs
+, base64
+, git-paf
+, awa
+, awa-mirage
+, dns
+, dns-client
+, tls
+, tls-mirage
+, uri
+, hex
+, happy-eyeballs-mirage
+, happy-eyeballs
+, ca-certs-nss
+, mirage-crypto
+, ptime
+, x509
+, cstruct
+, tcpip
+, domain-name
+, fmt
+, ipaddr
+, lwt
+, mirage-clock
+, mirage-flow
+, mirage-random
+, mirage-time
+, result
+, rresult
+, alcotest
+, alcotest-lwt
+, bigstringaf
+, logs
+, ke
+}:
+
+buildDunePackage {
+  pname = "git-mirage";
+
+  inherit (git) version src;
+
+  minimalOCamlVersion = "4.08";
+
+  buildInputs = [
+    dns
+    dns-client
+    happy-eyeballs-mirage
+    ipaddr
+    mirage-random
+    rresult
+  ];
+
+  propagatedBuildInputs = [
+    git
+    mimic
+    mimic-happy-eyeballs
+    base64
+    git-paf
+    awa
+    awa-mirage
+    tls
+    tls-mirage
+    uri
+    hex
+    happy-eyeballs
+    ca-certs-nss
+    mirage-crypto
+    ptime
+    x509
+    cstruct
+    tcpip
+    domain-name
+    fmt
+    lwt
+    mirage-clock
+    mirage-flow
+    mirage-time
+    result
+  ];
+
+  checkInputs = [
+    alcotest
+    alcotest-lwt
+    bigstringaf
+    logs
+    ke
+  ];
+
+  meta = git.meta // {
+    description = "A package to use ocaml-git with MirageOS backend";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/git/paf.nix b/pkgs/development/ocaml-modules/git/paf.nix
index 9db8c872798e3..476364a52fb95 100644
--- a/pkgs/development/ocaml-modules/git/paf.nix
+++ b/pkgs/development/ocaml-modules/git/paf.nix
@@ -8,7 +8,6 @@
 , logs
 , lwt
 , mirage-clock
-, mirage-stack
 , mirage-time
 , result
 , rresult
@@ -25,7 +24,9 @@
 buildDunePackage {
   pname = "git-paf";
 
-  inherit (git) version src minimumOCamlVersion useDune2;
+  inherit (git) version src;
+
+  minimalOCamlVersion = "4.08";
 
   propagatedBuildInputs = [
     git
@@ -39,7 +40,6 @@ buildDunePackage {
     ipaddr
     logs
     mirage-clock
-    mirage-stack
     mirage-time
     tls
     uri
diff --git a/pkgs/development/ocaml-modules/git/unix.nix b/pkgs/development/ocaml-modules/git/unix.nix
index 91f33d7eeb02c..bd2e6f31848ac 100644
--- a/pkgs/development/ocaml-modules/git/unix.nix
+++ b/pkgs/development/ocaml-modules/git/unix.nix
@@ -1,37 +1,38 @@
 { buildDunePackage, git
-, mmap, rresult, result, bigstringaf
-, fmt, bos, fpath, uri, digestif, logs, lwt, git-cohttp-unix
+, rresult, result, bigstringaf
+, fmt, bos, fpath, uri, digestif, logs, lwt
 , mirage-clock, mirage-clock-unix, astring, awa, cmdliner
-, cohttp-lwt-unix, decompress, domain-name, ipaddr, mtime
-, tcpip, awa-mirage, mirage-flow
+, decompress, domain-name, ipaddr, mtime
+, tcpip, awa-mirage, mirage-flow, mirage-unix
 , alcotest, alcotest-lwt, base64, cstruct
 , ke, mirage-crypto-rng, ocurl, git-binary
 , ptime, mimic, ca-certs-nss, tls, tls-mirage
-, cacert
+, cacert, happy-eyeballs-lwt, git-mirage
 }:
 
 buildDunePackage {
   pname = "git-unix";
-  inherit (git) version src minimumOCamlVersion;
+  inherit (git) version src;
 
-  useDune2 = true;
+  minimalOCamlVersion = "4.08";
 
   buildInputs = [
-    awa awa-mirage cmdliner git-cohttp-unix
-    mirage-clock mirage-clock-unix tcpip
+    awa awa-mirage cmdliner
+    mirage-clock tcpip
   ];
   propagatedBuildInputs = [
-    mmap rresult result bigstringaf
-    fmt bos fpath uri digestif logs lwt
-    astring cohttp-lwt-unix decompress
-    domain-name ipaddr mtime mirage-flow
+    rresult result bigstringaf
+    fmt bos fpath digestif logs lwt
+    astring decompress
+    domain-name ipaddr mirage-flow mirage-unix
     cstruct ptime mimic ca-certs-nss
-    tls tls-mirage git
+    tls tls-mirage git happy-eyeballs-lwt
+    git-mirage mirage-clock-unix
   ];
   checkInputs = [
     alcotest alcotest-lwt base64 ke
     mirage-crypto-rng git-binary
-    cohttp-lwt-unix
+    uri mtime
     cacert # sets up NIX_SSL_CERT_FILE
   ];
   doCheck = true;
@@ -39,7 +40,5 @@ buildDunePackage {
   meta = {
     description = "Unix backend for the Git protocol(s)";
     inherit (git.meta) homepage license maintainers;
-    # Not compatible with cmdliner ≥ 1.1
-    broken = true;
   };
 }