Author: maggesi
Date: Fri Jul 22 07:28:51 2011
New Revision: 27900
URL: https://svn.nixos.org/websvn/nix/?rev=27900&sc=1
Log:
Update OCaml Batteries to 1.4.0
Modified:
nixpkgs/trunk/pkgs/development/ocaml-modules/batteries/default.nix
Modified: nixpkgs/trunk/pkgs/development/ocaml-modules/batteries/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/ocaml-modules/batteries/default.nix Fri Jul
22 01:54:04 2011 (r27899)
+++ nixpkgs/trunk/pkgs/development/ocaml-modules/batteries/default.nix Fri Jul
22 07:28:51 2011 (r27900)
@@ -8,19 +8,14 @@
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
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits