Commit 42bea51a authored by Vincent Laporte's avatar Vincent Laporte Committed by Vincent Laporte
Browse files

coqPackages.VST: 2.11.1 → 2.12

parent c6834335

pkgs/development/coq-modules/VST/default.nix

+3 −2
Original line number Diff line number Diff line
@@ -23,11 +23,12 @@ mkCoqDerivation { 
  repo = "VST";

  inherit version;

  defaultVersion = with lib.versions; lib.switch coq.coq-version [

    { case = range "8.15" "8.16"; out = "2.11.1"; }

    { case = range "8.15" "8.17"; out = "2.12"; }

    { case = range "8.14" "8.16"; out = "2.10"; }

    { case = range "8.13" "8.15"; out = "2.9"; }

    { case = range "8.12" "8.13"; out = "2.8"; }

  ] null;

  release."2.12".sha256 = "sha256-4HL0U4HA5/usKNXC0Dis1UZY/Hb/LRd2IGOrqrvdWkw=";

  release."2.11.1".sha256 = "sha256-unpNstZBnRT4dIqAYOv9n1J0tWJMeRuaaa2RG1U0Xs0=";

  release."2.10".sha256 = "sha256-RIxfPWoHnV1CFkpxCusoGY/LIk07TgC7wWGRP4BSq8w=";

  release."2.9".sha256 = "sha256:1adwzbl1pprrrwrm7cm493098fizxanxpv7nyfbvwdhgbhcnv6qf";
@@ -39,7 +40,7 @@ mkCoqDerivation { 
  preConfigure = ''

    patchShebangs util

    substituteInPlace Makefile \

      --replace 'COQVERSION= ' 'COQVERSION= 8.16.1 or-else 8.16.0 or-else 8.15.2 or-else 8.15.1 or-else '\

      --replace 'COQVERSION= ' 'COQVERSION= 8.17.1 or-else 8.16.1 or-else 8.16.0 or-else 8.15.2 or-else 8.15.1 or-else '\

      --replace 'FLOYD_FILES=' 'FLOYD_FILES= ${toString extra_floyd_files}'

  '';

pkgs/top-level/coq-packages.nix

+7 −1
Original line number Diff line number Diff line
@@ -125,7 +125,13 @@ let 
      Verdi = callPackage ../development/coq-modules/Verdi {};

      VST = callPackage ../development/coq-modules/VST ((lib.optionalAttrs

        (lib.versionAtLeast self.coq.version "8.14") {

          compcert = self.compcert.override { version = "3.11"; };

          compcert = self.compcert.override {

            version = with lib.versions; lib.switch self.coq.version [

              { case = isEq "8.17"; out = "3.13"; }

              { case = range "8.15" "8.16"; out = "3.12"; }

              { case = isEq "8.14"; out = "3.11"; }

            ] null;

          };

        }) // (lib.optionalAttrs (lib.versions.isEq self.coq.coq-version "8.13") {

          ITree = self.ITree.override {

            version = "4.0.0";