From 2ad9b5d4f67bc0f07780b4fc80c11938fc2938b3 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 20 Nov 2023 08:53:40 +0100 Subject: coqPackages.VST: 2.12 → 2.13 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit coqPackages.compcert: 3.13 → 3.13.1 (cherry picked from commit 208fecaf03db2b6aaf0f5c6882e314d520b780e2) --- pkgs/development/coq-modules/VST/default.nix | 3 ++- pkgs/development/coq-modules/compcert/default.nix | 3 ++- pkgs/top-level/coq-packages.nix | 3 +-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/coq-modules/VST/default.nix b/pkgs/development/coq-modules/VST/default.nix index 150148cfe00d3..178db27c63793 100644 --- a/pkgs/development/coq-modules/VST/default.nix +++ b/pkgs/development/coq-modules/VST/default.nix @@ -23,11 +23,12 @@ mkCoqDerivation { repo = "VST"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.15" "8.17"; out = "2.12"; } + { case = range "8.15" "8.17"; out = "2.13"; } { 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.13".sha256 = "sha256-i6rvP3cpayBln5KHZOpeNfraYU5h0O9uciBQ4jRH4XA="; release."2.12".sha256 = "sha256-4HL0U4HA5/usKNXC0Dis1UZY/Hb/LRd2IGOrqrvdWkw="; release."2.11.1".sha256 = "sha256-unpNstZBnRT4dIqAYOv9n1J0tWJMeRuaaa2RG1U0Xs0="; release."2.10".sha256 = "sha256-RIxfPWoHnV1CFkpxCusoGY/LIk07TgC7wWGRP4BSq8w="; diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix index 4e25aeaec2e79..00b0bf49a39ea 100644 --- a/pkgs/development/coq-modules/compcert/default.nix +++ b/pkgs/development/coq-modules/compcert/default.nix @@ -27,7 +27,7 @@ compcert = mkCoqDerivation { releaseRev = v: "v${v}"; defaultVersion = with lib.versions; lib.switch coq.version [ - { case = range "8.14" "8.17"; out = "3.13"; } + { case = range "8.14" "8.17"; out = "3.13.1"; } { case = isEq "8.13" ; out = "3.10"; } { case = isEq "8.12" ; out = "3.9"; } { case = range "8.8" "8.11"; out = "3.8"; } @@ -40,6 +40,7 @@ compcert = mkCoqDerivation { "3.11".sha256 = "sha256-ZISs/ZAJVWtxp9+Sg5qV5Rss1gI9hK769GnBfawLa6A="; "3.12".sha256 = "sha256-hXkQ8UnAx3k50OJGBmSm4hgrnRFCosu4+PEMrcKfmV0="; "3.13".sha256 = "sha256-ZedxgEPr1ZgKIcyhQ6zD1l2xr6RDNNUYq/4ZyR6ojM4="; + "3.13.1".sha256 = "sha256-ldXbuzVB0Z+UVTd5S4yGSg6oRYiKbXLMmUZcQsJLcns="; }; strictDeps = true; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 7c72f34fdbefd..cf3817a3d7e46 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -128,8 +128,7 @@ let (lib.versionAtLeast self.coq.version "8.14") { 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 = range "8.15" "8.17"; out = "3.13.1"; } { case = isEq "8.14"; out = "3.11"; } ] null; }; -- cgit 1.4.1