diff options
author | Vincent Laporte <vbgl@users.noreply.github.com> | 2023-01-11 07:50:23 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-11 07:50:23 +0100 |
commit | 7148e613d5a3e36f0a5bd0a7d564cac33724de74 (patch) | |
tree | 4e04e341a95a396cc59f9086a05c75dc4de2c163 | |
parent | 9089ee1796b8d331d6ddfcb077e8ab0a9fea0288 (diff) |
ocamlPackages.tar: 2.0.1 → 2.2.2 (#209021)
Co-authored-by: Ulrik Strid <ulrik.strid@outlook.com>
-rw-r--r-- | pkgs/development/ocaml-modules/tar/default.nix | 26 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/tar/unix.nix | 11 |
2 files changed, 15 insertions, 22 deletions
diff --git a/pkgs/development/ocaml-modules/tar/default.nix b/pkgs/development/ocaml-modules/tar/default.nix index 52054958d3a0..031bd4d5b141 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 4ac1f625a02a..9426a6aaf10f 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 ]; }; } |