diff options
author | Vincent Laporte <vbgl@users.noreply.github.com> | 2018-08-05 19:14:55 +0000 |
---|---|---|
committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-08-05 21:14:55 +0200 |
commit | ec7865cddc72f8d8940c613283b0a3b2976d7025 (patch) | |
tree | e588711594712402650989ac182423aa3d58648f /pkgs/development/compilers/compcert | |
parent | 75cb04672f4150ea81a76ad68650b60935a2c8f5 (diff) | |
download | nixpkgs-ec7865cddc72f8d8940c613283b0a3b2976d7025.tar nixpkgs-ec7865cddc72f8d8940c613283b0a3b2976d7025.tar.gz nixpkgs-ec7865cddc72f8d8940c613283b0a3b2976d7025.tar.bz2 nixpkgs-ec7865cddc72f8d8940c613283b0a3b2976d7025.tar.lz nixpkgs-ec7865cddc72f8d8940c613283b0a3b2976d7025.tar.xz nixpkgs-ec7865cddc72f8d8940c613283b0a3b2976d7025.tar.zst nixpkgs-ec7865cddc72f8d8940c613283b0a3b2976d7025.zip |
compcert: 3.2 -> 3.3 (#44512)
Diffstat (limited to 'pkgs/development/compilers/compcert')
-rw-r--r-- | pkgs/development/compilers/compcert/default.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix index 51392e23d8c..631179c483b 100644 --- a/pkgs/development/compilers/compcert/default.nix +++ b/pkgs/development/compilers/compcert/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl +{ stdenv, lib, fetchurl, fetchpatch , coq, ocamlPackages , tools ? stdenv.cc }: @@ -7,11 +7,11 @@ assert lib.versionAtLeast ocamlPackages.ocaml.version "4.02"; stdenv.mkDerivation rec { name = "compcert-${version}"; - version = "3.2"; + version = "3.3"; src = fetchurl { url = "http://compcert.inria.fr/release/${name}.tgz"; - sha256 = "11q4121s0rxva63njjwya7syfx9w0p4hzr6avh8s57vfbrcakc93"; + sha256 = "16xrqcwak1v1fk5ndx6jf1yvxv3adsr7p7z34gfm2mpggxnq0xwn"; }; buildInputs = [ coq ] @@ -19,9 +19,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - postPatch = '' - sed -i -e 's/8\.6\.1|8\.7\.0|8\.7\.1)/8.6.1|8.7.0|8.7.1|8.7.2)/' configure - ''; + patches = [ (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/679ecfeaa24c0615fa1999e9582bf2af6a9f35e7.patch"; + sha256 = "04yrn6dp57aw6lmlr4yssjlx9cxix0mlmaw7gfhwyz5bzqc2za1a"; + })]; configurePhase = '' substituteInPlace ./configure --replace '{toolprefix}gcc' '{toolprefix}cc' |