Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
474 changes: 192 additions & 282 deletions .github/workflows/nix-action-rocq-9.0.yml

Large diffs are not rendered by default.

711 changes: 446 additions & 265 deletions .github/workflows/nix-action-rocq-9.1.yml

Large diffs are not rendered by default.

5,095 changes: 5,095 additions & 0 deletions .github/workflows/nix-action-rocq-9.2.yml

Large diffs are not rendered by default.

573 changes: 220 additions & 353 deletions .github/workflows/nix-action-rocq-master.yml

Large diffs are not rendered by default.

43 changes: 39 additions & 4 deletions .nix/config.nix
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,6 @@ with builtins; with (import <nixpkgs> {}).lib;
"engine-bench"
"fiat-crypto"
"fiat-crypto-ocaml"
"fiat-crypto-legacy"
"iris"
"iris-examples"
"metacoq"
Expand Down Expand Up @@ -244,17 +243,18 @@ with builtins; with (import <nixpkgs> {}).lib;
{ name = p; value.override.version = "main"; }))
// {
coq-elpi.override.version = "master";
coq-elpi.override.elpi-version = "v3.0.1";
fiat-crypto-legacy.override.version = "sp2019latest";
coq-elpi.override.elpi-version = "3.4.2";
tlc.override.version = "master-for-coq-ci";
smtcoq-trakt.override.version = "with-trakt-coq-master";
coq-tools.override.version = "proux01:coq_19955";
stdlib-refman-html.job = true;
iris-examples.job = false; # Currently broken
jasmin.job = false; # Currently broken, c.f., https://github.com/rocq-prover/rocq/pull/20589
ElmExtraction.job = false; # not in Rocq CI
RustExtraction.job = false; # not in Rocq CI
interval.job = false; # not in Rocq CI
parseque.job = false; # not in Rocq CI
LibHyps.job = false; # not in Rocq CI
# To add a simple overlay applying to all bundles,
# add, just below this comment, a line like
#<package>.override.version = "<github_login>:<branch>";
Expand All @@ -271,7 +271,7 @@ with builtins; with (import <nixpkgs> {}).lib;
common-bundles = {
bignums.override.version = "master";
rocq-elpi.override.version = "master";
rocq-elpi.override.elpi-version = "v3.0.1";
rocq-elpi.override.elpi-version = "3.4.2";
rocq-elpi-test.override.version = "master";
hierarchy-builder.override.version = "master";
};
Expand All @@ -282,6 +282,41 @@ with builtins; with (import <nixpkgs> {}).lib;
}; coqPackages = coq-common-bundles // {
coq.override.version = "master";
}; };
"rocq-9.2" = { rocqPackages = common-bundles // {
rocq-core.override.version = "9.2";
# plugin pins, from v9.2 branch of Rocq
bignums.override.version = "30a45625546da0a88db8689a8009d580aa3f557f";
stdlib-test.job = false;
}; coqPackages = coq-common-bundles // {
coq.override.version = "9.2";
# plugin pins, from v9.2 branch of Rocq
aac-tactics.override.version = "4f796a7b0ee88330162727fc6ea988a7e0ea46e3";
atbr.override.version = "47ac8fb6bf244d9a4049e04c01e561191490f543";
bignums.override.version = "30a45625546da0a88db8689a8009d580aa3f557f";
itauto.job = false; # broken
coinduction.override.version = "9502ae09e9f87518330f37c08bc19a8c452dcd91";
dpdgraph-test.override.version = "7a0fba21287dd8889c55e6611f8ba219d012b81b";
coq-hammer.override.version = "1d581299c2a85af175b53bd35370ea074af922ec";
coq-hammer-tactics.override.version = "1d581299c2a85af175b53bd35370ea074af922ec";
equations.override.version = "757662b9c875d7169a07b861d48e82157520ab1a";
equations-test.job = false;
fiat-parsers.job = false; # broken
metarocq.override.version = "e8f8078e756cc378b830eb5a8e4637df43d481af";
metarocq-test.override.version = "e8f8078e756cc378b830eb5a8e4637df43d481af";
mtac2.override.version = "fe8b6049835caa793436e277a64ee7e4910f7b04";
paramcoq-test.override.version = "f8026210f37faf6c4031de24ada9fdded29d67e5";
relation-algebra.override.version = "ba3db5783060d9e25d1db5e377fc9d71338a5160";
rewriter.override.version = "dd37fb28ed7f01a3b7edc0675a86b95dd3eb1545";
rocq-lean-import.override.version = "b8291b9dae4f5ed780112e95eea484e435199b46";
smtcoq.override.version = "cff0a8cdb7c73b6c59965a749a4304f3c4ac01bf";
# smtcoq-trakt.override.version = "9392f7446a174b770110445c155a07b183cdca3d";
stalmarck-tactic.override.version = "d32acd3c477c57b48dd92bdd96d53fb8fa628512";
unicoq.override.version = "d52374ca86e3885197f114555e742420fa9bbe94";
waterproof.override.version = "99ad6ff78fa700c84ba0cb1d1bda27d8e0f11e1a";
compcert.job = false; # broken
VST.job = false; # depends on compcert
} // listToAttrs (forEach lighten-released (p:
{ name = p; value.job = false; })); };
"rocq-9.1" = { rocqPackages = common-bundles // {
rocq-core.override.version = "9.1";
# check that we compile without warnings on last release of Rocq
Expand Down
2 changes: 1 addition & 1 deletion .nix/coq-nix-toolbox.nix
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"f21be9b79484884fb23d06463c6f03cb2a266b8b"
"60810ce1d3e73bece989ce9b9c42d9452c1d54a5"
34 changes: 0 additions & 34 deletions .nix/coq-overlays/fiat-crypto-legacy/default.nix

This file was deleted.

6 changes: 3 additions & 3 deletions .nix/rocq-overlays/stdlib-refman-html/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ antlr4_9, python311, rocq-core, stdlib, rocqPackages }:
{ antlr4_9, python312, rocq-core, stdlib, rocqPackages }:

