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

* Make all ocaml versions available in the proper way.

Browse Source 
svn path=/nixpkgs/trunk/; revision=17805
This commit is contained in:
Eelco Dolstra 2009-10-14 15:21:45 +00:00
parent c5b198300d
commit f581d2a719
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/compilers/ocaml/default.nix
View File

@ -1,9 +0,0 @@
args:
builtins.listToAttrs [
{ name = "3.08.0"; value = import ./3.08.0.nix args; }
{ name = "3.09.1"; value = import ./3.09.1.nix args; }
{ name = "3.10.0"; value = import ./3.10.0.nix args; }
{ name = "3.11.1"; value = import ./3.11.1.nix args; }
{ name = "default"; value = import ./3.11.1.nix args; }
]

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

@ -2115,9 +2115,21 @@ let
inherit fetchurl stdenv;
};
ocaml = getVersion "ocaml" ocaml_alts;
ocaml = ocaml_3_11_1;
ocaml_alts = import ../development/compilers/ocaml {
ocaml_3_08_0 = import ../development/compilers/ocaml/3.08.0.nix {
inherit fetchurl stdenv x11 ncurses;
};
ocaml_3_09_1 = import ../development/compilers/ocaml/3.09.1.nix {
inherit fetchurl stdenv x11 ncurses;
};
ocaml_3_10_0 = import ../development/compilers/ocaml/3.10.0.nix {
inherit fetchurl stdenv x11 ncurses;
};
ocaml_3_11_1 = import ../development/compilers/ocaml/3.11.1.nix {
inherit fetchurl stdenv x11 ncurses;
};
@ -2145,7 +2157,7 @@ let
qcmm = import ../development/compilers/qcmm {
lua = lua4;
ocaml = builtins.getAttr "3.08.0" ocaml_alts;
ocaml = ocaml_3_08_0;
inherit fetchurl stdenv mk noweb groff;
};
@ -3204,7 +3216,7 @@ let
facile = import ../development/libraries/facile {
inherit fetchurl stdenv;
# Actually, we don't need this version but we need native-code compilation
ocaml = builtins.getAttr "3.10.0" ocaml_alts;
ocaml = ocaml_3_10_0;
};
faac = import ../development/libraries/faac {