diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-09-18 08:23:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-18 08:23:50 +0100 |
| commit | 4aaf4d56603cce8cb12fec5cdc763e0ae227c1dd (patch) | |
| tree | e4c98720472f50af1394adc9dbee867793554367 /pkgs/development | |
| parent | f8b2c1318cac28fa1885e96bf341db5e9f392bad (diff) | |
| parent | 7f2f989d6a001ee5877110f21a31387b2d0e860a (diff) | |
| download | nixpkgs-4aaf4d56603cce8cb12fec5cdc763e0ae227c1dd.tar nixpkgs-4aaf4d56603cce8cb12fec5cdc763e0ae227c1dd.tar.gz nixpkgs-4aaf4d56603cce8cb12fec5cdc763e0ae227c1dd.tar.bz2 nixpkgs-4aaf4d56603cce8cb12fec5cdc763e0ae227c1dd.tar.lz nixpkgs-4aaf4d56603cce8cb12fec5cdc763e0ae227c1dd.tar.xz nixpkgs-4aaf4d56603cce8cb12fec5cdc763e0ae227c1dd.tar.zst nixpkgs-4aaf4d56603cce8cb12fec5cdc763e0ae227c1dd.zip | |
Merge pull request #46794 from vbgl/compcert-3.4
compcert: 3.3 -> 3.4
Diffstat (limited to 'pkgs/development')
| -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 631179c483b..a0058242bad 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/ '' + |