diff options
author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2021-11-22 07:38:45 +0100 |
---|---|---|
committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2021-11-29 08:45:34 +0100 |
commit | 5b861824b3fad451955ff373ebdb6af2175a85e4 (patch) | |
tree | 053eaf398bce73f527acbbd013144f97aa7d55c7 /pkgs/top-level/coq-packages.nix | |
parent | 94ebf717caf174cfc3b01409f2e6e11651a09194 (diff) |
compcert: 3.9 → 3.10
Enable for Coq 8.14 Use default version of OCaml (instead of 4.05) VST is not ready for CompCert 3.10, so it still uses 3.9
Diffstat (limited to 'pkgs/top-level/coq-packages.nix')
-rw-r--r-- | pkgs/top-level/coq-packages.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 16ecd67de2d9d..60d6265309bbc 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -24,7 +24,6 @@ let Cheerios = callPackage ../development/coq-modules/Cheerios {}; CoLoR = callPackage ../development/coq-modules/CoLoR {}; compcert = callPackage ../development/coq-modules/compcert { - ocamlPackages = ocamlPackages_4_05; inherit fetchpatch makeWrapper coq2html lib stdenv; }; coq-bits = callPackage ../development/coq-modules/coq-bits {}; @@ -96,7 +95,9 @@ let topology = callPackage ../development/coq-modules/topology {}; Velisarios = callPackage ../development/coq-modules/Velisarios {}; Verdi = callPackage ../development/coq-modules/Verdi {}; - VST = callPackage ../development/coq-modules/VST {}; + VST = callPackage ../development/coq-modules/VST { + compcert = self.compcert.override { version = "3.9"; }; + }; zorns-lemma = callPackage ../development/coq-modules/zorns-lemma {}; filterPackages = doesFilter: if doesFilter then filterCoqPackages self else self; }; |