diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix index c2e6a5431c91..0bbcde784ac1 100644 --- a/pkgs/development/coq-modules/QuickChick/default.nix +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -6,7 +6,7 @@ let recent = lib.versions.isGe "8.7" coq.coq-version; in owner = "QuickChick"; inherit version; defaultVersion = with lib; with versions; lib.switch [ coq.coq-version ssreflect.version ] [ - { cases = [ (isGe "8.13") pred.true ]; out = "1.6.2"; } + { cases = [ (range "8.13" "8.15") pred.true ]; out = "1.6.2"; } { cases = [ "8.13" pred.true ]; out = "1.5.0"; } { cases = [ "8.12" pred.true ]; out = "1.4.0"; } { cases = [ "8.11" pred.true ]; out = "1.3.2"; } diff --git a/pkgs/development/coq-modules/autosubst/default.nix b/pkgs/development/coq-modules/autosubst/default.nix index a5f7cbb2f0b1..dac52eb3124a 100644 --- a/pkgs/development/coq-modules/autosubst/default.nix +++ b/pkgs/development/coq-modules/autosubst/default.nix @@ -9,7 +9,7 @@ mkCoqDerivation { inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = isGe "8.10"; out = "1.7"; } + { case = range "8.10" "8.15"; out = "1.7"; } ] null; propagatedBuildInputs = [ mathcomp-ssreflect ]; diff --git a/pkgs/development/coq-modules/coq-bits/default.nix b/pkgs/development/coq-modules/coq-bits/default.nix index f604db4ecdf7..4f284e7c9492 100644 --- a/pkgs/development/coq-modules/coq-bits/default.nix +++ b/pkgs/development/coq-modules/coq-bits/default.nix @@ -5,8 +5,8 @@ with lib; mkCoqDerivation { repo = "bits"; inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = isGe "8.10"; out = "1.1.0"; } - { case = isGe "8.7"; out = "1.0.0"; } + { case = range "8.10" "8.15"; out = "1.1.0"; } + { case = range "8.7" "8.15"; out = "1.0.0"; } ] null; release."1.1.0".sha256 = "sha256-TCw1kSXeW0ysIdLeNr+EGmpGumEE9i8tinEMp57UXaE="; diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix index 09dd65df41d2..e139eda77fae 100644 --- a/pkgs/development/coq-modules/coquelicot/default.nix +++ b/pkgs/development/coq-modules/coquelicot/default.nix @@ -7,7 +7,7 @@ with lib; mkCoqDerivation { domain = "gitlab.inria.fr"; inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = isGe "8.8" ; out = "3.2.0"; } + { case = range "8.8" "8.15"; out = "3.2.0"; } { case = range "8.8" "8.13"; out = "3.1.0"; } { case = range "8.5" "8.9"; out = "3.0.2"; } ] null; diff --git a/pkgs/development/coq-modules/extructures/default.nix b/pkgs/development/coq-modules/extructures/default.nix index 58c6caa9e6ff..9fd2fb0b8bd8 100644 --- a/pkgs/development/coq-modules/extructures/default.nix +++ b/pkgs/development/coq-modules/extructures/default.nix @@ -10,7 +10,7 @@ with lib; inherit version; defaultVersion = with versions; switch [coq.coq-version ssreflect.version] [ - { cases = [(isGe "8.11") (isGe "1.12.0") ]; out = "0.3.1"; } + { cases = [(range "8.11" "8.15") (isGe "1.12.0") ]; out = "0.3.1"; } { cases = [(range "8.11" "8.14") (isLe "1.12.0") ]; out = "0.3.0"; } { cases = [(range "8.10" "8.12") (isLe "1.12.0") ]; out = "0.2.2"; } ] null; diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix index 1a47478bda15..5aaa7b178b6e 100644 --- a/pkgs/development/coq-modules/interval/default.nix +++ b/pkgs/development/coq-modules/interval/default.nix @@ -7,7 +7,7 @@ mkCoqDerivation rec { domain = "gitlab.inria.fr"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = isGe "8.8"; out = "4.5.1"; } + { case = range "8.8" "8.15"; out = "4.5.1"; } { case = range "8.8" "8.12"; out = "4.0.0"; } { case = range "8.7" "8.11"; out = "3.4.2"; } { case = range "8.5" "8.6"; out = "3.3.0"; } diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index a19d8b8dcc79..a5cef76a6d7a 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -19,7 +19,7 @@ let owner = "math-comp"; withDoc = single && (args.withDoc or false); defaultVersion = with versions; switch coq.coq-version [ - { case = isGe "8.11"; out = "1.14.0"; } + { case = range "8.11" "8.15"; out = "1.14.0"; } { case = range "8.11" "8.15"; out = "1.13.0"; } { case = range "8.10" "8.13"; out = "1.12.0"; } { case = range "8.7" "8.12"; out = "1.11.0"; }