diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2018-09-11 16:37:27 +0000 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2018-09-11 16:37:27 +0000 |
| commit | 65fcac82d377af2395d57f8ca45e70ada1a922f2 (patch) | |
| tree | d34fee5a01be8a80a27b7fd26e8484db42261c51 /pkgs | |
| parent | 7df273e71dcb8e7599ed63be4913be1357940fcf (diff) | |
| download | nixlib-65fcac82d377af2395d57f8ca45e70ada1a922f2.tar nixlib-65fcac82d377af2395d57f8ca45e70ada1a922f2.tar.gz nixlib-65fcac82d377af2395d57f8ca45e70ada1a922f2.tar.bz2 nixlib-65fcac82d377af2395d57f8ca45e70ada1a922f2.tar.lz nixlib-65fcac82d377af2395d57f8ca45e70ada1a922f2.tar.xz nixlib-65fcac82d377af2395d57f8ca45e70ada1a922f2.tar.zst nixlib-65fcac82d377af2395d57f8ca45e70ada1a922f2.zip | |
ocamlPackages.batteries: 2.8.0 -> 2.9.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/ocaml-modules/batteries/default.nix | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix index e71496e84f04..3da72453a2a0 100644 --- a/pkgs/development/ocaml-modules/batteries/default.nix +++ b/pkgs/development/ocaml-modules/batteries/default.nix @@ -1,23 +1,19 @@ { stdenv, fetchzip, ocaml, findlib, ocamlbuild, qtest, num }: -let version = "2.8.0"; in +let version = "2.9.0"; in stdenv.mkDerivation { name = "ocaml${ocaml.version}-batteries-${version}"; src = fetchzip { url = "https://github.com/ocaml-batteries-team/batteries-included/archive/v${version}.tar.gz"; - sha256 = "1cvgljg8lxvfx0v3367z3p43dysg9m33v8gfy43bhw7fjr1bmyas"; + sha256 = "1wianim29kkkf4c31k7injjp3ji69ki5krrp6csq8ycswg791dby"; }; buildInputs = [ ocaml findlib ocamlbuild qtest ]; propagatedBuildInputs = [ num ]; - configurePhase = if num != null then '' - export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}${num}/lib/ocaml/${ocaml.version}/site-lib/stublibs/" - '' else "true"; # Skip configure - - doCheck = true; + doCheck = !stdenv.lib.versionAtLeast ocaml.version "4.07"; checkTarget = "test test"; createFindlibDestdir = true; |