git.iko.soy/typeable/nixpkgs
on master help sign in
coqPackages.mathcomp_1_10: init at 1.10.0
commit229dc013b37bf4a8ab18e210bd87f8f9d94275af authorVincent Laporte <Vincent.Laporte@gmail.com> dateTue 18 Feb 2020, 10:23 (7 years ago) parentb962b66
2 files changed+17−4
pkgs/development/coq-modules/mathcomp/default.nix+11−3 pkgs/top-level/coq-packages.nix+6−1
pkgs/development/coq-modules/mathcomp/default.nix+11−3
@@ -8,6 +8,7 @@ let
88 ####################################
99 # sha256 of released mathcomp versions
1010 mathcomp-sha256 = {
11+ "1.10.0" = "1b9m6pwxxyivw7rgx82gn5kmgv2mfv3h3y0mmjcjfypi8ydkrlbv";
1112 "1.9.0" = "0lid9zaazdi3d38l8042lczb02pw5m9wq0yysiilx891hgq2p81r";
1213 "1.8.0" = "07l40is389ih8bi525gpqs3qp4yb2kl11r9c8ynk1ifpjzpnabwp";
1314 "1.7.0" = "0wnhj9nqpx2bw6n1l4i8jgrw3pjajvckvj3lr4vzjb3my2lbxdd1";
@@ -15,6 +16,7 @@ let
1516 };
1617 # versions of coq compatible with released mathcomp versions
1718 mathcomp-coq-versions = {
19+ "1.10.0" = flip elem [ "8.7" "8.8" "8.9" "8.10" "8.11" ];
1820 "1.9.0" = flip elem ["8.7" "8.8" "8.9" "8.10"];
1921 "1.8.0" = flip elem ["8.7" "8.8" "8.9"];
2022 "1.7.0" = flip elem ["8.6" "8.7" "8.8" "8.9"];
@@ -24,7 +26,7 @@ let
2426 max-mathcomp-version = last (naturalSort (attrNames mathcomp-coq-versions));
2527 # mathcomp prefered version by decreasing order
2628 # (the first version in the list will be tried first)
27− mathcomp-version-preference = [ "1.8.0" "1.9.0" "1.7.0" "1.6.1" ];
29+ mathcomp-version-preference = [ "1.8.0" "1.9.0" "1.10.0" "1.7.0" "1.6.1" ];
2830
2931 ##############################################################
3032 # COMPUTED using the configuration above (edit with caution) #
@@ -133,6 +135,7 @@ getAttrOr = a: n: a.${n} or (throw a.error);
133135mathcompCorePkgs_1_7 = mathcompGen "1.7.0";
134136mathcompCorePkgs_1_8 = mathcompGen "1.8.0";
135137mathcompCorePkgs_1_9 = mathcompGen "1.9.0";
138+mathcompCorePkgs_1_10 = mathcompGen "1.10.0";
136139mathcompCorePkgs = recurseIntoAttrs
137140 (mapDerivationAttrset dontDistribute (mathcompGen default-mathcomp-version));
138141
@@ -143,6 +146,7 @@ inherit mathcompGenSingle;
143146mathcomp_1_7_single = getAttrOr (mathcompGenSingle "1.7.0") "single";
144147mathcomp_1_8_single = getAttrOr (mathcompGenSingle "1.8.0") "single";
145148mathcomp_1_9_single = getAttrOr (mathcompGenSingle "1.9.0") "single";
149+mathcomp_1_10_single = getAttrOr (mathcompGenSingle "1.10.0") "single";
146150mathcomp_single = dontDistribute
147151 (getAttrOr (mathcompGenSingle default-mathcomp-version) "single");
148152
@@ -151,13 +155,16 @@ mathcomp_single = dontDistribute
151155# each of these have a special attribute overrideMathcomp which
152156# must be used instead of overrideAttrs in order to also fix the dependencies
153157inherit mathcompGen mathcompCorePkgs
154− mathcompCorePkgs_1_7 mathcompCorePkgs_1_8 mathcompCorePkgs_1_9;
158+ mathcompCorePkgs_1_7 mathcompCorePkgs_1_8 mathcompCorePkgs_1_9
159+ mathcompCorePkgs_1_10
160+ ;
155161
156162
157163mathcomp = getAttrOr mathcompCorePkgs "all";
158164mathcomp_1_7 = getAttrOr mathcompCorePkgs_1_7 "all";
159165mathcomp_1_8 = getAttrOr mathcompCorePkgs_1_8 "all";
160166mathcomp_1_9 = getAttrOr mathcompCorePkgs_1_9 "all";
167+mathcomp_1_10 = getAttrOr mathcompCorePkgs_1_10 "all";
161168
162169ssreflect = getAttrOr mathcompCorePkgs "ssreflect";
163170
@@ -165,4 +172,5 @@ ssreflect = getAttrOr mathcompCorePkgs "ssreflect";
165172(mapAttrs' (n: pkg: {name = "mathcomp-${n}"; value = pkg;}) mathcompCorePkgs) //
166173(mapAttrs' (n: pkg: {name = "mathcomp-${n}_1_7"; value = pkg;}) mathcompCorePkgs_1_7) //
167174(mapAttrs' (n: pkg: {name = "mathcomp-${n}_1_8"; value = pkg;}) mathcompCorePkgs_1_8) //
168−(mapAttrs' (n: pkg: {name = "mathcomp-${n}_1_9"; value = pkg;}) mathcompCorePkgs_1_9)
175+(mapAttrs' (n: pkg: {name = "mathcomp-${n}_1_9"; value = pkg;}) mathcompCorePkgs_1_9) //
176+(mapAttrs' (n: pkg: {name = "mathcomp-${n}_1_10"; value = pkg;}) mathcompCorePkgs_1_10)
pkgs/top-level/coq-packages.nix+6−1
@@ -54,7 +54,12 @@ let
5454
5555 mathcompCorePkgs_1_9 mathcomp_1_9
5656 mathcomp-ssreflect_1_9 mathcomp-fingroup_1_9 mathcomp-algebra_1_9
57− mathcomp-solvable_1_9 mathcomp-field_1_9 mathcomp-character_1_9;
57+ mathcomp-solvable_1_9 mathcomp-field_1_9 mathcomp-character_1_9
58+
59+ mathcompCorePkgs_1_10 mathcomp_1_10
60+ mathcomp-ssreflect_1_10 mathcomp-fingroup_1_10 mathcomp-algebra_1_10
61+ mathcomp-solvable_1_10 mathcomp-field_1_10 mathcomp-character_1_10
62+ ;
5863 inherit (callPackage ../development/coq-modules/mathcomp/extra.nix { })
5964 mathcompExtraGen multinomials coqeal
6065