b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #27918 from Zimmi48/coq-update

Browse source 
Coq update
This commit is contained in:
John Wiegley 2017-08-04 15:29:18 -07:00 committed by GitHub
parent 268374cafe 057ffcf0dd
commit 6ff50dc164
3 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/maintainers.nix
View file

@ -634,6 +634,7 @@
zauberpony = "Elmar Athmer <elmar@athmer.org>";
zef = "Zef Hemel <zef@zef.me>";
zimbatm = "zimbatm <zimbatm@zimbatm.com>";
Zimmi48 = "Théo Zimmermann <theo.zimmermann@univ-paris-diderot.fr>";
zohl = "Al Zohali <zohl@fmap.me>";
zoomulator = "Kim Simmons <zoomulator@gmail.com>";
zraexy = "David Mell <zraexy@gmail.com>";

7
pkgs/applications/science/logic/coq/default.nix
View file

@ -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

11
pkgs/top-level/all-packages.nix
View file

@ -5229,13 +5229,10 @@ with pkgs;
cmucl_binary = callPackage_i686 ../development/compilers/cmucl/binary.nix { };
compcert = callPackage ../development/compilers/compcert ((
if system == "x86_64-linux"
then { tools = pkgsi686Linux.stdenv.cc; }
else {}
) // {
coq = coq_8_6;
});
compcert = callPackage ../development/compilers/compcert {
# Pin the version of coq used in compcert to 8.6 until the next release
coq = callPackage ../applications/science/logic/coq { version = "8.6"; };
};
# Users installing via `nix-env` will likely be using the REPL,