Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

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

ocamlPackages.batteries: 2.8.0 -> 2.9.0

authored by

xeji and committed by
GitHub
19996db7 37c3d6c3

+3 -7
+3 -7
pkgs/development/ocaml-modules/batteries/default.nix
··· 1 1 { stdenv, fetchzip, ocaml, findlib, ocamlbuild, qtest, num }: 2 2 3 - let version = "2.8.0"; in 3 + let version = "2.9.0"; in 4 4 5 5 stdenv.mkDerivation { 6 6 name = "ocaml${ocaml.version}-batteries-${version}"; 7 7 8 8 src = fetchzip { 9 9 url = "https://github.com/ocaml-batteries-team/batteries-included/archive/v${version}.tar.gz"; 10 - sha256 = "1cvgljg8lxvfx0v3367z3p43dysg9m33v8gfy43bhw7fjr1bmyas"; 10 + sha256 = "1wianim29kkkf4c31k7injjp3ji69ki5krrp6csq8ycswg791dby"; 11 11 }; 12 12 13 13 buildInputs = [ ocaml findlib ocamlbuild qtest ]; 14 14 propagatedBuildInputs = [ num ]; 15 15 16 - configurePhase = if num != null then '' 17 - export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}${num}/lib/ocaml/${ocaml.version}/site-lib/stublibs/" 18 - '' else "true"; # Skip configure 19 - 20 - doCheck = true; 16 + doCheck = !stdenv.lib.versionAtLeast ocaml.version "4.07" && !stdenv.isAarch64; 21 17 checkTarget = "test test"; 22 18 23 19 createFindlibDestdir = true;