pyrox.dev
lol
ocamlPackages.re: 1.11.0 → 1.12.0
authored by
Vincent Laporte
and committed by
Vincent Laporte
79a93b5d
531093cc
+13
-6
+2
-1
pkgs/development/ocaml-modules/dose3/default.nix
+2
-1
pkgs/development/ocaml-modules/dose3/default.nix
···
42
42
checkInputs = [
43
43
ounit
44
44
];
45
-
doCheck = lib.versionAtLeast ocaml.version "4.08";
45
+
# Check are not compatible with re ≥ 1.12
46
+
doCheck = lib.versionAtLeast ocaml.version "4.08" && !lib.versionAtLeast ocaml.version "4.12";
46
47
47
48
meta = with lib; {
48
49
description = "Dose library (part of Mancoosi tools)";
+11
-5
pkgs/development/ocaml-modules/re/default.nix
+11
-5
pkgs/development/ocaml-modules/re/default.nix
···
4
4
buildDunePackage,
5
5
ocaml,
6
6
ounit,
7
+
ounit2,
7
8
seq,
8
9
}:
9
10
10
11
let
11
12
version_sha =
12
-
if lib.versionAtLeast ocaml.version "4.08" then
13
+
if lib.versionAtLeast ocaml.version "4.12" then
14
+
{
15
+
version = "1.12.0";
16
+
hash = "sha256-oB8r8i9ywvSrq9jT52NeNcG/a8WkGtbVoAdFTdq60dQ=";
17
+
}
18
+
else if lib.versionAtLeast ocaml.version "4.08" then
13
19
{
14
20
version = "1.11.0";
15
-
sha256 = "sha256-AfwkR4DA9r5yrnlrH7dQ82feGGJP110H7nl4LtbfjU8=";
21
+
hash = "sha256-AfwkR4DA9r5yrnlrH7dQ82feGGJP110H7nl4LtbfjU8=";
16
22
}
17
23
else
18
24
{
19
25
version = "1.9.0";
20
-
sha256 = "1gas4ky49zgxph3870nffzkr6y41kkpqp4nj38pz1gh49zcf12aj";
26
+
hash = "sha256:1gas4ky49zgxph3870nffzkr6y41kkpqp4nj38pz1gh49zcf12aj";
21
27
};
22
28
in
23
29
···
29
35
30
36
src = fetchurl {
31
37
url = "https://github.com/ocaml/ocaml-re/releases/download/${version}/re-${version}.tbz";
32
-
sha256 = version_sha.sha256;
38
+
inherit (version_sha) hash;
33
39
};
34
40
35
-
buildInputs = lib.optional doCheck ounit;
36
41
propagatedBuildInputs = [ seq ];
37
42
doCheck = lib.versionAtLeast ocaml.version "4.08";
43
+
checkInputs = [ (if lib.versionAtLeast version "1.12" then ounit2 else ounit) ];
38
44
39
45
meta = {
40
46
homepage = "https://github.com/ocaml/ocaml-re";