fixed ocaml/qcmm problem:

-created separate nix expressions for ocaml-3.08.0 and ocaml 3.09.1
-ocam-3.09.1 is standard/default ocaml version (included by ocaml/default.nix)
-created ocaml3080 in all-packages-generic.nix
-qcmm now uses ocaml3080 instead of ocaml


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

pkgs/development/compilers/ocaml/default.nix

@@ -1,15 +1 @@
-{stdenv, fetchurl, x11}:
+import ./ocaml-3.09.1.nix
-
-stdenv.mkDerivation {
-  name = "ocaml-3.08.0";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://caml.inria.fr/pub/distrib/ocaml-3.09/ocaml-3.09.1.tar.gz;
-    md5 = "c73f4b093e27ba5bf13d62923f89befc";
-  };
-  configureScript = ./configure;
-  dontAddPrefix = "True";
-  configureFlags = ["-no-tk" "-x11lib" x11];
-  makeFlags = ["world" "bootstrap" "opt"];
-  checkTarget = ["opt.opt"];
-}

pkgs/development/compilers/ocaml/ocaml-3.08.0.nix

@@ -0,0 +1,15 @@
+{stdenv, fetchurl, x11}:
+
+stdenv.mkDerivation {
+  name = "ocaml-3.08.0";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://nix.cs.uu.nl/dist/tarballs/ocaml-3.08.0.tar.gz;
+    md5 = "c6ef478362295c150101cdd2efcd38e0";
+  };
+  configureScript = ./configure-3.08.0;
+  dontAddPrefix = "True";
+  configureFlags = ["-no-tk" "-x11lib" x11];
+  makeFlags = ["world" "bootstrap" "opt"];
+  checkTarget = ["opt.opt"];
+}

pkgs/development/compilers/ocaml/ocaml-3.09.1.nix

@@ -0,0 +1,15 @@
+{stdenv, fetchurl, x11}:
+
+stdenv.mkDerivation {
+  name = "ocaml-3.09.1";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://caml.inria.fr/pub/distrib/ocaml-3.09/ocaml-3.09.1.tar.gz;
+    md5 = "c73f4b093e27ba5bf13d62923f89befc";
+  };
+  configureScript = ./configure-3.09.1;
+  dontAddPrefix = "True";
+  configureFlags = ["-no-tk" "-x11lib" x11];
+  makeFlags = ["world" "bootstrap" "opt"];
+  checkTarget = ["opt.opt"];
+}

pkgs/system/all-packages-generic.nix

@@ -652,9 +652,14 @@ rec {
     inherit fetchurl stdenv x11;
   };
 
+  ocaml3080 = (import ../development/compilers/ocaml/ocaml-3.08.0.nix) {
+    inherit fetchurl stdenv x11;
+  };
+
   qcmm = (import ../development/compilers/qcmm) {
-    lua = lua4;
+    lua   = lua4;
-    inherit fetchurl stdenv mk ocaml noweb groff;
+    ocaml = ocaml3080;
+    inherit fetchurl stdenv mk noweb groff;
   };
 
   mono = (import ../development/compilers/mono) {