public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ocamlPackages.batteries: 2.7.0 -> 2.8.0

Browse Source 
Also renames the attribute from ocaml_batteries to batteries.
This commit is contained in:
Vincent Laporte
2017-11-14 17:53:53 +00:00
parent a3aae2c831
commit 26798bd6e0
4 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/ocaml-modules/batteries/default.nix
+8 -5
View File
@@ -1,18 +1,21 @@
{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, qtest }:
{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, qtest, num }:
let version = "2.7.0"; in
let version = "2.8.0"; in
stdenv.mkDerivation {
name = "ocaml-batteries-${version}";
name = "ocaml${ocaml.version}-batteries-${version}";
src = fetchzip {
url = "https://github.com/ocaml-batteries-team/batteries-included/archive/v${version}.tar.gz";
sha256 = "02rgfylz6x4y2030cclf9zwk2i8xqsydn1y9hjkja2qsk895bwfb";
sha256 = "1cvgljg8lxvfx0v3367z3p43dysg9m33v8gfy43bhw7fjr1bmyas";
};
buildInputs = [ ocaml findlib ocamlbuild qtest ];
propagatedBuildInputs = [ num ];
configurePhase = "true"; # Skip configure
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;
checkTarget = "test test";