forked from mirrors/nixpkgs
Use ocaml-3.12.1 by default
ocaml-3.11.1 is broken in stdenv, so I made this change in stdenv without waiting for maintainer. Feel free to revert if you have a better solution. svn path=/nixpkgs/branches/stdenv-updates/; revision=31314
This commit is contained in:
parent
b93a8d3476
commit
72f2477f80
|
@ -2335,7 +2335,7 @@ let
|
|||
|
||||
nvidia_cg_toolkit = callPackage ../development/compilers/nvidia-cg-toolkit { };
|
||||
|
||||
ocaml = ocaml_3_11_1;
|
||||
ocaml = ocaml_3_12_1;
|
||||
|
||||
ocaml_3_08_0 = callPackage ../development/compilers/ocaml/3.08.0.nix { };
|
||||
|
||||
|
@ -2428,7 +2428,7 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
ocamlPackages = recurseIntoAttrs ocamlPackages_3_11_1;
|
||||
ocamlPackages = recurseIntoAttrs ocamlPackages_3_12_1;
|
||||
ocamlPackages_3_10_0 = mkOcamlPackages ocaml_3_10_0 pkgs.ocamlPackages_3_10_0;
|
||||
ocamlPackages_3_11_1 = mkOcamlPackages ocaml_3_11_1 pkgs.ocamlPackages_3_11_1;
|
||||
ocamlPackages_3_12_1 = mkOcamlPackages ocaml_3_12_1 pkgs.ocamlPackages_3_12_1;
|
||||
|
|
Loading…
Reference in a new issue