Skip to content

Commit dd964c8

Browse files
committed
one package by plugin
1 parent 049035a commit dd964c8

File tree

6 files changed

+59
-9
lines changed

6 files changed

+59
-9
lines changed

.github/workflows/nix-action-coq-8.16-macos.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,13 @@ jobs:
147147
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.16"
148148
--argstr job "metacoq-template-pcuic"
149149
- if: steps.stepCheck.outputs.status == 'built'
150-
name: 'Building/fetching previous CI target: metacoq-plugins'
150+
name: 'Building/fetching previous CI target: metacoq-safechecker-plugin'
151151
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.16"
152-
--argstr job "metacoq-plugins"
152+
--argstr job "metacoq-safechecker-plugin"
153+
- if: steps.stepCheck.outputs.status == 'built'
154+
name: 'Building/fetching previous CI target: metacoq-erasure-plugin'
155+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.16"
156+
--argstr job "metacoq-erasure-plugin"
153157
- if: steps.stepCheck.outputs.status == 'built'
154158
name: Building/fetching current CI target
155159
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.16"

.github/workflows/nix-action-coq-8.16-ubuntu.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,13 @@ jobs:
147147
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.16"
148148
--argstr job "metacoq-template-pcuic"
149149
- if: steps.stepCheck.outputs.status == 'built'
150-
name: 'Building/fetching previous CI target: metacoq-plugins'
150+
name: 'Building/fetching previous CI target: metacoq-safechecker-plugin'
151151
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.16"
152-
--argstr job "metacoq-plugins"
152+
--argstr job "metacoq-safechecker-plugin"
153+
- if: steps.stepCheck.outputs.status == 'built'
154+
name: 'Building/fetching previous CI target: metacoq-erasure-plugin'
155+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.16"
156+
--argstr job "metacoq-erasure-plugin"
153157
- if: steps.stepCheck.outputs.status == 'built'
154158
name: Building/fetching current CI target
155159
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "coq-8.16"

.nix/coq-overlays/metacoq/default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ let
2525
releaseRev = v: "v${v}";
2626

2727
# list of core metacoq packages sorted by dependency order
28-
packages = [ "utils" "common" "template-coq" "pcuic" "safechecker" "erasure" "template-pcuic" "plugins" "all" ];
28+
packages = [ "utils" "common" "template-coq" "pcuic" "safechecker" "erasure" "template-pcuic" "safechecker-plugin" "erasure-plugin" "all" ];
2929

3030
template-coq = metacoq_ "template-coq";
3131

@@ -57,7 +57,7 @@ let
5757

5858
configurePhase = optionalString (package == "all") pkgallMake + ''
5959
touch ${pkgpath}/metacoq-config
60-
'' + optionalString (elem package ["safechecker" "erasure" "template-pcuic" "plugins"]) ''
60+
'' + optionalString (elem package ["safechecker" "erasure" "template-pcuic" "safechecker-plugin" "erasure-plugin"]) ''
6161
echo "-I ${template-coq}/lib/coq/${coq.coq-version}/user-contrib/MetaCoq/Template/" > ${pkgpath}/metacoq-config
6262
'' + optionalString (package == "single") ''
6363
./configure.sh local

coq-metacoq-plugins.opam renamed to coq-metacoq-erasure-plugin.opam

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,9 @@ authors: ["Abhishek Anand <[email protected]>"
2121
license: "MIT"
2222
build: [
2323
["bash" "./configure.sh"]
24-
[make "-j" "%{jobs}%" "-C" "safechecker-plugin"]
2524
[make "-j" "%{jobs}%" "-C" "erasure-plugin"]
2625
]
2726
install: [
28-
[make "-C" "safechecker-plugin" "install"]
2927
[make "-C" "erasure-plugin" "install"]
3028
]
3129
depends: [
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
opam-version: "2.0"
2+
version: "8.16.dev"
3+
maintainer: "[email protected]"
4+
homepage: "https://metacoq.github.io/metacoq"
5+
dev-repo: "git+https://github.com/MetaCoq/metacoq.git#coq-8.16"
6+
bug-reports: "https://github.com/MetaCoq/metacoq/issues"
7+
authors: ["Abhishek Anand <[email protected]>"
8+
"Danil Annenkov <[email protected]>"
9+
"Simon Boulier <[email protected]>"
10+
"Cyril Cohen <[email protected]>"
11+
"Yannick Forster <[email protected]>"
12+
"Fabian Kunze <[email protected]>"
13+
"Meven Lennon-Bertrand <[email protected]>"
14+
"Kenji Maillard <[email protected]>"
15+
"Gregory Malecha <[email protected]>"
16+
"Jakob Botsch Nielsen <[email protected]>"
17+
"Matthieu Sozeau <[email protected]>"
18+
"Nicolas Tabareau <[email protected]>"
19+
"Théo Winterhalter <[email protected]>"
20+
]
21+
license: "MIT"
22+
build: [
23+
["bash" "./configure.sh"]
24+
[make "-j" "%{jobs}%" "-C" "safechecker-plugin"]
25+
]
26+
install: [
27+
[make "-C" "safechecker-plugin" "install"]
28+
]
29+
depends: [
30+
"coq-metacoq-template-pcuic" {= version}
31+
]
32+
synopsis: "Implementation and verification of an erasure procedure for Coq"
33+
description: """
34+
MetaCoq is a meta-programming framework for Coq.
35+
36+
The Erasure module provides a complete specification of Coq's so-called
37+
\"extraction\" procedure, starting from the PCUIC calculus and targeting
38+
untyped call-by-value lambda-calculus.
39+
40+
The `erasure` function translates types and proofs in well-typed terms
41+
into a dummy `tBox` constructor, following closely P. Letouzey's PhD
42+
thesis.
43+
"""

coq-metacoq.opam

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ authors: ["Abhishek Anand <[email protected]>"
2020
]
2121
license: "MIT"
2222
depends: [
23-
"coq-metacoq-plugins" {= version}
23+
"coq-metacoq-safechecker-plugin" {= version}
24+
"coq-metacoq-erasure-plugin" {= version}
2425
"coq-metacoq-translations" {= version}
2526
]
2627
build: [

0 commit comments

Comments
 (0)