Skip to content

Commit 3b1ab8f

Browse files
authored
Merge pull request #218 from proux01/rocq-refman
Update refman to rocqrst
2 parents a9bf2fe + a4fde29 commit 3b1ab8f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+2955
-2827
lines changed

.github/workflows/nix-action-rocq-9.0.yml

Lines changed: 614 additions & 559 deletions
Large diffs are not rendered by default.

.github/workflows/nix-action-rocq-9.1.yml

Lines changed: 590 additions & 535 deletions
Large diffs are not rendered by default.

.github/workflows/nix-action-rocq-master.yml

Lines changed: 871 additions & 806 deletions
Large diffs are not rendered by default.

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,5 @@ user-contrib/Ltac2/dune
166166
/test-suite/test_suite_config.inc
167167

168168
.wrappers
169-
rocq-stdlib-doc.opam
170169
doc/stdlib/Library.fdb_latexmk
171170
doc/stdlib/Library.fls

.nix/config.nix

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ with builtins; with (import <nixpkgs> {}).lib;
5353

5454
## select an entry to build in the following `bundles` set
5555
## defaults to "default"
56-
default-bundle = "rocq-9.0";
56+
default-bundle = "rocq-9.1";
5757

5858
## write one `bundles.name` attribute set per
5959
## alternative configuration
@@ -289,6 +289,7 @@ with builtins; with (import <nixpkgs> {}).lib;
289289
stdlib-warnings.job = true;
290290
# plugin pins, from v9.1 branch of Rocq
291291
bignums.override.version = "9f9855536bd4167af6986f826819e32354b7da22";
292+
stdlib-test.job = false;
292293
}; coqPackages = coq-common-bundles // {
293294
coq.override.version = "9.1";
294295
# plugin pins, from v9.1 branch of Rocq
@@ -325,6 +326,7 @@ with builtins; with (import <nixpkgs> {}).lib;
325326
stdlib-warnings.job = true;
326327
# plugin pins, from v9.0 branch of Coq
327328
bignums.override.version = "cc2d9ee990e4cfebe5f107d8357198baa526eded";
329+
stdlib-test.job = false;
328330
}; coqPackages = coq-common-bundles // {
329331
coq.override.version = "9.0.0";
330332
# plugin pins, from v9.0 branch of Coq

.nix/coq-nix-toolbox.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
"e4f4560d9d6fcc41a5050dfbfca1d46b5f6c0583"
1+
"f21be9b79484884fb23d06463c6f03cb2a266b8b"

.nix/coq-overlays/stdlib-refman-html/default.nix renamed to .nix/rocq-overlays/stdlib-refman-html/default.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
{ antlr4_9, python311, coq, stdlib, coqPackages }:
1+
{ antlr4_9, python311, rocq-core, stdlib, rocqPackages }:
22

3-
coqPackages.lib.overrideCoqDerivation {
3+
rocqPackages.lib.overrideRocqDerivation {
44
pname = "stdlib-refman-html";
55

66
overrideBuildInputs = stdlib.buildInputs
7-
++ [ coq.ocamlPackages.ocaml coq.ocamlPackages.dune_3 stdlib ]
7+
++ [ rocq-core.ocamlPackages.ocaml rocq-core.ocamlPackages.dune_3 stdlib ]
88
++ [
99
# Sphinx doc dependencies
1010
(python311.withPackages

doc/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ with `apt install python3-pip python3-setuptools` on Debian / Ubuntu then run:
4646
pip3 install sphinx sphinx_rtd_theme beautifulsoup4 \
4747
antlr4-python3-runtime==4.7.1 pexpect sphinxcontrib-bibtex
4848

49-
You can check the dependencies using the `doc/tools/coqrst/checkdeps.py` script.
49+
You can check the dependencies using the `doc/tools/rocqrst/checkdeps.py` script.
5050

5151
### Other formats
5252

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1+
12
Changed
23
^^^^^^^
4+
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1+
12
Added
23
^^^^^
4+

0 commit comments

Comments
 (0)