compcert: 2.5 -> 2.6

This commit is contained in:
Vincent Laporte 2016-01-24 22:54:53 +01:00
parent 1f2b819783
commit c0691a0659
2 changed files with 7 additions and 5 deletions

View File

@ -4,14 +4,14 @@
stdenv.mkDerivation rec {
name = "compcert-${version}";
version = "2.5";
version = "2.6";
src = fetchurl {
url = "http://compcert.inria.fr/release/${name}.tgz";
sha256 = "15gxarl2a8mz33fdn8pycj0ccazgmllbg2940n7aqdjlz807p11n";
sha256 = "05sdxgg2w7ykw6xbcq6dl2kzxdz4qzhjajiawpy6490wqiji7wm1";
};
buildInputs = [ coq ] ++ (with ocamlPackages; [ ocaml menhir ]);
buildInputs = [ coq ] ++ (with ocamlPackages; [ ocaml findlib menhir ]);
enableParallelBuilding = true;

View File

@ -3883,11 +3883,13 @@ let
cmucl_binary = callPackage_i686 ../development/compilers/cmucl/binary.nix { };
compcert = callPackage ../development/compilers/compcert (
compcert = callPackage ../development/compilers/compcert ((
if system == "x86_64-linux"
then { tools = pkgsi686Linux.stdenv.cc; }
else {}
);
) // {
ocamlPackages = ocamlPackages_4_02;
});
cryptol = haskellPackages.cryptol;