rocqPackages.lib.overrideRocqDerivation {
pname = "stdlib-refman-html";
Expand All @@ -7,8 +7,8 @@ rocqPackages.lib.overrideRocqDerivation {
++ [ rocq-core.ocamlPackages.ocaml rocq-core.ocamlPackages.dune_3 stdlib ]
++ [
# Sphinx doc dependencies
(python311.withPackages
(ps: [ ps.sphinx ps.sphinx_rtd_theme ps.pexpect ps.beautifulsoup4
(python312.withPackages
(ps: [ ps.sphinx ps.sphinx-rtd-theme ps.pexpect ps.beautifulsoup4
(ps.antlr4-python3-runtime.override {antlr4 = antlr4_9;}) ps.sphinxcontrib-bibtex ]))
antlr4_9
];
Expand Down
1 change: 1 addition & 0 deletions dev/doc/howto_release.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* check the result of "make refman-html"
(in _build/default/doc/refman-html)
* if need be, update supported versions of Rocq in .nix/config.nix
and regenerate CI config with nix-shell --arg do-nothing true --run "genNixActions"
* rerun CI
* release on github (and add the generated tarball as asset)
* once tagging is done push a commit to update doc/sphinx/changes.rst
Expand Down
4 changes: 2 additions & 2 deletions doc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ build the refman is to run:
Otherwise, you need to install (in another way) Python 3, and the following Python packages:

- sphinx >= 4.5.0
- sphinx_rtd_theme >= 1.0.0
- sphinx-rtd-theme >= 1.0.0
- beautifulsoup4 >= 4.8.2
- antlr4-python3-runtime >= 4.7.1 & <= 4.9.3
- pexpect >= 4.6.0
Expand All @@ -43,7 +43,7 @@ Otherwise, you need to install (in another way) Python 3, and the following Pyth
For instance, on Debian / Ubuntu, you can install pip and setuptools
with `apt install python3-pip python3-setuptools` on Debian / Ubuntu then run:

pip3 install sphinx sphinx_rtd_theme beautifulsoup4 \
pip3 install sphinx sphinx-rtd-theme beautifulsoup4 \
antlr4-python3-runtime==4.7.1 pexpect sphinxcontrib-bibtex

You can check the dependencies using the `doc/tools/rocqrst/checkdeps.py` script.
Expand Down