swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-22 21:30:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

ocamlPackages.batteries: 3.0.0 → 3.1.0

Browse source
This commit is contained in:
Vincent Laporte 2020-09-06 07:48:27 +02:00 committed by Vincent Laporte
parent 5ff37a3d96
commit e2dffb60a5
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/development/ocaml-modules/batteries/default.nix
View file

@ -1,26 +1,28 @@
{ stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, qtest, num }:
let version = "3.0.0"; in
let version = "3.1.0"; in
stdenv.mkDerivation {
name = "ocaml${ocaml.version}-batteries-${version}";
src = fetchurl {
url = "https://github.com/ocaml-batteries-team/batteries-included/releases/download/v${version}/batteries-${version}.tar.gz";
sha256 = "0d833amm4p0pczgl7wriv99f3r5r6345p5gi9d97sm0hqx27vzwi";
sha256 = "0bq1np3ai3r559s3vivn45yid25fwz76rvbmsg30j57j7cyr3jqm";
};
# Fixes tests with OCaml 4.10
# Fix a test case
patches = [(fetchpatch {
url = "https://github.com/ocaml-batteries-team/batteries-included/commit/6d8d67f9fb48181be3d527b32df15899b00cd5dd.patch";
sha256 = "0msk8c5bjm6gm011i75b1rza332i1r4adj58qzli6gyjlvfj1hx4";
url = "https://github.com/ocaml-batteries-team/batteries-included/commit/7cbd9617d4efa5b3d647b1cc99d9a25fa01ac6dd.patch";
sha256 = "0q4kq10psr7n1xdv4rspk959n1a5mk9524pzm5v68ab2gkcgm8sk";
})];
buildInputs = [ ocaml findlib ocamlbuild qtest ];
buildInputs = [ ocaml findlib ocamlbuild ];
checkInputs = [ qtest ];
propagatedBuildInputs = [ num ];
doCheck = stdenv.lib.versions.majorMinor ocaml.version != "4.07" && !stdenv.isAarch64;
checkTarget = "test test";
doCheck = stdenv.lib.versionAtLeast ocaml.version "4.04" && !stdenv.isAarch64;
checkTarget = "test";
createFindlibDestdir = true;