diff --git a/pkgs/development/ocaml-modules/tar/default.nix b/pkgs/development/ocaml-modules/tar/default.nix index 52054958d3a..031bd4d5b14 100644 --- a/pkgs/development/ocaml-modules/tar/default.nix +++ b/pkgs/development/ocaml-modules/tar/default.nix @@ -1,40 +1,38 @@ { lib -, fetchFromGitHub +, fetchurl , buildDunePackage , camlp-streams , ppx_cstruct , cstruct -, re -, ppx_tools +, decompress }: buildDunePackage rec { pname = "tar"; - version = "2.0.1"; - src = fetchFromGitHub { - owner = "mirage"; - repo = "ocaml-tar"; - rev = "v${version}"; - sha256 = "1zr1ak164k1jm15xwqjf1iv77kdrrahak33wrxg7lifz9nnl0dms"; + version = "2.2.2"; + src = fetchurl { + url = "https://github.com/mirage/ocaml-tar/releases/download/v${version}/tar-${version}.tbz"; + hash = "sha256-Q+41LPFZFHi9sXKFV3F13FZZNO3KXRSElEmr+nH58Uw="; }; - useDune2 = true; + duneVersion = "3"; + minimalOCamlVersion = "4.08"; propagatedBuildInputs = [ camlp-streams - ppx_cstruct cstruct - re + decompress ]; buildInputs = [ - ppx_tools + ppx_cstruct ]; doCheck = true; meta = { - description = "Decode and encode tar format files from Unix"; + description = "Decode and encode tar format files in pure OCaml"; + homepage = "https://github.com/mirage/ocaml-tar"; license = lib.licenses.mit; maintainers = [ lib.maintainers.ulrikstrid ]; }; diff --git a/pkgs/development/ocaml-modules/tar/unix.nix b/pkgs/development/ocaml-modules/tar/unix.nix index 4ac1f625a02..9426a6aaf10 100644 --- a/pkgs/development/ocaml-modules/tar/unix.nix +++ b/pkgs/development/ocaml-modules/tar/unix.nix @@ -1,27 +1,22 @@ { lib , buildDunePackage , tar -, cstruct , cstruct-lwt -, re , lwt }: buildDunePackage rec { pname = "tar-unix"; - inherit (tar) version src useDune2 doCheck; + inherit (tar) version src doCheck; + duneVersion = "3"; propagatedBuildInputs = [ tar - cstruct cstruct-lwt - re lwt ]; - meta = { + meta = tar.meta // { description = "Decode and encode tar format files from Unix"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.ulrikstrid ]; }; }