* Make all ocaml versions available in the proper way.

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

2 files changed, 16 insertions, 13 deletions

diff --git a/pkgs/development/compilers/ocaml/default.nix b/pkgs/development/compilers/ocaml/default.nix
deleted file mode 100644
index 57cdfceaa152e..0000000000000
--- a/pkgs/development/compilers/ocaml/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-args:
-
-builtins.listToAttrs [
-  { name = "3.08.0"; value = import ./3.08.0.nix args; }
-  { name = "3.09.1"; value = import ./3.09.1.nix args; }
-  { name = "3.10.0"; value = import ./3.10.0.nix args; }
-  { name = "3.11.1"; value = import ./3.11.1.nix args; }
-  { name = "default"; value = import ./3.11.1.nix args; }
-]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d7d92162576c2..33803dc71f2cc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2115,9 +2115,21 @@ let
     inherit fetchurl stdenv;
   };
 
-  ocaml = getVersion  "ocaml" ocaml_alts;
+  ocaml = ocaml_3_11_1;
 
-  ocaml_alts = import ../development/compilers/ocaml {
+  ocaml_3_08_0 = import ../development/compilers/ocaml/3.08.0.nix {
+    inherit fetchurl stdenv x11 ncurses;
+  };
+
+  ocaml_3_09_1 = import ../development/compilers/ocaml/3.09.1.nix {
+    inherit fetchurl stdenv x11 ncurses;
+  };
+
+  ocaml_3_10_0 = import ../development/compilers/ocaml/3.10.0.nix {
+    inherit fetchurl stdenv x11 ncurses;
+  };
+
+  ocaml_3_11_1 = import ../development/compilers/ocaml/3.11.1.nix {
     inherit fetchurl stdenv x11 ncurses;
   };
 
@@ -2145,7 +2157,7 @@ let
 
   qcmm = import ../development/compilers/qcmm {
     lua   = lua4;
-    ocaml = builtins.getAttr "3.08.0" ocaml_alts;
+    ocaml = ocaml_3_08_0;
     inherit fetchurl stdenv mk noweb groff;
   };
 
@@ -3204,7 +3216,7 @@ let
   facile = import ../development/libraries/facile {
     inherit fetchurl stdenv;
     # Actually, we don't need this version but we need native-code compilation
-    ocaml = builtins.getAttr "3.10.0" ocaml_alts;
+    ocaml = ocaml_3_10_0;
   };
 
   faac = import ../development/libraries/faac {