diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-05 17:06:15 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-05 17:06:15 +0000 |
| commit | 72f2477f80dbb6c9ec4c80672c22cb644af88791 (patch) | |
| tree | 44ba09261e75d3ae12d3352235d3a3dedf0896c3 | |
| parent | b93a8d3476c9534920bc3ce5ed0a5c1a17b26567 (diff) | |
| download | nixpkgs-72f2477f80dbb6c9ec4c80672c22cb644af88791.tar nixpkgs-72f2477f80dbb6c9ec4c80672c22cb644af88791.tar.gz nixpkgs-72f2477f80dbb6c9ec4c80672c22cb644af88791.tar.bz2 nixpkgs-72f2477f80dbb6c9ec4c80672c22cb644af88791.tar.lz nixpkgs-72f2477f80dbb6c9ec4c80672c22cb644af88791.tar.xz nixpkgs-72f2477f80dbb6c9ec4c80672c22cb644af88791.tar.zst nixpkgs-72f2477f80dbb6c9ec4c80672c22cb644af88791.zip | |
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
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 41db7baa4bc..470d246e847 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; |