git.iko.soy/typeable/nixpkgs
on master help sign in
ocamlPackages.batteries: 3.0.0 → 3.1.0
commite2dffb60a549e00188d05c678a4251b8a8af2248 authorVincent Laporte <Vincent.Laporte@gmail.com> dateSun 6 Sep 2020, 07:48 (6 years ago) parent5ff37a3
1 file changed+10−8
pkgs/development/ocaml-modules/batteries/default.nix+10−8
pkgs/development/ocaml-modules/batteries/default.nix+10−8
@@ -1,26 +1,28 @@
11{ stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, qtest, num }:
22
3−let version = "3.0.0"; in
3+let version = "3.1.0"; in
44
55stdenv.mkDerivation {
66 name = "ocaml${ocaml.version}-batteries-${version}";
77
88 src = fetchurl {
99 url = "https://github.com/ocaml-batteries-team/batteries-included/releases/download/v${version}/batteries-${version}.tar.gz";
10− sha256 = "0d833amm4p0pczgl7wriv99f3r5r6345p5gi9d97sm0hqx27vzwi";
10+ sha256 = "0bq1np3ai3r559s3vivn45yid25fwz76rvbmsg30j57j7cyr3jqm";
1111 };
1212
13− # Fixes tests with OCaml 4.10
13+ # Fix a test case
1414 patches = [(fetchpatch {
15− url = "https://github.com/ocaml-batteries-team/batteries-included/commit/6d8d67f9fb48181be3d527b32df15899b00cd5dd.patch";
16− sha256 = "0msk8c5bjm6gm011i75b1rza332i1r4adj58qzli6gyjlvfj1hx4";
15+ url = "https://github.com/ocaml-batteries-team/batteries-included/commit/7cbd9617d4efa5b3d647b1cc99d9a25fa01ac6dd.patch";
16+ sha256 = "0q4kq10psr7n1xdv4rspk959n1a5mk9524pzm5v68ab2gkcgm8sk";
17+
1718 })];
1819
19− buildInputs = [ ocaml findlib ocamlbuild qtest ];
20+ buildInputs = [ ocaml findlib ocamlbuild ];
21+ checkInputs = [ qtest ];
2022 propagatedBuildInputs = [ num ];
2123
22− doCheck = stdenv.lib.versions.majorMinor ocaml.version != "4.07" && !stdenv.isAarch64;
23− checkTarget = "test test";
24+ doCheck = stdenv.lib.versionAtLeast ocaml.version "4.04" && !stdenv.isAarch64;
25+ checkTarget = "test";
2426
2527 createFindlibDestdir = true;
2628