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

Merge pull request #46532 from vbgl/ocaml-batteries-2.9.0

Browse Source 
ocamlPackages.batteries: 2.8.0 -> 2.9.0
This commit is contained in:
xeji 2018-09-17 10:35:18 +02:00 committed by GitHub
commit 19996db7fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/ocaml-modules/batteries/default.nix
View File

@ -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" && !stdenv.isAarch64;
checkTarget = "test test";
createFindlibDestdir = true;