Merge branch 'coq' of git://github.com/thoughtpolice/nixpkgs

coq: 8.4pl2 -> 8.4pl3
This commit is contained in:
Shea Levy 2014-03-15 13:03:10 -04:00
commit 389c3951a8

View File

@ -3,7 +3,7 @@
{stdenv, fetchurl, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null}:
let
version = "8.4pl2";
version = "8.4pl3";
buildIde = lablgtk != null;
ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
idePath = if buildIde then ''
@ -16,7 +16,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://coq.inria.fr/distrib/V${version}/files/coq-${version}.tar.gz";
sha256 = "1n52pky7bb45irk2jw6f4rd3kvy8lm2yfldjwdhiic0kyqw9lwgv";
sha256 = "0f7v3j4zsrhpswdh47bb30vwgsr0ck79jkkz01a5a74qgxiksn4p";
};
buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ];
@ -54,7 +54,7 @@ stdenv.mkDerivation {
'';
homepage = "http://coq.inria.fr";
license = "LGPL";
maintainers = [ stdenv.lib.maintainers.roconnor ];
maintainers = with stdenv.lib.maintainers; [ roconnor thoughtpolice ];
platforms = stdenv.lib.platforms.linux;
};
}