Update coq to 8.4
This commit is contained in:
parent
b32844654b
commit
706cbc9318
1112
pkgs/applications/science/logic/coq/configure.8.3.patch
Normal file
1112
pkgs/applications/science/logic/coq/configure.8.3.patch
Normal file
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
69
pkgs/applications/science/logic/coq/default.8.3.nix
Normal file
69
pkgs/applications/science/logic/coq/default.8.3.nix
Normal file
@ -0,0 +1,69 @@
|
||||
# - coqide compilation can be disabled by setting lablgtk to null;
|
||||
|
||||
{stdenv, fetchurl, ocaml, findlib, camlp5, ncurses, lablgtk ? null}:
|
||||
|
||||
let
|
||||
version = "8.3pl4";
|
||||
buildIde = lablgtk != null;
|
||||
ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
|
||||
idePatch = if buildIde then ''
|
||||
substituteInPlace scripts/coqmktop.ml --replace \
|
||||
"\"-I\"; \"+lablgtk2\"" \
|
||||
"\"-I\"; \"$(echo "${lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)\"; \"-I\"; \"$(echo "${lablgtk}"/lib/ocaml/*/site-lib/stublibs)\""
|
||||
'' else "";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "coq-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://coq.inria.fr/V${version}/files/coq-${version}.tar.gz";
|
||||
sha256 = "17d3lmchmqir1rawnr52g78srg4wkd7clzpzfsivxc4y1zp6rwkr";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml findlib camlp5 ncurses lablgtk ];
|
||||
|
||||
prefixKey = "-prefix ";
|
||||
|
||||
preConfigure = ''
|
||||
configureFlagsArray=(
|
||||
-opt
|
||||
-camldir ${ocaml}/bin
|
||||
-camlp5dir $(ocamlfind query camlp5)
|
||||
${ideFlags}
|
||||
)
|
||||
'';
|
||||
|
||||
buildFlags = "world"; # Debug with "world VERBOSE=1";
|
||||
|
||||
patches = [ ./configure.patch ];
|
||||
|
||||
postPatch = ''
|
||||
UNAME=$(type -tp uname)
|
||||
RM=$(type -tp rm)
|
||||
substituteInPlace configure --replace "/bin/uname" "$UNAME"
|
||||
substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM"
|
||||
${idePatch}
|
||||
'';
|
||||
|
||||
# This post install step is needed to build ssrcoqide from the ssreflect package
|
||||
# It could be made optional, but I see little harm in including it in the default
|
||||
# distribution -- roconnor
|
||||
# This will likely no longer be necessary for coq >= 8.4. -- roconnor
|
||||
postInstall = if buildIde then ''
|
||||
cp ide/*.cmi ide/ide.*a $out/lib/coq/ide/
|
||||
'' else "";
|
||||
|
||||
meta = {
|
||||
description = "Coq proof assistant";
|
||||
longDescription = ''
|
||||
Coq is a formal proof management system. It provides a formal language
|
||||
to write mathematical definitions, executable algorithms and theorems
|
||||
together with an environment for semi-interactive development of
|
||||
machine-checked proofs.
|
||||
'';
|
||||
homepage = "http://coq.inria.fr";
|
||||
license = "LGPL";
|
||||
maintainers = [ stdenv.lib.maintainers.roconnor ];
|
||||
};
|
||||
}
|
@ -1,15 +1,13 @@
|
||||
# - coqide compilation can be disabled by setting lablgtk to null;
|
||||
|
||||
{stdenv, fetchurl, ocaml, findlib, camlp5, ncurses, lablgtk ? null}:
|
||||
{stdenv, fetchurl, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null}:
|
||||
|
||||
let
|
||||
version = "8.3pl4";
|
||||
version = "8.4";
|
||||
buildIde = lablgtk != null;
|
||||
ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
|
||||
idePatch = if buildIde then ''
|
||||
substituteInPlace scripts/coqmktop.ml --replace \
|
||||
"\"-I\"; \"+lablgtk2\"" \
|
||||
"\"-I\"; \"$(echo "${lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)\"; \"-I\"; \"$(echo "${lablgtk}"/lib/ocaml/*/site-lib/stublibs)\""
|
||||
idePath = if buildIde then ''
|
||||
CAML_LD_LIBRARY_PATH=${lablgtk}/lib/ocaml/3.12.1/site-lib/stublibs
|
||||
'' else "";
|
||||
in
|
||||
|
||||
@ -17,24 +15,11 @@ stdenv.mkDerivation {
|
||||
name = "coq-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://coq.inria.fr/V${version}/files/coq-${version}.tar.gz";
|
||||
sha256 = "17d3lmchmqir1rawnr52g78srg4wkd7clzpzfsivxc4y1zp6rwkr";
|
||||
url = "http://pauillac.inria.fr/~herbelin/coq/distrib/V${version}/files/coq-${version}.tar.gz";
|
||||
sha256 = "0ka2lak9il4hlblk461awf0hbi3mxqhc1wz6kllxradyy2vfaspl";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml findlib camlp5 ncurses lablgtk ];
|
||||
|
||||
prefixKey = "-prefix ";
|
||||
|
||||
preConfigure = ''
|
||||
configureFlagsArray=(
|
||||
-opt
|
||||
-camldir ${ocaml}/bin
|
||||
-camlp5dir $(ocamlfind query camlp5)
|
||||
${ideFlags}
|
||||
)
|
||||
'';
|
||||
|
||||
buildFlags = "world"; # Debug with "world VERBOSE=1";
|
||||
buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ];
|
||||
|
||||
patches = [ ./configure.patch ];
|
||||
|
||||
@ -43,16 +28,21 @@ stdenv.mkDerivation {
|
||||
RM=$(type -tp rm)
|
||||
substituteInPlace configure --replace "/bin/uname" "$UNAME"
|
||||
substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM"
|
||||
${idePatch}
|
||||
'';
|
||||
|
||||
# This post install step is needed to build ssrcoqide from the ssreflect package
|
||||
# It could be made optional, but I see little harm in including it in the default
|
||||
# distribution -- roconnor
|
||||
# This will likely no longer be necessary for coq >= 8.4. -- roconnor
|
||||
postInstall = if buildIde then ''
|
||||
cp ide/*.cmi ide/ide.*a $out/lib/coq/ide/
|
||||
'' else "";
|
||||
preConfigure = ''
|
||||
buildFlagsArray=(${idePath})
|
||||
configureFlagsArray=(
|
||||
-opt
|
||||
-camldir ${ocaml}/bin
|
||||
-camlp5dir $(ocamlfind query camlp5)
|
||||
${ideFlags}
|
||||
)
|
||||
'';
|
||||
|
||||
prefixKey = "-prefix ";
|
||||
|
||||
buildFlags = "revision coq coqide";
|
||||
|
||||
meta = {
|
||||
description = "Coq proof assistant";
|
||||
|
@ -8428,6 +8428,11 @@ let
|
||||
camlp5 = ocamlPackages.camlp5_transitional;
|
||||
};
|
||||
|
||||
coq_8_3 = callPackage ../applications/science/logic/coq/8.3.nix {
|
||||
inherit (ocamlPackages) findlib lablgtk;
|
||||
camlp5 = ocamlPackages.camlp5_transitional;
|
||||
};
|
||||
|
||||
cvc3 = callPackage ../applications/science/logic/cvc3 {};
|
||||
|
||||
eprover = callPackage ../applications/science/logic/eProver {
|
||||
@ -8481,6 +8486,7 @@ let
|
||||
spass = callPackage ../applications/science/logic/spass {};
|
||||
|
||||
ssreflect = callPackage ../applications/science/logic/ssreflect {
|
||||
coq = coq_8_3;
|
||||
camlp5 = ocamlPackages.camlp5_transitional;
|
||||
};
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user