Skip to content

Universes clauses #841

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Universes clauses #841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54a3bae
Adapt to PR #18903
mattam82 May 27, 2024
dd63870
nix ontop of rocq branch #18903
CohenCyril Jun 26, 2025
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
75 changes: 41 additions & 34 deletions .nix/config.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
with builtins; with (import <nixpkgs> {}).lib;
let master = [
with builtins;
with (import <nixpkgs> { }).lib;
let
master = [
"coqeal"
"hierarchy-builder"
"mathcomp"
Expand All @@ -11,9 +13,10 @@ let master = [
"multinomials"
"odd-order"
];
common-bundles = listToAttrs (forEach master (p:
{ name = p; value.override.version = "master"; }))
// {
common-bundles = listToAttrs (forEach master (p: {
name = p;
value.override.version = "master";
})) // {
coq-elpi-tests.job = true;
stdlib.job = true;
coq-elpi-tests-stdlib.job = true;
Expand All @@ -25,12 +28,12 @@ let master = [

deriving.job = false;
reglang.job = false;
}; in
{
};
in {
format = "1.0.0";
attribute = "rocq-elpi";
coq-attribute = "coq-elpi";
default-bundle = "coq-8.20";
default-bundle = "rocq-master";
bundles = {

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

"coq-master" = { rocqPackages = {
rocq-core.override.version = "master";
rocq-elpi.override.elpi-version = "2.0.7";
stdlib.override.version = "master";
bignums.override.version = "master";
}; coqPackages = common-bundles // {
coq.override.version = "master";
coq-elpi.override.elpi-version = "2.0.7";
stdlib.override.version = "master";
bignums.override.version = "master";
}; };

"rocq-master" = {
rocqPackages = {
rocq-core.override.version = "#18903";
rocq-elpi.override.elpi-version = "2.0.7";
stdlib.override.version = "master";
bignums.override.version = "master";
};
coqPackages = common-bundles // {
coq.override.version = "#18903";
coq-elpi.override.elpi-version = "2.0.7";
stdlib.override.version = "master";
bignums.override.version = "master";
};
};

/* uncomment bundle below if min and max elpi version start to differ
"coq-master-min-elpi" = { rocqPackages = {
rocq-core.override.version = "master";
rocq-elpi.override.elpi-version = "2.0.7";
stdlib.override.version = "master";
bignums.override.version = "master";
}; coqPackages = common-bundles // {
coq.override.version = "master";
coq-elpi.override.elpi-version = "2.0.7";
stdlib.override.version = "master";
bignums.override.version = "master";
}; }; */
"coq-master-min-elpi" = { rocqPackages = {
rocq-core.override.version = "master";
rocq-elpi.override.elpi-version = "2.0.7";
stdlib.override.version = "master";
bignums.override.version = "master";
}; coqPackages = common-bundles // {
coq.override.version = "master";
coq-elpi.override.elpi-version = "2.0.7";
stdlib.override.version = "master";
bignums.override.version = "master";
}; };
*/

};

cachix.coq = {};
cachix.math-comp = {};
cachix.coq-community = {};
cachix.coq = { };
cachix.math-comp = { };
cachix.coq-community = { };
cachix.coq-elpi.authToken = "CACHIX_AUTH_TOKEN";

}
11 changes: 4 additions & 7 deletions builtin-doc/coq-builtin.elpi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1040,11 +1040,9 @@ external pred coq.univ.variable.of-term i:term, o:coq.univ.variable.set.

% -- Universe instance (for universe polymorphic global terms) ------

% As of today a universe polymorphic constant can only be instantiated
% with universe level variables. That is f@{Prop} is not valid, nor
% is f@{u+1}. One can only write f@{u} for any u.
% A universe polymorphic constant can be instantiated with universes.
%
% A univ-instance is morally a list of universe level variables,
% A univ-instance is morally a list of universes,
% but its list syntax is hidden in the terms. If you really need to
% craft or inspect one of these, the following APIs can help you.
%
Expand Down Expand Up @@ -1082,9 +1080,8 @@ external pred coq.univ-instance.unify-leq i:gref, i:univ-instance,

% Constraint between two universes level variables
kind univ-constraint type.
type lt univ.variable -> univ.variable -> univ-constraint.
type le univ.variable -> univ.variable -> univ-constraint.
type eq univ.variable -> univ.variable -> univ-constraint.
type le univ -> univ -> univ-constraint.
type eq univ -> univ -> univ-constraint.

% Variance of a universe level variable
kind univ-variance type.
Expand Down
Loading
Loading