diff options
| author | xeji <36407913+xeji@users.noreply.github.com> | 2018-09-17 10:35:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-17 10:35:18 +0200 |
| commit | 19996db7fa4e492fdd5e042b6582035cd2e69992 (patch) | |
| tree | 20368383fd7d1d3425b5f0f469ad4d505dc3846b /pkgs/development/ocaml-modules | |
| parent | 37c3d6c3f61b038059569d0ddb758f8826a08bd6 (diff) | |
| parent | 1003e6e0dfca07963be13fdc6faebcdbdc394788 (diff) | |
| download | nixpkgs-19996db7fa4e492fdd5e042b6582035cd2e69992.tar nixpkgs-19996db7fa4e492fdd5e042b6582035cd2e69992.tar.gz nixpkgs-19996db7fa4e492fdd5e042b6582035cd2e69992.tar.bz2 nixpkgs-19996db7fa4e492fdd5e042b6582035cd2e69992.tar.lz nixpkgs-19996db7fa4e492fdd5e042b6582035cd2e69992.tar.xz nixpkgs-19996db7fa4e492fdd5e042b6582035cd2e69992.tar.zst nixpkgs-19996db7fa4e492fdd5e042b6582035cd2e69992.zip | |
Merge pull request #46532 from vbgl/ocaml-batteries-2.9.0
ocamlPackages.batteries: 2.8.0 -> 2.9.0
Diffstat (limited to 'pkgs/development/ocaml-modules')
| -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 e71496e84f0..473c30b4345 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" && !stdenv.isAarch64; checkTarget = "test test"; createFindlibDestdir = true; |