From c87714a0404511cb13a156ec8eda1b455fe754c1 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 5 Apr 2021 15:17:16 +0200 Subject: [PATCH] =?UTF-8?q?coqPackages.stdpp:=201.4.0=20=E2=86=92=201.5.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit coqPackages.iris: 3.3.0 → 3.4.0 --- pkgs/development/coq-modules/iris/default.nix | 6 +++++- pkgs/development/coq-modules/stdpp/default.nix | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/coq-modules/iris/default.nix b/pkgs/development/coq-modules/iris/default.nix index b46383fa167..d2d9870f320 100644 --- a/pkgs/development/coq-modules/iris/default.nix +++ b/pkgs/development/coq-modules/iris/default.nix @@ -5,7 +5,11 @@ with lib; mkCoqDerivation rec { domain = "gitlab.mpi-sws.org"; owner = "iris"; inherit version; - defaultVersion = if versions.range "8.9" "8.12" coq.coq-version then "3.3.0" else null; + defaultVersion = with versions; switch coq.coq-version [ + { case = isGe "8.11"; out = "3.4.0"; } + { case = range "8.9" "8.11"; out = "3.3.0"; } + ] null; + release."3.4.0".sha256 = "0vdc2mdqn5jjd6yz028c0c6blzrvpl0c7apx6xas7ll60136slrb"; release."3.3.0".sha256 = "0az4gkp5m8sq0p73dlh0r7ckkzhk7zkg5bndw01bdsy5ywj0vilp"; releaseRev = v: "iris-${v}"; diff --git a/pkgs/development/coq-modules/stdpp/default.nix b/pkgs/development/coq-modules/stdpp/default.nix index 2caafa9cc55..604a3f48f87 100644 --- a/pkgs/development/coq-modules/stdpp/default.nix +++ b/pkgs/development/coq-modules/stdpp/default.nix @@ -5,7 +5,11 @@ with lib; mkCoqDerivation rec { inherit version; domain = "gitlab.mpi-sws.org"; owner = "iris"; - defaultVersion = if versions.range "8.8" "8.12" coq.coq-version then "1.4.0" else null; + defaultVersion = with versions; switch coq.coq-version [ + { case = isGe "8.11"; out = "1.5.0"; } + { case = range "8.8" "8.11"; out = "1.4.0"; } + ] null; + release."1.5.0".sha256 = "1ym0fy620imah89p8b6rii8clx2vmnwcrbwxl3630h24k42092nf"; release."1.4.0".sha256 = "1m6c7ibwc99jd4cv14v3r327spnfvdf3x2mnq51f9rz99rffk68r"; releaseRev = v: "coq-stdpp-${v}";