pyrox.dev / nixpkgs
lol
fork atom

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

authored by

Vincent Laporte and committed by
Vincent Laporte 5b861824 94ebf717

+5 -3
unified split
+2 -1
pkgs/development/coq-modules/compcert/default.nix
··· 16 17 defaultVersion = with versions; switch coq.version [ 18 { case = range "8.8" "8.11"; out = "3.8"; } 19 - { case = range "8.12" "8.13"; out = "3.9"; } 20 ] null; 21 22 release = { 23 "3.8".sha256 = "1gzlyxvw64ca12qql3wnq3bidcx9ygsklv9grjma3ib4hvg7vnr7"; 24 "3.9".sha256 = "1srcz2dqrvmbvv5cl66r34zqkm0hsbryk7gd3i9xx4slahc9zvdb"; 25 }; 26 27 nativeBuildInputs = [ makeWrapper ];
··· 16 17 defaultVersion = with versions; switch coq.version [ 18 { case = range "8.8" "8.11"; out = "3.8"; } 19 + { case = range "8.12" "8.14"; out = "3.10"; } 20 ] null; 21 22 release = { 23 "3.8".sha256 = "1gzlyxvw64ca12qql3wnq3bidcx9ygsklv9grjma3ib4hvg7vnr7"; 24 "3.9".sha256 = "1srcz2dqrvmbvv5cl66r34zqkm0hsbryk7gd3i9xx4slahc9zvdb"; 25 + "3.10".sha256 = "sha256:19rmx8r8v46101ij5myfrz60arqjy7q3ra3fb8mxqqi3c8c4l4j6"; 26 }; 27 28 nativeBuildInputs = [ makeWrapper ];
+3 -2
pkgs/top-level/coq-packages.nix
··· 24 Cheerios = callPackage ../development/coq-modules/Cheerios {}; 25 CoLoR = callPackage ../development/coq-modules/CoLoR {}; 26 compcert = callPackage ../development/coq-modules/compcert { 27 - ocamlPackages = ocamlPackages_4_05; 28 inherit fetchpatch makeWrapper coq2html lib stdenv; 29 }; 30 coq-bits = callPackage ../development/coq-modules/coq-bits {}; ··· 96 topology = callPackage ../development/coq-modules/topology {}; 97 Velisarios = callPackage ../development/coq-modules/Velisarios {}; 98 Verdi = callPackage ../development/coq-modules/Verdi {}; 99 - VST = callPackage ../development/coq-modules/VST {}; 100 zorns-lemma = callPackage ../development/coq-modules/zorns-lemma {}; 101 filterPackages = doesFilter: if doesFilter then filterCoqPackages self else self; 102 };
··· 24 Cheerios = callPackage ../development/coq-modules/Cheerios {}; 25 CoLoR = callPackage ../development/coq-modules/CoLoR {}; 26 compcert = callPackage ../development/coq-modules/compcert { 27 inherit fetchpatch makeWrapper coq2html lib stdenv; 28 }; 29 coq-bits = callPackage ../development/coq-modules/coq-bits {}; ··· 95 topology = callPackage ../development/coq-modules/topology {}; 96 Velisarios = callPackage ../development/coq-modules/Velisarios {}; 97 Verdi = callPackage ../development/coq-modules/Verdi {}; 98 + VST = callPackage ../development/coq-modules/VST { 99 + compcert = self.compcert.override { version = "3.9"; }; 100 + }; 101 zorns-lemma = callPackage ../development/coq-modules/zorns-lemma {}; 102 filterPackages = doesFilter: if doesFilter then filterCoqPackages self else self; 103 };