diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2023-11-30 16:05:56 +0100 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2023-12-05 06:56:28 +0100 |
| commit | 6225a5106080e3c6e150315e0b55c190ccd5044c (patch) | |
| tree | 112a7f67de1c71c548b6a823be16e815166c598e | |
| parent | 24b80431bf18a3393879c88ae951200d753710f7 (diff) | |
| download | nixlib-6225a5106080e3c6e150315e0b55c190ccd5044c.tar nixlib-6225a5106080e3c6e150315e0b55c190ccd5044c.tar.gz nixlib-6225a5106080e3c6e150315e0b55c190ccd5044c.tar.bz2 nixlib-6225a5106080e3c6e150315e0b55c190ccd5044c.tar.lz nixlib-6225a5106080e3c6e150315e0b55c190ccd5044c.tar.xz nixlib-6225a5106080e3c6e150315e0b55c190ccd5044c.tar.zst nixlib-6225a5106080e3c6e150315e0b55c190ccd5044c.zip | |
coqPackages_8_16: fix evaluation with math-comp ≥ 2.0
Disable coq-bits, extructures, and gaia-hydra
| -rw-r--r-- | pkgs/development/coq-modules/coq-bits/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/coq-modules/extructures/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/coq-modules/gaia-hydras/default.nix | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/coq-modules/coq-bits/default.nix b/pkgs/development/coq-modules/coq-bits/default.nix index 16a26d9fa32e..ebc03a3a7306 100644 --- a/pkgs/development/coq-modules/coq-bits/default.nix +++ b/pkgs/development/coq-modules/coq-bits/default.nix @@ -1,18 +1,18 @@ -{ lib, mkCoqDerivation, coq, mathcomp-algebra, version ? null }: +{ lib, mkCoqDerivation, coq, mathcomp, version ? null }: mkCoqDerivation { pname = "coq-bits"; repo = "bits"; inherit version; - defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.10" "8.16"; out = "1.1.0"; } - { case = range "8.7" "8.15"; out = "1.0.0"; } + defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ + { cases = [ (range "8.10" "8.16") (isLt "2.0") ]; out = "1.1.0"; } + { cases = [ (range "8.7" "8.15") (isLt "2.0") ]; out = "1.0.0"; } ] null; release."1.1.0".sha256 = "sha256-TCw1kSXeW0ysIdLeNr+EGmpGumEE9i8tinEMp57UXaE="; release."1.0.0".sha256 = "0nv5mdgrd075dpd8bc7h0xc5i95v0pkm0bfyq5rj6ii1s54dwcjl"; - propagatedBuildInputs = [ mathcomp-algebra ]; + propagatedBuildInputs = [ mathcomp.algebra ]; meta = with lib; { description = "A formalization of bitset operations in Coq"; diff --git a/pkgs/development/coq-modules/extructures/default.nix b/pkgs/development/coq-modules/extructures/default.nix index bce21f0e6c62..15dd62fb7552 100644 --- a/pkgs/development/coq-modules/extructures/default.nix +++ b/pkgs/development/coq-modules/extructures/default.nix @@ -10,7 +10,7 @@ inherit version; defaultVersion = with lib.versions; lib.switch [coq.coq-version ssreflect.version] [ { cases = [(range "8.17" "8.18") (isGe "2.0.0") ]; out = "0.4.0"; } - { cases = [(range "8.11" "8.18") (isGe "1.12.0") ]; out = "0.3.1"; } + { cases = [(range "8.11" "8.18") (range "1.12.0" "1.18.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/gaia-hydras/default.nix b/pkgs/development/coq-modules/gaia-hydras/default.nix index 1e16adddf495..7152084854b6 100644 --- a/pkgs/development/coq-modules/gaia-hydras/default.nix +++ b/pkgs/development/coq-modules/gaia-hydras/default.nix @@ -12,8 +12,8 @@ mkCoqDerivation rec { inherit version; defaultVersion = with lib.versions; lib.switch [coq.coq-version mathcomp.version] [ - { cases = [ (range "8.13" "8.16") (isGe "1.12.0") ]; out = "0.9"; } - { cases = [ (range "8.13" "8.14") (isGe "1.12.0") ]; out = "0.5"; } + { cases = [ (range "8.13" "8.16") (range "1.12.0" "1.18.0") ]; out = "0.9"; } + { cases = [ (range "8.13" "8.14") (range "1.12.0" "1.18.0") ]; out = "0.5"; } ] null; propagatedBuildInputs = [ |