diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2018-09-17 17:50:38 +0000 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2018-09-17 18:36:31 +0000 |
| commit | 7f2f989d6a001ee5877110f21a31387b2d0e860a (patch) | |
| tree | 9640a3b092e9c6e7d494a446a8413db42019f5f3 /pkgs/development/compilers | |
| parent | bc1911e96e0705cd54983b6555ca25c55a66ded6 (diff) | |
| download | nixlib-7f2f989d6a001ee5877110f21a31387b2d0e860a.tar nixlib-7f2f989d6a001ee5877110f21a31387b2d0e860a.tar.gz nixlib-7f2f989d6a001ee5877110f21a31387b2d0e860a.tar.bz2 nixlib-7f2f989d6a001ee5877110f21a31387b2d0e860a.tar.lz nixlib-7f2f989d6a001ee5877110f21a31387b2d0e860a.tar.xz nixlib-7f2f989d6a001ee5877110f21a31387b2d0e860a.tar.zst nixlib-7f2f989d6a001ee5877110f21a31387b2d0e860a.zip | |
compcert: 3.3 -> 3.4
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/compcert/default.nix | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix index 631179c483bc..a0058242bad8 100644 --- a/pkgs/development/compilers/compcert/default.nix +++ b/pkgs/development/compilers/compcert/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, fetchpatch -, coq, ocamlPackages +, coq, ocamlPackages, coq2html , tools ? stdenv.cc }: @@ -7,23 +7,18 @@ assert lib.versionAtLeast ocamlPackages.ocaml.version "4.02"; stdenv.mkDerivation rec { name = "compcert-${version}"; - version = "3.3"; + version = "3.4"; src = fetchurl { url = "http://compcert.inria.fr/release/${name}.tgz"; - sha256 = "16xrqcwak1v1fk5ndx6jf1yvxv3adsr7p7z34gfm2mpggxnq0xwn"; + sha256 = "12gchwvkzhd2bhrnwzfb4a06wc4hgv98z987k06vj7ga31ii763h"; }; - buildInputs = [ coq ] + buildInputs = [ coq coq2html ] ++ (with ocamlPackages; [ ocaml findlib menhir ]); enableParallelBuilding = true; - patches = [ (fetchpatch { - url = "https://github.com/AbsInt/CompCert/commit/679ecfeaa24c0615fa1999e9582bf2af6a9f35e7.patch"; - sha256 = "04yrn6dp57aw6lmlr4yssjlx9cxix0mlmaw7gfhwyz5bzqc2za1a"; - })]; - configurePhase = '' substituteInPlace ./configure --replace '{toolprefix}gcc' '{toolprefix}cc' ./configure -clightgen -prefix $out -toolprefix ${tools}/bin/ '' + |