Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CI] Use new nicer override mechanism for ocamlPackages.elpi #743

Merged
merged 1 commit into from
Jan 18, 2025
Merged

[CI] Use new nicer override mechanism for ocamlPackages.elpi #743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 13 additions & 19 deletions .nix/config.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,30 +27,24 @@ let master = [
default-bundle = "coq-8.20";
bundles = {

"coq-8.20" = {
coqPackages = common-bundles // {
coq.override.version = "8.20";
};
# only way to override elpi version is in .nix/coq-overlays/coq-elpi/default.nix
"coq-8.20".coqPackages = common-bundles // {
coq.override.version = "8.20";
coq-elpi.override.elpi-version = "2.0.7";
};

"coq-master" = {
coqPackages = common-bundles // {
coq.override.version = "master";
stdlib.override.version = "master";
coqeal.job = false; # broken in master, c.f. https://github.com/coq/coq/pull/19228
};
ocamlPackages = { elpi.override.version = "2.0.7"; };
"coq-master".coqPackages = common-bundles // {
coq.override.version = "master";
coq-elpi.override.elpi-version = "2.0.7";
stdlib.override.version = "master";
coqeal.job = false; # broken in master, c.f. https://github.com/coq/coq/pull/19228
};

/* uncomment bundle below if min and max elpi version start to differ
"coq-master-min-elpi" = {
coqPackages = common-bundles // {
coq.override.version = "master";
stdlib.override.version = "master";
coqeal.job = false; # broken in master, c.f. https://github.com/coq/coq/pull/19228
};
ocamlPackages = { elpi.override.version = "2.0.7"; };
"coq-master-min-elpi"coqPackages = common-bundles // {
coq.override.version = "master";
coq-elpi.override.elpi-version = "2.0.7";
stdlib.override.version = "master";
coqeal.job = false; # broken in master, c.f. https://github.com/coq/coq/pull/19228
}; */

};
Expand Down
2 changes: 1 addition & 1 deletion .nix/coq-nix-toolbox.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"a24e6f4fb01d4ca0811dc8d16246cfe36b37ac52"
"82da08ded8f5b913ab813ab079a698eff6ab70e2"
186 changes: 0 additions & 186 deletions .nix/coq-overlays/coq-elpi/default.nix
View file
Open in desktop

This file was deleted.

Loading