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