From ae24e3e528c90aee944c5ca23fab715d72d6b1f2 Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Mon, 28 Aug 2023 17:19:53 +0200 Subject: Add a few packages for Coq 8.18 and MathComp 2.0 --- pkgs/development/coq-modules/fourcolor/default.nix | 4 +++- pkgs/development/coq-modules/mathcomp-finmap/default.nix | 6 ++++-- pkgs/development/coq-modules/mathcomp-tarjan/default.nix | 10 +++++++--- pkgs/development/coq-modules/mathcomp-zify/default.nix | 6 ++++-- pkgs/development/coq-modules/mathcomp/default.nix | 4 ++-- pkgs/development/coq-modules/multinomials/default.nix | 6 ++++-- 6 files changed, 24 insertions(+), 12 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/coq-modules/fourcolor/default.nix b/pkgs/development/coq-modules/fourcolor/default.nix index 6548da52b9f7c..195b73dea6fe6 100644 --- a/pkgs/development/coq-modules/fourcolor/default.nix +++ b/pkgs/development/coq-modules/fourcolor/default.nix @@ -9,10 +9,12 @@ mkCoqDerivation { release."1.2.3".sha256 = "sha256-gwKfUa74fIP7j+2eQgnLD7AswjCtOFGHGaIWb4qI0n4="; release."1.2.4".sha256 = "sha256-iSW2O1kuunvOqTolmGGXmsYTxo2MJYCdW3BnEhp6Ksg="; release."1.2.5".sha256 = "sha256-3qOPNCRjGK2UdHGMSqElpIXhAPVCklpeQgZwf9AFals="; + release."1.3.0".sha256 = "sha256-h9pa6vaKT6jCEaIdEdcu0498Ou5kEXtZdb9P7WXK1DQ="; inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (isGe "8.11") (isGe "1.12") ]; out = "1.2.5"; } + { cases = [ (isGe "8.16") (isGe "2.0") ]; out = "1.3.0"; } + { cases = [ (isGe "8.11") (range "1.12" "1.17") ]; out = "1.2.5"; } { cases = [ (isGe "8.11") (range "1.11" "1.14") ]; out = "1.2.4"; } { cases = [ (isLe "8.13") (lib.pred.inter (isGe "1.11.0") (isLt "1.13")) ]; out = "1.2.3"; } ] null; diff --git a/pkgs/development/coq-modules/mathcomp-finmap/default.nix b/pkgs/development/coq-modules/mathcomp-finmap/default.nix index 77aa0d8175e72..234d25f909b22 100644 --- a/pkgs/development/coq-modules/mathcomp-finmap/default.nix +++ b/pkgs/development/coq-modules/mathcomp-finmap/default.nix @@ -7,8 +7,9 @@ mkCoqDerivation { owner = "math-comp"; inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.13" "8.18") (isGe "1.12") ]; out = "1.5.2"; } - { cases = [ (isGe "8.10") (isGe "1.11") ]; out = "1.5.1"; } + { cases = [ (range "8.16" "8.18") (isGe "2.0") ]; out = "2.0.0"; } + { cases = [ (range "8.13" "8.18") (range "1.12" "1.17") ]; out = "1.5.2"; } + { cases = [ (isGe "8.10") (range "1.11" "1.17") ]; out = "1.5.1"; } { cases = [ (range "8.7" "8.11") "1.11.0" ]; out = "1.5.0"; } { cases = [ (isEq "8.11") (range "1.8" "1.10") ]; out = "1.4.0+coq-8.11"; } { cases = [ (range "8.7" "8.11.0") (range "1.8" "1.10") ]; out = "1.4.0"; } @@ -17,6 +18,7 @@ mkCoqDerivation { { cases = [ (range "8.6" "8.7") (range "1.6.1" "1.7") ]; out = "1.0.0"; } ] null; release = { + "2.0.0".sha256 = "sha256-0Wr1ZUYVuZH74vawO4EZlZ+K3kq+s1xEz/BfzyKj+wk="; "1.5.2".sha256 = "sha256-0KmmSjc2AlUo6BKr9RZ4FjL9wlGISlTGU0X1Eu7l4sw="; "1.5.1".sha256 = "0ryfml4pf1dfya16d8ma80favasmrygvspvb923n06kfw9v986j7"; "1.5.0".sha256 = "0vx9n1fi23592b3hv5p5ycy7mxc8qh1y5q05aksfwbzkk5zjkwnq"; diff --git a/pkgs/development/coq-modules/mathcomp-tarjan/default.nix b/pkgs/development/coq-modules/mathcomp-tarjan/default.nix index 19ecfcc384de7..146898ca86d93 100644 --- a/pkgs/development/coq-modules/mathcomp-tarjan/default.nix +++ b/pkgs/development/coq-modules/mathcomp-tarjan/default.nix @@ -9,9 +9,13 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; - lib.switch [ coq.version mathcomp-ssreflect.version ] [{ - cases = [ (range "8.10" "8.16") (isGe "1.12.0") ]; out = "1.0.0"; - }] null; + lib.switch [ coq.version mathcomp-ssreflect.version ] [ + { cases = [ (range "8.16" "8.18") (isGe "2.0.0") ]; out = "1.0.2"; } + { cases = [ (range "8.12" "8.18") (range "1.12.0" "1.17.0") ]; out = "1.0.1"; } + { cases = [ (range "8.10" "8.16") (range "1.12.0" "1.17.0") ]; out = "1.0.0"; } + ] null; + release."1.0.2".sha256 = "sha256-U20xgA+e9KTRdvILD1cxN6ia+dlA8uBTIbc4QlKz9ss="; + release."1.0.1".sha256 = "sha256-utNjFCAqC5xOuhdyKhfMZkRYJD0xv9Gt6U3ZdQ56mek="; release."1.0.0".sha256 = "sha256:0r459r0makshzwlygw6kd4lpvdjc43b3x5y9aa8x77f2z5gymjq1"; propagatedBuildInputs = [ mathcomp-ssreflect mathcomp-fingroup ]; diff --git a/pkgs/development/coq-modules/mathcomp-zify/default.nix b/pkgs/development/coq-modules/mathcomp-zify/default.nix index 21eff20c086aa..bbb94420ab465 100644 --- a/pkgs/development/coq-modules/mathcomp-zify/default.nix +++ b/pkgs/development/coq-modules/mathcomp-zify/default.nix @@ -9,13 +9,15 @@ mkCoqDerivation rec { defaultVersion = with lib.versions; lib.switch [ coq.coq-version mathcomp-algebra.version ] [ - { cases = [ (range "8.13" "8.18") (isGe "1.12") ]; out = "1.3.0+1.12+8.13"; } - { cases = [ (range "8.13" "8.16") (isGe "1.12") ]; out = "1.1.0+1.12+8.13"; } + { cases = [ (range "8.16" "8.18") (isGe "2.0.0") ]; out = "1.5.0+2.0+8.16"; } + { cases = [ (range "8.13" "8.18") (range "1.12" "1.17.0") ]; out = "1.3.0+1.12+8.13"; } + { cases = [ (range "8.13" "8.16") (range "1.12" "1.17.0") ]; out = "1.1.0+1.12+8.13"; } ] null; release."1.0.0+1.12+8.13".sha256 = "1j533vx6lacr89bj1bf15l1a0s7rvrx4l00wyjv99aczkfbz6h6k"; release."1.1.0+1.12+8.13".sha256 = "1plf4v6q5j7wvmd5gsqlpiy0vwlw6hy5daq2x42gqny23w9mi2pr"; release."1.3.0+1.12+8.13".sha256 = "sha256-ebfY8HatP4te44M6o84DSLpDCkMu4IroPCy+HqzOnTE="; + release."1.5.0+2.0+8.16".sha256 = "sha256-boBYGvXdGFc6aPnjgSZYSoW4kmN5khtNrSV3DUv9DqM="; propagatedBuildInputs = [ mathcomp-algebra mathcomp-ssreflect mathcomp-fingroup ]; diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index 3805089425d13..6adcb3af7d543 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -20,8 +20,8 @@ let withDoc = single && (args.withDoc or false); defaultVersion = with versions; lib.switch coq.coq-version [ { case = isGe "8.15"; out = "1.17.0"; } - { case = range "8.16" "8.17"; out = "2.0.0"; } - { case = range "8.13" "8.17"; out = "1.16.0"; } + { case = range "8.16" "8.18"; out = "2.0.0"; } + { case = range "8.13" "8.18"; out = "1.16.0"; } { case = range "8.14" "8.16"; out = "1.15.0"; } { case = range "8.11" "8.15"; out = "1.14.0"; } { case = range "8.11" "8.15"; out = "1.13.0"; } diff --git a/pkgs/development/coq-modules/multinomials/default.nix b/pkgs/development/coq-modules/multinomials/default.nix index 8f7c9d462ea59..b11283e8c5873 100644 --- a/pkgs/development/coq-modules/multinomials/default.nix +++ b/pkgs/development/coq-modules/multinomials/default.nix @@ -9,8 +9,9 @@ inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (isGe "8.15") (isGe "1.15.0") ]; out = "1.6.0"; } - { cases = [ (isGe "8.10") (isGe "1.13.0") ]; out = "1.5.6"; } + { cases = [ (isGe "8.16") (isGe "2.0.0") ]; out = "2.0.0"; } + { cases = [ (isGe "8.15") (range "1.15.0" "1.17.0") ]; out = "1.6.0"; } + { cases = [ (isGe "8.10") (range "1.13.0" "1.17.0") ]; out = "1.5.6"; } { cases = [ (range "8.10" "8.16") (range "1.12.0" "1.15.0") ]; out = "1.5.5"; } { cases = [ (range "8.10" "8.12") "1.12.0" ]; out = "1.5.3"; } { cases = [ (range "8.7" "8.12") "1.11.0" ]; out = "1.5.2"; } @@ -19,6 +20,7 @@ { cases = [ "8.6" (range "1.6" "1.7") ]; out = "1.1"; } ] null; release = { + "2.0.0".sha256 = "sha256-2zWHzMBsO2j8EjN7CgCmKQcku9Be8aVlme0LD5p4ab8="; "1.6.0".sha256 = "sha256-lEM+sjqajIOm1c3lspHqcSIARgMR9RHbTQH4veHLJfU="; "1.5.6".sha256 = "sha256-cMixgc34T9Ic6v+tYmL49QUNpZpPV5ofaNuHqblX6oY="; "1.5.5".sha256 = "sha256-VdXA51vr7DZl/wT/15YYMywdD7Gh91dMP9t7ij47qNQ="; -- cgit 1.4.1