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
This commit is contained in:
parent
732597e430
commit
cf76a30070
@ -1,4 +1,4 @@
|
||||
{stdenv, fetchurl, x11}:
|
||||
args: with args;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ocaml-3.08.0";
|
@ -1,4 +1,4 @@
|
||||
{stdenv, fetchurl, x11, ncurses}:
|
||||
args: with args;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ocaml-3.09.1";
|
23
pkgs/development/compilers/ocaml/3.10.0.nix
Normal file
23
pkgs/development/compilers/ocaml/3.10.0.nix
Normal file
@ -0,0 +1,23 @@
|
||||
args: with args;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ocaml-3.10.0";
|
||||
src = fetchurl {
|
||||
url = http://caml.inria.fr/pub/distrib/ocaml-3.10/${name}.tar.bz2;
|
||||
sha256 = "1ihmx1civ78s7k2hfc05z1s9vbyx2qw7fg8lnbxnfd6zxkk8878d";
|
||||
};
|
||||
prefixKey = "-prefix ";
|
||||
configureFlags = ["-no-tk" "-x11lib" x11];
|
||||
buildFlags = "world bootstrap world.opt";
|
||||
buildInputs = [x11 ncurses];
|
||||
installTargets = "install installopt";
|
||||
patchPhase = "
|
||||
CAT=$(type -tp cat)
|
||||
sed -e \"s@/bin/cat@\${CAT}@\" -i config/auto-aux/sharpbang
|
||||
";
|
||||
|
||||
meta = {
|
||||
homepage = http://caml.inria.fr/ocaml;
|
||||
license = "QPL, LGPL2 (library part)";
|
||||
desctiption = "Most popular variant of the Caml language";
|
||||
};
|
||||
}
|
@ -1 +1,7 @@
|
||||
import ./ocaml-3.09.1.nix
|
||||
args:
|
||||
rec {
|
||||
default = v_3_09_1;
|
||||
v_3_08_0 = import ./3.08.0.nix (args // {stdenv = args.stdenv34;});
|
||||
v_3_09_1 = import ./3.09.1.nix args;
|
||||
v_3_10_0 = import ./3.10.0.nix (args // {stdenv = args.stdenvUsingSetupNew2;});
|
||||
}
|
||||
|
@ -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;
|
||||
};
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user