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

Merge pull request #21822 from rht/master 

coq_HEAD: Update to the latest commit
This commit is contained in:
Michael Raskin 2017-04-30 12:49:20 +02:00 committed by GitHub
parent b6cffb5d58 bbd1c3d58a
commit ce9c7dd0d6
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/applications/science/logic/coq/HEAD.nix
View File

@ -1,31 +1,34 @@
# - coqide compilation can be disabled by setting lablgtk to null; # - coqide compilation can be disabled by setting buildIde to false;
# - The csdp program used for the Micromega tactic is statically referenced. # - The csdp program used for the Micromega tactic is statically referenced.
# However, coq can build without csdp by setting it to null. # However, coq can build without csdp by setting it to null.
# In this case some Micromega tactics will search the user's path for the csdp program and will fail if it is not found. # In this case some Micromega tactics will search the user's path for the csdp program and will fail if it is not found.
{stdenv, fetchgit, writeText, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null, csdp ? null}: {stdenv, fetchgit, writeText, pkgconfig, ocamlPackages_4_02, ncurses, buildIde ? true, csdp ? null}:
let let
version = "8.6pre-0c999f02"; version = "2017-02-03";
coq-version = "8.6"; coq-version = "8.6";
buildIde = lablgtk != null; ideFlags = if buildIde then "-lablgtkdir ${ocamlPackages_4_02.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
csdpPatch = if csdp != null then '' csdpPatch = if csdp != null then ''
substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp" substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp"
substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true" substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true"
'' else ""; '' else "";
ocaml = ocamlPackages_4_02.ocaml;
findlib = ocamlPackages_4_02.findlib;
lablgtk = ocamlPackages_4_02.lablgtk;
camlp5 = ocamlPackages_4_02.camlp5_transitional;
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 findlib;
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 = "078598d029792a3d9a54fae9b9ac189b75bc3b06";
sha256 = "05s7sk1l3mvdjag3idnhkpj707y4bv56da7kpffw862f2qgfr77j"; sha256 = "0sflrpp6x0ada0bjh67q1x65g88d179n3cawpwkp1pm4kw76g8x7";
}; };
buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ]; buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ];

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

@ -17486,10 +17486,7 @@ with pkgs;
version = "8.5pl3"; version = "8.5pl3";
}; };
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;
camlp5 = ocamlPackages.camlp5_transitional;
};
coq = coq_8_6; coq = coq_8_6;
mkCoqPackages_8_4 = self: let callPackage = newScope self; in { mkCoqPackages_8_4 = self: let callPackage = newScope self; in {