Update ocaml_batteries and camomile (ocamlPackages)

*  Add camomile 0.8.3 and 0.8.2 (for ocaml_batteries).
  *  Remove obsolete camomile 0.7.3 and 0.8.1.
  *  Update ocaml_batteries to version 1.3.0 (also add fixes for Darwin).


svn path=/nixpkgs/trunk/; revision=27299

pkgs/development/ocaml-modules/batteries/default.nix

@@ -2,7 +2,7 @@
 
 let
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
-  version = "1.2.0";
+  version = "1.3.0";
 in
 
 stdenv.mkDerivation {
@@ -10,13 +10,26 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://forge.ocamlcore.org/frs/download.php/423/batteries-${version}.tar.gz";
-    sha256 = "0lkkbfj51zkhhr56nx167448pvg02nrzjjkl57ycic2ikzgq6lmx";
+    sha256 = "1kf8dyivigavi89lpsz7hzdv48as10yck7gkmqmnsnn1dps3m7an";
   };
 
   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
+  '';
+
   configurePhase = "true"; 	# Skip configure
 
+  preInstall = ''
+    ensureDir "$out/lib/ocaml/${ocaml_version}/site-lib"
+  '';
+
   doCheck = true;
 
   checkTarget = "test";

pkgs/development/ocaml-modules/camomile/0.8.2.nix

@@ -2,7 +2,7 @@
 
 let
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
-  version = "0.7.3";
+  version = "0.8.2";
 in
 
 stdenv.mkDerivation {
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/camomile/camomile-${version}.tar.bz2";
-    sha256 = "0cm3j3ppl15fp597ih3qiagxyg8kpql9apapkqaib2xccc44zb5l";
+    sha256 = "0x43pjxx70kgip86mmdn08s97k4qzdqc8i79xfyyx28smy1bsa00";
   };
 
   buildInputs = [ocaml findlib];

pkgs/development/ocaml-modules/camomile/default.nix

@@ -2,7 +2,7 @@
 
 let
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
-  version = "0.8.1";
+  version = "0.8.3";
 in
 
 stdenv.mkDerivation {
@@ -10,7 +10,8 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/camomile/camomile-${version}.tar.bz2";
-    sha256 = "1r84y7wl10zkjmp8qqq2bcmll23qmfczlnykm74hxkig8ksm0g6a";
+    #sha256 = "0x43pjxx70kgip86mmdn08s97k4qzdqc8i79xfyyx28smy1bsa00";
+    sha256 = "0yzj6j88aqrkbcynqh1d7r54670m1sqf889vdcgk143w85fxdj4l";
   };
 
   buildInputs = [ocaml findlib];

pkgs/top-level/all-packages.nix

@@ -2157,9 +2157,8 @@ let
 
     camlzip = callPackage ../development/ocaml-modules/camlzip { };
 
-    camomile = camomile_0_7_3;
-    camomile_0_7_3 = callPackage ../development/ocaml-modules/camomile/0.7.3.nix { };
-    camomile_0_8_1 = callPackage ../development/ocaml-modules/camomile/0.8.1.nix { };
+    camomile_0_8_2 = callPackage ../development/ocaml-modules/camomile/0.8.2.nix { };
+    camomile = callPackage ../development/ocaml-modules/camomile { };
 
     cryptokit = callPackage ../development/ocaml-modules/cryptokit { };
 
@@ -2177,7 +2176,9 @@ let
 
     menhir = callPackage ../development/ocaml-modules/menhir { };
 
-    ocaml_batteries = callPackage ../development/ocaml-modules/batteries { };
+    ocaml_batteries = callPackage ../development/ocaml-modules/batteries {
+      camomile = camomile_0_8_2;
+    };
 
     ocaml_cryptgps = callPackage ../development/ocaml-modules/cryptgps { };