git.iko.soy/typeable/nixpkgs
on master help sign in
coq_8_13: init at 8.13+β1
commitde8205f8bb2c6ca14730b00ba3a280db1d364b40 authorVincent Laporte <Vincent.Laporte@gmail.com> dateWed 9 Dec 2020, 08:32 (6 years ago) parent75b1ba9
5 files changed+16−2
pkgs/applications/science/logic/coq/default.nix+4−1 pkgs/development/coq-modules/bignums/default.nix+4 pkgs/development/coq-modules/mathcomp/default.nix+3−1 pkgs/top-level/all-packages.nix+1 pkgs/top-level/coq-packages.nix+4
pkgs/applications/science/logic/coq/default.nix+4−1
@@ -36,6 +36,7 @@ let
3636 "8.11.2" = "0f77ccyxdgbf1nrj5fa8qvrk1cyfy06fv8gj9kzfvlcgn0cf48sa";
3737 "8.12.0" = "18dc7k0piv6v064zgdadpw6mkkxk7j663hb3svgj5236fihjr0cz";
3838 "8.12.1" = "1rkcyjjrzcqw9xk93hsq0vvji4f8r5iq0f739mghk60bghkpnb7q";
39+ "8.13+beta1" = "1v4a6dpj41flspa4ihcr7m5ahqz10kbn62fmrldmv7gzq6jsyfyq";
3940 }.${version};
4041 coq-version = stdenv.lib.versions.majorMinor version;
4142 versionAtLeast = stdenv.lib.versionAtLeast coq-version;
@@ -118,7 +119,9 @@ self = stdenv.mkDerivation {
118119 then [ ocamlPackages.lablgtk3-sourceview3 glib gnome3.defaultIconTheme wrapGAppsHook ]
119120 else [ ocamlPackages.lablgtk ]);
120121
121− propagatedBuildInputs = stdenv.lib.optional (versionAtLeast "8.12") ocamlPackages.num;
122+ propagatedBuildInputs =
123+ stdenv.lib.optional (versionAtLeast "8.13") ocamlPackages.zarith
124+ ++ stdenv.lib.optional (coq-version == "8.12") ocamlPackages.num;
122125
123126 postPatch = ''
124127 UNAME=$(type -tp uname)
pkgs/development/coq-modules/bignums/default.nix+4
@@ -29,6 +29,10 @@ let params = {
2929 rev = "V8.12.0";
3030 sha256 = "14ijb3qy2hin3g4djx437jmnswxxq7lkfh3dwh9qvrds9a015yg8";
3131 };
32+ "8.13" = {
33+ rev = "V8.13.0";
34+ sha256 = "1n66i7hd9222b2ks606mak7m4f0dgy02xgygjskmmav6h7g2sx7y";
35+ };
3236 };
3337 param = params.${coq.coq-version};
3438in
pkgs/development/coq-modules/mathcomp/default.nix+3−1
@@ -66,6 +66,7 @@ let
6666 #######################################################################
6767 # sha256 of released mathcomp versions
6868 sha256 = {
69+ "1.12.0" = "1ccfny1vwgmdl91kz5xlmhq4wz078xm4z5wpd0jy5rn890dx03wp";
6970 "1.11.0" = "06a71d196wd5k4wg7khwqb7j7ifr7garhwkd54s86i0j7d6nhl3c";
7071 "1.11+beta1" = "12i3zznwajlihzpqsiqniv20rklj8d8401lhd241xy4s21fxkkjm";
7172 "1.10.0" = "1b9m6pwxxyivw7rgx82gn5kmgv2mfv3h3y0mmjcjfypi8ydkrlbv";
@@ -76,6 +77,7 @@ let
7677 };
7778 # versions of coq compatible with released mathcomp versions
7879 coq-versions = {
80+ "1.12.0" = flip elem [ "8.13" ];
7981 "1.11.0" = flip elem [ "8.7" "8.8" "8.9" "8.10" "8.11" "8.12" ];
8082 "1.11+beta1" = flip elem [ "8.7" "8.8" "8.9" "8.10" "8.11" "8.12" ];
8183 "1.10.0" = flip elem [ "8.7" "8.8" "8.9" "8.10" "8.11" ];
@@ -96,7 +98,7 @@ let
9698 # mathcomp preferred versions by decreasing order
9799 # (the first version in the list will be tried first)
98100 version-preferences =
99− [ "1.10.0" "1.11.0" "1.9.0" "1.8.0" "1.7.0" "1.6.1" ];
101+ [ "1.12.0" "1.10.0" "1.11.0" "1.9.0" "1.8.0" "1.7.0" "1.6.1" ];
100102
101103 # list of core mathcomp packages sorted by dependency order
102104 packages = _version: # unused in current versions of mathcomp
pkgs/top-level/all-packages.nix+1
@@ -26997,6 +26997,7 @@ in
2699726997 coqPackages_8_10 coq_8_10
2699826998 coqPackages_8_11 coq_8_11
2699926999 coqPackages_8_12 coq_8_12
27000+ coqPackages_8_13 coq_8_13
2700027001 coqPackages coq
2700127002 ;
2700227003
pkgs/top-level/coq-packages.nix+4
@@ -125,6 +125,9 @@ in rec {
125125 coq_8_12 = callPackage ../applications/science/logic/coq {
126126 version = "8.12.1";
127127 };
128+ coq_8_13 = callPackage ../applications/science/logic/coq {
129+ version = "8.13+beta1";
130+ };
128131
129132 coqPackages_8_5 = mkCoqPackages coq_8_5;
130133 coqPackages_8_6 = mkCoqPackages coq_8_6;
@@ -134,6 +137,7 @@ in rec {
134137 coqPackages_8_10 = mkCoqPackages coq_8_10;
135138 coqPackages_8_11 = mkCoqPackages coq_8_11;
136139 coqPackages_8_12 = mkCoqPackages coq_8_12;
140+ coqPackages_8_13 = mkCoqPackages coq_8_13;
137141 coqPackages = recurseIntoAttrs (lib.mapDerivationAttrset lib.dontDistribute
138142 coqPackages_8_11
139143 );