diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2007-11-14 22:39:58 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2007-11-14 22:39:58 +0000 |
| commit | cf76a3007020b72a2d3e26051bf68c07ee654d50 (patch) | |
| tree | c8a072e8b41034d61046b7cce68b71ef3eefeb63 /pkgs/top-level/all-packages.nix | |
| parent | 732597e4300a00cdfaac0e3166536554f5f4c77d (diff) | |
| download | nixpkgs-cf76a3007020b72a2d3e26051bf68c07ee654d50.tar nixpkgs-cf76a3007020b72a2d3e26051bf68c07ee654d50.tar.gz nixpkgs-cf76a3007020b72a2d3e26051bf68c07ee654d50.tar.bz2 nixpkgs-cf76a3007020b72a2d3e26051bf68c07ee654d50.tar.lz nixpkgs-cf76a3007020b72a2d3e26051bf68c07ee654d50.tar.xz nixpkgs-cf76a3007020b72a2d3e26051bf68c07ee654d50.tar.zst nixpkgs-cf76a3007020b72a2d3e26051bf68c07ee654d50.zip | |
ocaml: Added 3.10.0, using getVersion staff
I've added the latest (3.10.0) version of ocaml and let the user choose default version. svn path=/nixpkgs/trunk/; revision=9671
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a535f58a553..9b3ac7c8734 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1075,13 +1075,11 @@ rec { inherit fetchurl stdenv; }; - ocaml = import ../development/compilers/ocaml { - inherit fetchurl stdenv x11 ncurses; - }; + ocaml = getVersion "ocaml" ocaml_alts; - ocaml3080 = import ../development/compilers/ocaml/ocaml-3.08.0.nix { - inherit fetchurl x11; - stdenv = overrideGCC stdenv gcc34; + ocaml_alts = import ../development/compilers/ocaml { + inherit fetchurl stdenv x11 ncurses stdenvUsingSetupNew2; + stdenv34 = overrideGCC stdenv gcc34; }; /* @@ -1108,7 +1106,7 @@ rec { qcmm = import ../development/compilers/qcmm { lua = lua4; - ocaml = ocaml3080; + ocaml = ocaml_alts.v_3_08_0; inherit fetchurl stdenv mk noweb groff; }; |