From 65fcac82d377af2395d57f8ca45e70ada1a922f2 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 11 Sep 2018 16:37:27 +0000
Subject: [PATCH] ocamlPackages.batteries: 2.8.0 -> 2.9.0
---
pkgs/development/ocaml-modules/batteries/default.nix | 10 +++-------
1 file 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;