Skip to content

Commit dd63870

Browse files
committed
nix ontop of rocq branch #18903
1 parent 54a3bae commit dd63870

File tree

1 file changed

+41
-34
lines changed

1 file changed

+41
-34
lines changed

.nix/config.nix

Lines changed: 41 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
with builtins; with (import <nixpkgs> {}).lib;
2-
let master = [
1+
with builtins;
2+
with (import <nixpkgs> { }).lib;
3+
let
4+
master = [
35
"coqeal"
46
"hierarchy-builder"
57
"mathcomp"
@@ -11,9 +13,10 @@ let master = [
1113
"multinomials"
1214
"odd-order"
1315
];
14-
common-bundles = listToAttrs (forEach master (p:
15-
{ name = p; value.override.version = "master"; }))
16-
// {
16+
common-bundles = listToAttrs (forEach master (p: {
17+
name = p;
18+
value.override.version = "master";
19+
})) // {
1720
coq-elpi-tests.job = true;
1821
stdlib.job = true;
1922
coq-elpi-tests-stdlib.job = true;
@@ -25,12 +28,12 @@ let master = [
2528

2629
deriving.job = false;
2730
reglang.job = false;
28-
}; in
29-
{
31+
};
32+
in {
3033
format = "1.0.0";
3134
attribute = "rocq-elpi";
3235
coq-attribute = "coq-elpi";
33-
default-bundle = "coq-8.20";
36+
default-bundle = "rocq-master";
3437
bundles = {
3538

3639
"coq-8.20".coqPackages = common-bundles // {
@@ -44,36 +47,40 @@ let master = [
4447
coq-elpi.override.elpi-version = "2.0.7";
4548
};
4649

47-
"coq-master" = { rocqPackages = {
48-
rocq-core.override.version = "master";
49-
rocq-elpi.override.elpi-version = "2.0.7";
50-
stdlib.override.version = "master";
51-
bignums.override.version = "master";
52-
}; coqPackages = common-bundles // {
53-
coq.override.version = "master";
54-
coq-elpi.override.elpi-version = "2.0.7";
55-
stdlib.override.version = "master";
56-
bignums.override.version = "master";
57-
}; };
58-
50+
"rocq-master" = {
51+
rocqPackages = {
52+
rocq-core.override.version = "#18903";
53+
rocq-elpi.override.elpi-version = "2.0.7";
54+
stdlib.override.version = "master";
55+
bignums.override.version = "master";
56+
};
57+
coqPackages = common-bundles // {
58+
coq.override.version = "#18903";
59+
coq-elpi.override.elpi-version = "2.0.7";
60+
stdlib.override.version = "master";
61+
bignums.override.version = "master";
62+
};
63+
};
64+
5965
/* uncomment bundle below if min and max elpi version start to differ
60-
"coq-master-min-elpi" = { rocqPackages = {
61-
rocq-core.override.version = "master";
62-
rocq-elpi.override.elpi-version = "2.0.7";
63-
stdlib.override.version = "master";
64-
bignums.override.version = "master";
65-
}; coqPackages = common-bundles // {
66-
coq.override.version = "master";
67-
coq-elpi.override.elpi-version = "2.0.7";
68-
stdlib.override.version = "master";
69-
bignums.override.version = "master";
70-
}; }; */
66+
"coq-master-min-elpi" = { rocqPackages = {
67+
rocq-core.override.version = "master";
68+
rocq-elpi.override.elpi-version = "2.0.7";
69+
stdlib.override.version = "master";
70+
bignums.override.version = "master";
71+
}; coqPackages = common-bundles // {
72+
coq.override.version = "master";
73+
coq-elpi.override.elpi-version = "2.0.7";
74+
stdlib.override.version = "master";
75+
bignums.override.version = "master";
76+
}; };
77+
*/
7178

7279
};
7380

74-
cachix.coq = {};
75-
cachix.math-comp = {};
76-
cachix.coq-community = {};
81+
cachix.coq = { };
82+
cachix.math-comp = { };
83+
cachix.coq-community = { };
7784
cachix.coq-elpi.authToken = "CACHIX_AUTH_TOKEN";
7885

7986
}

0 commit comments

Comments
 (0)