Make OCaml 4.01.0 the default version of OCaml.

Also change the ocaml attribute to always point to the one of the current
ocamlPackages.
This commit is contained in:
Marco Maggesi 2014-01-29 08:46:12 +01:00
parent f88de3b091
commit 99faf96ea7

View file

@ -2817,7 +2817,7 @@ let
nvidia_cg_toolkit = callPackage ../development/compilers/nvidia-cg-toolkit { };
ocaml = ocaml_3_12_1;
ocaml = ocamlPackages.ocaml;
ocaml_3_08_0 = callPackage ../development/compilers/ocaml/3.08.0.nix { };
@ -2949,7 +2949,7 @@ let
opam = opam_1_1;
};
ocamlPackages = recurseIntoAttrs ocamlPackages_3_12_1;
ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0;
ocamlPackages_3_10_0 = mkOcamlPackages ocaml_3_10_0 pkgs.ocamlPackages_3_10_0;
ocamlPackages_3_11_2 = mkOcamlPackages ocaml_3_11_2 pkgs.ocamlPackages_3_11_2;
ocamlPackages_3_12_1 = mkOcamlPackages ocaml_3_12_1 pkgs.ocamlPackages_3_12_1;