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 10:33:09 +0100 |
| commit | 05bcb2956426e1c8547ab065d0ec93b90520d10c (patch) | |
| tree | 558c924cdc15be233d2cd36ce5adddde7a184b49 | |
| parent | Merge pull request #147740 from NixOS/backport-144253-to-release-21.11 (diff) | |
| download | nixpkgs-05bcb2956426e1c8547ab065d0ec93b90520d10c.tar.gz | |
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
(cherry picked from commit fa22c7cda37ad4c1fd7056e0b86d03b273699277)
| -rw-r--r-- | pkgs/development/coq-modules/compcert/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/coq-packages.nix | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix index 3b94a8087d3f..253b710048d4 100644 --- a/pkgs/development/coq-modules/compcert/default.nix +++ b/pkgs/development/coq-modules/compcert/default.nix @@ -16,12 +16,13 @@ let compcert = mkCoqDerivation rec { defaultVersion = with versions; switch coq.version [ { case = range "8.8" "8.11"; out = "3.8"; } - { case = range "8.12" "8.13"; out = "3.9"; } + { case = range "8.12" "8.14"; out = "3.10"; } ] null; release = { "3.8".sha256 = "1gzlyxvw64ca12qql3wnq3bidcx9ygsklv9grjma3ib4hvg7vnr7"; "3.9".sha256 = "1srcz2dqrvmbvv5cl66r34zqkm0hsbryk7gd3i9xx4slahc9zvdb"; + "3.10".sha256 = "sha256:19rmx8r8v46101ij5myfrz60arqjy7q3ra3fb8mxqqi3c8c4l4j6"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index bf5b65f93885..38599e3646cc 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 {}; @@ -95,7 +94,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; }; |