pyrox.dev / nixpkgs
lol
fork atom

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

ocamlPackages.tar: 2.2.2 → 2.5.1

authored by Ulrik Strid and committed by GitHub a49bf234 e241729c

+10 -10
unified split
+2 -8
pkgs/development/ocaml-modules/tar/default.nix
··· 2 , fetchurl 3 , buildDunePackage 4 , camlp-streams 5 - , ppx_cstruct 6 , cstruct 7 , decompress 8 }: 9 10 buildDunePackage rec { 11 pname = "tar"; 12 - version = "2.2.2"; 13 src = fetchurl { 14 url = "https://github.com/mirage/ocaml-tar/releases/download/v${version}/tar-${version}.tbz"; 15 - hash = "sha256-Q+41LPFZFHi9sXKFV3F13FZZNO3KXRSElEmr+nH58Uw="; 16 }; 17 18 - duneVersion = "3"; 19 minimalOCamlVersion = "4.08"; 20 21 propagatedBuildInputs = [ 22 camlp-streams 23 cstruct 24 decompress 25 - ]; 26 - 27 - buildInputs = [ 28 - ppx_cstruct 29 ]; 30 31 doCheck = true;
··· 2 , fetchurl 3 , buildDunePackage 4 , camlp-streams 5 , cstruct 6 , decompress 7 }: 8 9 buildDunePackage rec { 10 pname = "tar"; 11 + version = "2.5.1"; 12 src = fetchurl { 13 url = "https://github.com/mirage/ocaml-tar/releases/download/v${version}/tar-${version}.tbz"; 14 + hash = "sha256-00QPSIZnoFvhZEnDcdEDJUqhE0uKLxNMM2pUE8aMPfQ="; 15 }; 16 17 minimalOCamlVersion = "4.08"; 18 19 propagatedBuildInputs = [ 20 camlp-streams 21 cstruct 22 decompress 23 ]; 24 25 doCheck = true;
+5 -1
pkgs/development/ocaml-modules/tar/unix.nix
··· 3 , tar 4 , cstruct-lwt 5 , lwt 6 }: 7 8 buildDunePackage rec { 9 pname = "tar-unix"; 10 inherit (tar) version src doCheck; 11 - duneVersion = "3"; 12 13 propagatedBuildInputs = [ 14 tar 15 cstruct-lwt 16 lwt 17 ]; 18 19 meta = tar.meta // {
··· 3 , tar 4 , cstruct-lwt 5 , lwt 6 + , git 7 }: 8 9 buildDunePackage rec { 10 pname = "tar-unix"; 11 inherit (tar) version src doCheck; 12 13 propagatedBuildInputs = [ 14 tar 15 cstruct-lwt 16 lwt 17 + ]; 18 + 19 + nativeCheckInputs = [ 20 + git 21 ]; 22 23 meta = tar.meta // {
+3 -1
pkgs/top-level/ocaml-packages.nix
··· 1695 1696 tar = callPackage ../development/ocaml-modules/tar { }; 1697 1698 - tar-unix = callPackage ../development/ocaml-modules/tar/unix.nix { }; 1699 1700 tcpip = callPackage ../development/ocaml-modules/tcpip { }; 1701
··· 1695 1696 tar = callPackage ../development/ocaml-modules/tar { }; 1697 1698 + tar-unix = callPackage ../development/ocaml-modules/tar/unix.nix { 1699 + inherit (pkgs) git; 1700 + }; 1701 1702 tcpip = callPackage ../development/ocaml-modules/tcpip { }; 1703