Skip to content

Commit 12b55f9

Browse files
authored
Merge pull request #146 from proux01/ci-update
[CI] Update toolbox
2 parents bfb4877 + 616e701 commit 12b55f9

File tree

6 files changed

+3401
-2313
lines changed

6 files changed

+3401
-2313
lines changed

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

Lines changed: 2069 additions & 1090 deletions
Large diffs are not rendered by default.

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

Lines changed: 1322 additions & 1212 deletions
Large diffs are not rendered by default.

.nix/config.nix

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,8 @@ with builtins; with (import <nixpkgs> {}).lib;
190190
"equations-test"
191191
"jasmin"
192192
"mathcomp-word"
193-
"metacoq"
194-
"metacoq-test"
193+
"metarocq"
194+
"metarocq-test"
195195
];
196196
coq-common-bundles = listToAttrs (forEach master (p:
197197
{ name = p; value.override.version = "master"; }))
@@ -206,7 +206,6 @@ with builtins; with (import <nixpkgs> {}).lib;
206206
smtcoq-trakt.override.version = "with-trakt-coq-master";
207207
coq-tools.override.version = "proux01:coq_19955";
208208
stdlib-refman-html.job = true;
209-
metacoq-template-coq.job = false; # old thing, now renamed to metacoq-template-rocq
210209
jasmin.job = false; # Currently broken, c.f., https://github.com/rocq-prover/rocq/pull/20589
211210
# To add a simple overlay applying to all bundles,
212211
# add below a line like
@@ -249,8 +248,8 @@ with builtins; with (import <nixpkgs> {}).lib;
249248
equations.override.version = "1.3.1+9.0";
250249
equations-test.job = false;
251250
fiat-parsers.job = false; # broken
252-
metacoq.override.version = "1.4-9.0";
253-
metacoq-test.override.version = "v1.4-9.0";
251+
metarocq.override.version = "1.4-9.0";
252+
metarocq-test.override.version = "v1.4-9.0";
254253
mtac2.override.version = "1cdb2cb628444ffe9abc6535f6d2e11004de7fc1";
255254
paramcoq-test.override.version = "32609ca4a9bf4a0e456a855ea5118d8c00cda6be";
256255
perennial.job = false; # broken

.nix/coq-nix-toolbox.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
"ac23c3f6bcdcaa54ad66b2ddd0183950e31facf0"
1+
"52aaa743836510268bf94deb898de0f8bd0501be"

.nix/coq-overlays/metacoq-test/default.nix renamed to .nix/coq-overlays/metarocq-test/default.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
{ mkCoqDerivation, metacoq, version ? null }:
1+
{ mkCoqDerivation, metarocq, version ? null }:
22

33
mkCoqDerivation {
4-
pname = "metacoq-test";
4+
pname = "metarocq-test";
55
repo = "metarocq";
66
owner = "MetaRocq";
77
inherit version;
88

99
mlPlugin = true;
1010

11-
propagatedBuildInputs = [ metacoq ];
11+
propagatedBuildInputs = [ metarocq ];
1212

1313
configurePhase = ''
1414
patchShebangs ./configure.sh

default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
bundle ? null, job ? null, inNixShell ? null, src ? ./.,
55
}@args:
66
let auto = fetchGit {
7-
url = "https://github.com/proux01/coq-nix-toolbox.git";
8-
ref = "metarocq14";
7+
url = "https://github.com/rocq-community/coq-nix-toolbox.git";
8+
ref = "master";
99
rev = import .nix/coq-nix-toolbox.nix;
1010
};
1111
in

0 commit comments

Comments
 (0)