coq_HEAD: Update to the latest commit
This commit is contained in:
parent
9536169074
commit
975d040f07
@ -6,7 +6,7 @@
|
|||||||
{stdenv, fetchgit, writeText, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null, csdp ? null}:
|
{stdenv, fetchgit, writeText, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null, csdp ? null}:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "8.6pre-0c999f02";
|
version = "2017-01-22";
|
||||||
coq-version = "8.6";
|
coq-version = "8.6";
|
||||||
buildIde = lablgtk != null;
|
buildIde = lablgtk != null;
|
||||||
ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
|
ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
|
||||||
@ -17,15 +17,15 @@ let
|
|||||||
in
|
in
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "coq-${version}";
|
name = "coq-unstable-${version}";
|
||||||
|
|
||||||
inherit coq-version;
|
inherit coq-version;
|
||||||
inherit ocaml camlp5;
|
inherit ocaml camlp5;
|
||||||
|
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = git://scm.gforge.inria.fr/coq/coq.git;
|
url = git://scm.gforge.inria.fr/coq/coq.git;
|
||||||
rev = "ad768e435a736ca51ac79a575967b388b34918c7";
|
rev = "d6bcc6ebe4f65d0555414851f7e4fb6fa1fb22a4";
|
||||||
sha256 = "05s7sk1l3mvdjag3idnhkpj707y4bv56da7kpffw862f2qgfr77j";
|
sha256 = "1k5wkwlis836iwy1s8hfjw9gwdk8vp405hp09s6d44ijb2ihr356";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ];
|
buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ];
|
||||||
|
@ -17222,8 +17222,8 @@ with pkgs;
|
|||||||
};
|
};
|
||||||
coq_8_6 = callPackage ../applications/science/logic/coq {};
|
coq_8_6 = callPackage ../applications/science/logic/coq {};
|
||||||
coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix {
|
coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix {
|
||||||
inherit (ocamlPackages) ocaml findlib lablgtk;
|
inherit (ocamlPackages_4_02) ocaml findlib lablgtk;
|
||||||
camlp5 = ocamlPackages.camlp5_transitional;
|
camlp5 = ocamlPackages_4_02.camlp5_transitional;
|
||||||
};
|
};
|
||||||
coq = coq_8_6;
|
coq = coq_8_6;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user