diff options
| author | Orivej Desh <orivej@gmx.fr> | 2020-05-22 09:13:23 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2020-05-22 09:13:23 +0000 |
| commit | 16d7f7edae6847e7a792d79b533b245f71907f46 (patch) | |
| tree | a304b937bc072e96e2745ede17c7e6b9b4495bee /pkgs/development/ocaml-modules/batteries/default.nix | |
| parent | eae4f22176789ce3b6a66bad773a45b12e895cdf (diff) | |
| parent | 5de1e307f29ab91baeb43ab2a58ed13a944e40ea (diff) | |
| download | nixlib-16d7f7edae6847e7a792d79b533b245f71907f46.tar nixlib-16d7f7edae6847e7a792d79b533b245f71907f46.tar.gz nixlib-16d7f7edae6847e7a792d79b533b245f71907f46.tar.bz2 nixlib-16d7f7edae6847e7a792d79b533b245f71907f46.tar.lz nixlib-16d7f7edae6847e7a792d79b533b245f71907f46.tar.xz nixlib-16d7f7edae6847e7a792d79b533b245f71907f46.tar.zst nixlib-16d7f7edae6847e7a792d79b533b245f71907f46.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/development/ocaml-modules/batteries/default.nix')
| -rw-r--r-- | pkgs/development/ocaml-modules/batteries/default.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix index 2ed697d42df4..3032df7b8fd5 100644 --- a/pkgs/development/ocaml-modules/batteries/default.nix +++ b/pkgs/development/ocaml-modules/batteries/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, qtest, num }: +{ stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, qtest, num }: let version = "3.0.0"; in @@ -10,6 +10,12 @@ stdenv.mkDerivation { sha256 = "0d833amm4p0pczgl7wriv99f3r5r6345p5gi9d97sm0hqx27vzwi"; }; + # Fixes tests with OCaml 4.10 + patches = [(fetchpatch { + url = "https://github.com/ocaml-batteries-team/batteries-included/commit/6d8d67f9fb48181be3d527b32df15899b00cd5dd.patch"; + sha256 = "0msk8c5bjm6gm011i75b1rza332i1r4adj58qzli6gyjlvfj1hx4"; + })]; + buildInputs = [ ocaml findlib ocamlbuild qtest ]; propagatedBuildInputs = [ num ]; |