public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ocaml-updates' of git://github.com/maggesi/nixpkgs

Browse Source 
Make OCaml 4.01.0 the default version of OCaml
This commit is contained in:
Shea Levy 2014-03-14 19:58:02 -04:00
commit 04fe6405e4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/top-level/all-packages.nix
View File

@ -2880,7 +2880,7 @@ let
nvidia_cg_toolkit = callPackage ../development/compilers/nvidia-cg-toolkit { }; 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 { }; ocaml_3_08_0 = callPackage ../development/compilers/ocaml/3.08.0.nix { };
@ -3012,7 +3012,7 @@ let
opam = opam_1_1; 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_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_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; ocamlPackages_3_12_1 = mkOcamlPackages ocaml_3_12_1 pkgs.ocamlPackages_3_12_1;