compcert: 3.8 → 3.9

pkgs/development/compilers/compcert/default.nix

@@ -1,7 +1,7 @@
 { lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper
 , coqPackages, ocamlPackages, coq2html
 , tools ? stdenv.cc
-, version ? "3.8"
+, version ? "3.9"
 }:
 
 let
@@ -56,6 +56,10 @@ let param = {
     ];
     useExternalFlocq = true;
   };
+  "3.9" = {
+    sha256 = "1srcz2dqrvmbvv5cl66r34zqkm0hsbryk7gd3i9xx4slahc9zvdb";
+    useExternalFlocq = true;
+  };
 }."${version}"; in
 
 stdenv.mkDerivation rec {
@@ -78,6 +82,7 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace ./configure \
+      --replace \$\{toolprefix\}ar 'ar' \
       --replace '{toolprefix}gcc' '{toolprefix}cc'
   '';
 

pkgs/top-level/coq-packages.nix

@@ -80,7 +80,7 @@ let
       VST = callPackage ../development/coq-modules/VST (with lib.versions;
         lib.switch coq.coq-version [
           { case = "8.11"; out = { compcert = compcert.override { coqPackages = self; version = "3.7"; }; }; }
-          { case = range "8.12" "8.13"; out = { compcert = compcert.override { coqPackages = self; }; }; }
+          { case = range "8.12" "8.13"; out = { compcert = compcert.override { coqPackages = self; version = "3.8"; }; }; }
         ] {});
       zorns-lemma = callPackage ../development/coq-modules/zorns-lemma {};
       filterPackages = doesFilter: if doesFilter then filterCoqPackages self else self;