Merge pull request #253505 from vbgl/ocaml-tar-2.5.1

ocamlPackages.tar: 2.2.2 → 2.5.1

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

@@ -2,20 +2,18 @@
 , fetchurl
 , buildDunePackage
 , camlp-streams
-, ppx_cstruct
 , cstruct
 , decompress
 }:
 
 buildDunePackage rec {
   pname = "tar";
-  version = "2.2.2";
+  version = "2.5.1";
   src = fetchurl {
     url = "https://github.com/mirage/ocaml-tar/releases/download/v${version}/tar-${version}.tbz";
-    hash = "sha256-Q+41LPFZFHi9sXKFV3F13FZZNO3KXRSElEmr+nH58Uw=";
+    hash = "sha256-00QPSIZnoFvhZEnDcdEDJUqhE0uKLxNMM2pUE8aMPfQ=";
   };
 
-  duneVersion = "3";
   minimalOCamlVersion = "4.08";
 
   propagatedBuildInputs = [
@@ -24,10 +22,6 @@ buildDunePackage rec {
     decompress
   ];
 
-  buildInputs = [
-    ppx_cstruct
-  ];
-
   doCheck = true;
 
   meta = {

pkgs/development/ocaml-modules/tar/unix.nix

@@ -3,12 +3,12 @@
 , tar
 , cstruct-lwt
 , lwt
+, git
 }:
 
 buildDunePackage rec {
   pname = "tar-unix";
   inherit (tar) version src doCheck;
-  duneVersion = "3";
 
   propagatedBuildInputs = [
     tar
@@ -16,6 +16,10 @@ buildDunePackage rec {
     lwt
   ];
 
+  nativeCheckInputs = [
+    git
+  ];
+
   meta = tar.meta // {
     description = "Decode and encode tar format files from Unix";
   };

pkgs/top-level/ocaml-packages.nix

@@ -1695,7 +1695,9 @@ let
 
     tar = callPackage ../development/ocaml-modules/tar { };
 
-    tar-unix = callPackage ../development/ocaml-modules/tar/unix.nix { };
+    tar-unix = callPackage ../development/ocaml-modules/tar/unix.nix {
+      inherit (pkgs) git;
+    };
 
     tcpip = callPackage ../development/ocaml-modules/tcpip { };