Skip to content

Commit 9dd967e

Browse files
authored
Merge pull request #356 from proux01/missing_join_message
Missing join message
2 parents 0fd71cf + 08dfc99 commit 9dd967e

File tree

13 files changed

+2124
-2559
lines changed

13 files changed

+2124
-2559
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ jobs:
1919
coq_version:
2020
- '8.15'
2121
- '8.16'
22+
- '8.17'
2223
steps:
2324
- uses: actions/checkout@v2
2425
- uses: coq-community/docker-coq-action@v1

.github/workflows/nix-action-coq-8.15.yml

Lines changed: 112 additions & 95 deletions
Large diffs are not rendered by default.

.github/workflows/nix-action-coq-8.16.yml

Lines changed: 1458 additions & 83 deletions
Large diffs are not rendered by default.

.github/workflows/nix-action-coq-mcHB-8.15.yml renamed to .github/workflows/nix-action-coq-8.17.yml

Lines changed: 521 additions & 638 deletions
Large diffs are not rendered by default.

.github/workflows/nix-action-coq-mcHB-8.16.yml

Lines changed: 0 additions & 1580 deletions
This file was deleted.

.nix/config.nix

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
{
22
format = "1.0.0";
33
attribute = "hierarchy-builder";
4-
default-bundle = "coq-8.15";
4+
default-bundle = "coq-8.16";
55
bundles = let
66
mcHBcommon = {
77
mathcomp.override.version = "hierarchy-builder";
88
mathcomp.job = true;
99
mathcomp-single.job = true;
1010
hierarchy-builder-shim.job = true;
1111
mathcomp-single-planB-src.job = true;
12-
mathcomp-single-planB.job = true;
1312
graph-theory.job = false;
1413
fourcolor.override.version = "master";
15-
odd-order.override.version = "hirarchy-builder";
16-
mathcomp-finmap.override.version = "proux01:hierarchy-builder";
17-
mathcomp.analyis.override.version = "#694";
14+
odd-order.override.version = "master";
15+
mathcomp-finmap.override.version = "master";
16+
mathcomp.analyis.override.version = "hierarchy-builder";
17+
interval.override.version = "master";
18+
reglang.override.version = "hierarchy-builder";
19+
coq-bits.override.version = "hierarchy-builder";
20+
deriving.job = false;
1821
};
1922
in {
20-
"coq-mcHB-8.16".coqPackages = {
21-
coq.override.version = "8.16";
22-
mathcomp-analysis.override.version = "coq816";
23-
} // mcHBcommon;
24-
25-
"coq-mcHB-8.15".coqPackages = {
26-
coq.override.version = "8.15";
23+
"coq-8.17".coqPackages = {
24+
coq.override.version = "8.17";
2725
} // mcHBcommon;
2826

2927
"coq-8.16".coqPackages = {
3028
coq.override.version = "8.16";
31-
mathcomp.override.version = "mathcomp-1.15.0";
32-
};
29+
} // mcHBcommon;
30+
3331
"coq-8.15".coqPackages = {
3432
coq.override.version = "8.15";
33+
mathcomp.job = false;
34+
mathcomp-infotheo.job = false;
3535
};
3636
};
3737
cachix.coq = {};

.nix/coq-nix-toolbox.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
"4f0eb194b37b6e0db28be2eb4643bd6924abf7ab"
1+
"721d4a5e7a4db115f7576828c354d62a84d7055b"

.nix/coq-overlays/mathcomp-single-planB/default.nix

Lines changed: 0 additions & 11 deletions
This file was deleted.
Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
1-
{ mathcomp, coq-elpi, hierarchy-builder, version ? null }:
2-
(mathcomp.override {single = true;}).overrideAttrs (old: {
3-
propagatedBuildInputs = old.propagatedBuildInputs ++
4-
[ coq-elpi hierarchy-builder ];
5-
})
1+
{ mathcomp, version ? null }:
2+
mathcomp.override {single = true; inherit version;}

.nix/coq-overlays/mathcomp/default.nix

Lines changed: 0 additions & 121 deletions
This file was deleted.

0 commit comments

Comments
 (0)