From 3370615a7f1ad927ace45e268b694a184d2ffd43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Thu, 21 Sep 2017 15:06:51 +0200 Subject: [PATCH] compcert: 3.0.1 -> 3.1 Note that the fix of the VERSION file can likely be removed at the next update. --- pkgs/development/compilers/compcert/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix index f519776b689..950c7f96b6f 100644 --- a/pkgs/development/compilers/compcert/default.nix +++ b/pkgs/development/compilers/compcert/default.nix @@ -7,11 +7,11 @@ assert lib.versionAtLeast ocamlPackages.ocaml.version "4.02"; stdenv.mkDerivation rec { name = "compcert-${version}"; - version = "3.0.1"; + version = "3.1"; src = fetchurl { url = "http://compcert.inria.fr/release/${name}.tgz"; - sha256 = "0dgrj26dzdy4n3s9b5hwc6lm54vans1v4qx9hdp1q8w1qqcdriq9"; + sha256 = "0irfwlw2chalp0g2gw0makc699hn3z37sha1a239p9d90mzx03cx"; }; buildInputs = [ coq ] @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; configurePhase = '' + substituteInPlace VERSION --replace '3.0.1' '3.1' substituteInPlace ./configure --replace '{toolprefix}gcc' '{toolprefix}cc' ./configure -clightgen -prefix $out -toolprefix ${tools}/bin/ '' + (if stdenv.isDarwin then "x86_64-macosx" else "x86_64-linux"); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 19a4432dfb8..f64d01562e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5341,10 +5341,7 @@ with pkgs; cmucl_binary = callPackage_i686 ../development/compilers/cmucl/binary.nix { }; - 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"; }; - }; + compcert = callPackage ../development/compilers/compcert { }; # Users installing via `nix-env` will likely be using the REPL,