summary refs log tree commit diff
path: root/pkgs/development/ocaml-modules/batteries/default.nix
diff options
context:
space:
mode:
authorMarco Maggesi <maggesi@math.unifi.it>2011-07-22 07:28:51 +0000
committerMarco Maggesi <maggesi@math.unifi.it>2011-07-22 07:28:51 +0000
commitb1f6ed4a6e2356d81113dfd9b3e23197ec036782 (patch)
tree10f0780053ec5ce15596761e5ed214f8fd1257e8 /pkgs/development/ocaml-modules/batteries/default.nix
parentdb86b7f2374482c48fbbb35a7c31711b5fc0a225 (diff)
downloadnixlib-b1f6ed4a6e2356d81113dfd9b3e23197ec036782.tar
nixlib-b1f6ed4a6e2356d81113dfd9b3e23197ec036782.tar.gz
nixlib-b1f6ed4a6e2356d81113dfd9b3e23197ec036782.tar.bz2
nixlib-b1f6ed4a6e2356d81113dfd9b3e23197ec036782.tar.lz
nixlib-b1f6ed4a6e2356d81113dfd9b3e23197ec036782.tar.xz
nixlib-b1f6ed4a6e2356d81113dfd9b3e23197ec036782.tar.zst
nixlib-b1f6ed4a6e2356d81113dfd9b3e23197ec036782.zip
Update OCaml Batteries to 1.4.0
svn path=/nixpkgs/trunk/; revision=27900
Diffstat (limited to 'pkgs/development/ocaml-modules/batteries/default.nix')
-rw-r--r--pkgs/development/ocaml-modules/batteries/default.nix11
1 files changed, 3 insertions, 8 deletions
diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix
index b7a80129451f..06583cd15e1a 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