From f316832e3ace9cb417148d0fa6041d84c5ec765a Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Fri, 26 Jun 2009 16:53:02 +0000 Subject: [PATCH] update default ocmal to 3.11.1. patch provided by olegfink svn path=/nixpkgs/trunk/; revision=16061 --- development/compilers/ocaml/3.11.1.nix | 28 ++++++++++++++++++++ pkgs/development/compilers/ocaml/default.nix | 3 ++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 development/compilers/ocaml/3.11.1.nix diff --git a/development/compilers/ocaml/3.11.1.nix b/development/compilers/ocaml/3.11.1.nix new file mode 100644 index 00000000000..f5955c7c78c --- /dev/null +++ b/development/compilers/ocaml/3.11.1.nix @@ -0,0 +1,28 @@ +args: with args; + +stdenv.mkDerivation (rec { + + name = "ocaml-3.11.1"; + + src = fetchurl { + url = "http://caml.inria.fr/pub/distrib/ocaml-3.11/${name}.tar.bz2"; + sha256 = "8c36a28106d4b683a15c547dfe4cb757a53fa9247579d1cc25bd06a22cc62e50"; + }; + + 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"; + }; + +}) diff --git a/pkgs/development/compilers/ocaml/default.nix b/pkgs/development/compilers/ocaml/default.nix index f3ef70b2a55..57cdfceaa15 100644 --- a/pkgs/development/compilers/ocaml/default.nix +++ b/pkgs/development/compilers/ocaml/default.nix @@ -4,5 +4,6 @@ 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 = "default"; value = import ./3.09.1.nix args; } + { name = "3.11.1"; value = import ./3.11.1.nix args; } + { name = "default"; value = import ./3.11.1.nix args; } ]