diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2017-04-30 12:49:20 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-30 12:49:20 +0200 |
commit | ce9c7dd0d6d8997d0971d9424aeb401c0ddd7145 (patch) | |
tree | d3f640450cd1162155bc97dc36a6f042df87fd5c /pkgs/applications/science | |
parent | b6cffb5d582c6940839e0275b841ae801d578545 (diff) | |
parent | bbd1c3d58a8652f3712348c4683c7c02738994d6 (diff) | |
download | nixlib-ce9c7dd0d6d8997d0971d9424aeb401c0ddd7145.tar nixlib-ce9c7dd0d6d8997d0971d9424aeb401c0ddd7145.tar.gz nixlib-ce9c7dd0d6d8997d0971d9424aeb401c0ddd7145.tar.bz2 nixlib-ce9c7dd0d6d8997d0971d9424aeb401c0ddd7145.tar.lz nixlib-ce9c7dd0d6d8997d0971d9424aeb401c0ddd7145.tar.xz nixlib-ce9c7dd0d6d8997d0971d9424aeb401c0ddd7145.tar.zst nixlib-ce9c7dd0d6d8997d0971d9424aeb401c0ddd7145.zip |
Merge pull request #21822 from rht/master
coq_HEAD: Update to the latest commit
Diffstat (limited to 'pkgs/applications/science')
-rw-r--r-- | pkgs/applications/science/logic/coq/HEAD.nix | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/pkgs/applications/science/logic/coq/HEAD.nix b/pkgs/applications/science/logic/coq/HEAD.nix index f6837397e21a..8d3fb19b2638 100644 --- a/pkgs/applications/science/logic/coq/HEAD.nix +++ b/pkgs/applications/science/logic/coq/HEAD.nix @@ -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. # 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. -{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 - version = "8.6pre-0c999f02"; + version = "2017-02-03"; coq-version = "8.6"; - buildIde = lablgtk != null; - ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; + ideFlags = if buildIde then "-lablgtkdir ${ocamlPackages_4_02.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; csdpPatch = if csdp != null then '' substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp" substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true" '' else ""; + ocaml = ocamlPackages_4_02.ocaml; + findlib = ocamlPackages_4_02.findlib; + lablgtk = ocamlPackages_4_02.lablgtk; + camlp5 = ocamlPackages_4_02.camlp5_transitional; in stdenv.mkDerivation { - name = "coq-${version}"; + name = "coq-unstable-${version}"; inherit coq-version; - inherit ocaml camlp5; + inherit ocaml camlp5 findlib; src = fetchgit { url = git://scm.gforge.inria.fr/coq/coq.git; - rev = "ad768e435a736ca51ac79a575967b388b34918c7"; - sha256 = "05s7sk1l3mvdjag3idnhkpj707y4bv56da7kpffw862f2qgfr77j"; + rev = "078598d029792a3d9a54fae9b9ac189b75bc3b06"; + sha256 = "0sflrpp6x0ada0bjh67q1x65g88d179n3cawpwkp1pm4kw76g8x7"; }; buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ]; |