diff options
| author | John Wiegley <jwiegley@gmail.com> | 2017-08-04 15:29:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-04 15:29:18 -0700 |
| commit | 6ff50dc16466d4881db4906e3fe94f9fd2ce6c8d (patch) | |
| tree | ec08563f80f41f1eeedd78f479653cf3afd64b8c /pkgs/applications | |
| parent | 268374cafe7469aeeb20fa3892061169220bd0c9 (diff) | |
| parent | 057ffcf0ddb3f94b8cc6899b6d5bfe7f93f1014e (diff) | |
| download | nixlib-6ff50dc16466d4881db4906e3fe94f9fd2ce6c8d.tar nixlib-6ff50dc16466d4881db4906e3fe94f9fd2ce6c8d.tar.gz nixlib-6ff50dc16466d4881db4906e3fe94f9fd2ce6c8d.tar.bz2 nixlib-6ff50dc16466d4881db4906e3fe94f9fd2ce6c8d.tar.lz nixlib-6ff50dc16466d4881db4906e3fe94f9fd2ce6c8d.tar.xz nixlib-6ff50dc16466d4881db4906e3fe94f9fd2ce6c8d.tar.zst nixlib-6ff50dc16466d4881db4906e3fe94f9fd2ce6c8d.zip | |
Merge pull request #27918 from Zimmi48/coq-update
Coq update
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/science/logic/coq/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index f93856e90e11..9620140dde4b 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -9,7 +9,7 @@ , ocamlPackages, ncurses , buildIde ? true , csdp ? null -, version ? "8.6" +, version ? "8.6.1" }: let @@ -18,9 +18,10 @@ let "8.5pl2" = "0wyywia0darak2zmc5v0ra9rn0b9whwdfiahralm8v5za499s8w3"; "8.5pl3" = "0fyk2a4fpifibq8y8jhx1891k55qnsnlygglch64sva0bph94nrh"; "8.6" = "1pw1xvy1657l1k69wrb911iqqflzhhp8wwsjvihbgc72r3skqg3f"; + "8.6.1" = "17cg2c40y9lskkiqfhngavp8yw3shpqgkpihh30xx0rlhn9amy1j"; }."${version}"; coq-version = builtins.substring 0 3 version; - camlp5 = ocamlPackages.camlp5_transitional; + camlp5 = ocamlPackages.camlp5_strict; ideFlags = if buildIde then "-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; csdpPatch = if csdp != null then '' substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp" @@ -132,7 +133,7 @@ self = stdenv.mkDerivation { homepage = http://coq.inria.fr; license = licenses.lgpl21; branch = coq-version; - maintainers = with maintainers; [ roconnor thoughtpolice vbgl ]; + maintainers = with maintainers; [ roconnor thoughtpolice vbgl Zimmi48 ]; platforms = platforms.unix; }; }; in self |