lol

coqPackages.mathcomp*: update stdlib dependencies

authored by

Pierre Roux and committed by
Vincent Laporte
873cceaf 39d921ec

+20 -35
-2
pkgs/development/coq-modules/fourcolor/default.nix
··· 3 3 mkCoqDerivation, 4 4 coq, 5 5 mathcomp, 6 - stdlib, 7 6 version ? null, 8 7 }: 9 8 ··· 68 67 mathcomp.algebra 69 68 mathcomp.ssreflect 70 69 mathcomp.fingroup 71 - stdlib 72 70 ]; 73 71 74 72 meta = with lib; {
+1 -1
pkgs/development/coq-modules/hierarchy-builder/default.nix
··· 49 49 else 50 50 { installFlags = [ "VFILES=structures.v" ] ++ o.installFlags; }) 51 51 // 52 - lib.optionalAttrs (lib.versions.isLe "1.8.1" o.version) 52 + lib.optionalAttrs (o.version != null && o.version == "1.8.1") 53 53 { propagatedBuildInputs = o.propagatedBuildInputs ++ [ stdlib ]; } 54 54 )
+2
pkgs/development/coq-modules/jasmin/default.nix
··· 3 3 mkCoqDerivation, 4 4 coq, 5 5 mathcomp, 6 + mathcomp-algebra-tactics, 6 7 mathcomp-word, 7 8 version ? null, 8 9 }: ··· 23 24 release."2024.07.2".sha256 = "sha256-aF8SYY5jRxQ6iEr7t6mRN3BEmIDhJ53PGhuZiJGB+i8="; 24 25 25 26 propagatedBuildInputs = [ 27 + mathcomp-algebra-tactics 26 28 mathcomp-word 27 29 ]; 28 30
+12 -21
pkgs/development/coq-modules/mathcomp-analysis/default.nix
··· 5 5 mathcomp-finmap, 6 6 mathcomp-bigenough, 7 7 hierarchy-builder, 8 + stdlib, 8 9 single ? false, 9 10 coqPackages, 10 11 coq, ··· 176 177 ]; 177 178 intra-deps = lib.optionals (package != "single") (map mathcomp_ packages.${package}); 178 179 pkgpath = lib.switch package [ 179 - { 180 - case = "single"; 181 - out = "."; 182 - } 183 - { 184 - case = "analysis"; 185 - out = "theories"; 186 - } 187 - { 188 - case = "experimental-reals"; 189 - out = "experimental_reals"; 190 - } 191 - { 192 - case = "reals-stdlib"; 193 - out = "reals_stdlib"; 194 - } 195 - { 196 - case = "analysis-stdlib"; 197 - out = "analysis_stdlib"; 198 - } 180 + { case = "single"; out = "."; } 181 + { case = "analysis"; out = "theories"; } 182 + { case = "experimental-reals"; out = "experimental_reals"; } 183 + { case = "reals-stdlib"; out = "reals_stdlib"; } 184 + { case = "analysis-stdlib"; out = "analysis_stdlib"; } 199 185 ] package; 200 186 pname = if package == "single" then "mathcomp-analysis-single" else "mathcomp-${package}"; 201 187 derivation = mkCoqDerivation ({ ··· 226 212 ++ lib.optionals (lib.elem package [ 227 213 "analysis" 228 214 "single" 229 - ]) analysis-deps; 215 + ]) analysis-deps 216 + ++ lib.optional (lib.elem package [ 217 + "reals-stdlib" 218 + "analysis-stdlib" 219 + "single" 220 + ]) stdlib; 230 221 231 222 preBuild = '' 232 223 cd ${pkgpath}
+1 -2
pkgs/development/coq-modules/mathcomp-finmap/default.nix
··· 2 2 coq, 3 3 mkCoqDerivation, 4 4 mathcomp, 5 - stdlib, 6 5 lib, 7 6 version ? null, 8 7 }: ··· 108 107 "1.0.0".sha256 = "0sah7k9qm8sw17cgd02f0x84hki8vj8kdz7h15i7rmz08rj0whpa"; 109 108 }; 110 109 111 - propagatedBuildInputs = [ mathcomp.ssreflect stdlib ]; 110 + propagatedBuildInputs = [ mathcomp.ssreflect ]; 112 111 113 112 meta = { 114 113 description = "Finset and finmap library";
-2
pkgs/development/coq-modules/mathcomp-real-closed/default.nix
··· 3 3 mkCoqDerivation, 4 4 mathcomp, 5 5 mathcomp-bigenough, 6 - stdlib, 7 6 lib, 8 7 version ? null, 9 8 }: ··· 116 115 mathcomp.fingroup 117 116 mathcomp.solvable 118 117 mathcomp-bigenough 119 - stdlib 120 118 ]; 121 119 122 120 meta = {
-2
pkgs/development/coq-modules/mathcomp-tarjan/default.nix
··· 3 3 mkCoqDerivation, 4 4 mathcomp-ssreflect, 5 5 mathcomp-fingroup, 6 - stdlib, 7 6 lib, 8 7 version ? null, 9 8 }@args: ··· 53 52 propagatedBuildInputs = [ 54 53 mathcomp-ssreflect 55 54 mathcomp-fingroup 56 - stdlib 57 55 ]; 58 56 59 57 meta = {
+2
pkgs/development/coq-modules/mathcomp-word/default.nix
··· 3 3 coq, 4 4 mkCoqDerivation, 5 5 mathcomp, 6 + stdlib, 6 7 lib, 7 8 version ? null, 8 9 }: ··· 80 81 mathcomp.algebra 81 82 mathcomp.ssreflect 82 83 mathcomp.fingroup 84 + stdlib 83 85 ]; 84 86 85 87 meta = with lib; {
+2 -3
pkgs/development/coq-modules/mathcomp/default.nix
··· 80 80 mlPlugin = lib.versions.isLe "8.6" coq.coq-version; 81 81 nativeBuildInputs = lib.optionals withDoc [ graphviz lua ]; 82 82 buildInputs = [ ncurses ]; 83 - propagatedBuildInputs = [ stdlib ] ++ mathcomp-deps; 83 + propagatedBuildInputs = mathcomp-deps; 84 84 85 85 buildFlags = lib.optional withDoc "doc"; 86 86 ··· 144 144 } 145 145 ); 146 146 patched-derivation4 = patched-derivation3.overrideAttrs (o: 147 - lib.optionalAttrs (o.version != null 148 - && lib.versions.isLe "2.3.0" o.version) 147 + lib.optionalAttrs (o.version != null && o.version == "2.3.0") 149 148 { 150 149 propagatedBuildInputs = o.propagatedBuildInputs ++ [ stdlib ]; 151 150 }
-2
pkgs/development/coq-modules/odd-order/default.nix
··· 2 2 lib, 3 3 mkCoqDerivation, 4 4 mathcomp, 5 - stdlib, 6 5 version ? null, 7 6 }: 8 7 ··· 46 45 mathcomp.solvable 47 46 mathcomp.field 48 47 mathcomp.all 49 - stdlib 50 48 ]; 51 49 52 50 meta = with lib; {