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

ocaml: Added 3.10.0, using getVersion staff

Browse Source 
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:
Yury G. Kudryashov 2007-11-14 22:39:58 +00:00
parent 732597e430
commit cf76a30070
5 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/ocaml/ocaml-3.08.0.nix → pkgs/development/compilers/ocaml/3.08.0.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, x11}: args: with args;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ocaml-3.08.0"; name = "ocaml-3.08.0";

2
pkgs/development/compilers/ocaml/ocaml-3.09.1.nix → pkgs/development/compilers/ocaml/3.09.1.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, x11, ncurses}: args: with args;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ocaml-3.09.1"; name = "ocaml-3.09.1";

23
pkgs/development/compilers/ocaml/3.10.0.nix Normal file
View 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";
};
}

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

@ -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;});
}

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

@ -1075,13 +1075,11 @@ rec {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
ocaml = import ../development/compilers/ocaml { ocaml = getVersion "ocaml" ocaml_alts;
inherit fetchurl stdenv x11 ncurses;
};
ocaml3080 = import ../development/compilers/ocaml/ocaml-3.08.0.nix { ocaml_alts = import ../development/compilers/ocaml {
inherit fetchurl x11; inherit fetchurl stdenv x11 ncurses stdenvUsingSetupNew2;
stdenv = overrideGCC stdenv gcc34; stdenv34 = overrideGCC stdenv gcc34;
}; };
/* /*
@ -1108,7 +1106,7 @@ rec {
qcmm = import ../development/compilers/qcmm { qcmm = import ../development/compilers/qcmm {
lua = lua4; lua = lua4;
ocaml = ocaml3080; ocaml = ocaml_alts.v_3_08_0;
inherit fetchurl stdenv mk noweb groff; inherit fetchurl stdenv mk noweb groff;
}; };