From b1f6ed4a6e2356d81113dfd9b3e23197ec036782 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Fri, 22 Jul 2011 07:28:51 +0000 Subject: [PATCH] Update OCaml Batteries to 1.4.0 svn path=/nixpkgs/trunk/; revision=27900 --- pkgs/development/ocaml-modules/batteries/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix index b7a80129451..06583cd15e1 100644 --- a/pkgs/development/ocaml-modules/batteries/default.nix +++ b/pkgs/development/ocaml-modules/batteries/default.nix @@ -8,19 +8,14 @@ stdenv.mkDerivation { name = "ocaml-batteries-1.3.0"; src = fetchurl { - url = "http://forge.ocamlcore.org/frs/download.php/560/batteries-1.3.0.tar.gz"; - sha256 = "1kf8dyivigavi89lpsz7hzdv48as10yck7gkmqmnsnn1dps3m7an"; + url = https://forge.ocamlcore.org/frs/download.php/643/batteries-1.4.0.tar.gz; + sha256 = "1qyhiyanlhpbj0dv0vyqak87qfadjzg2pb8q93iybmg59akaxl15"; }; buildInputs = [ocaml findlib camomile ounit]; - # This option is not correctly detected on Darwin - # It should be fixed in the svn - BATTERIES_NATIVE_SHLIB = if stdenv.isDarwin then "no" else "yes"; - - # Ditto patchPhase = '' - substituteInPlace Makefile --replace 'echo -n' echo + substituteInPlace Makefile --replace '/bin/echo -n' echo ''; configurePhase = "true"; # Skip configure