Skip to content
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

bump to Dune 3.5 or later and Dune-Coq 0.6 #19

Merged
merged 2 commits into from
Jul 24, 2024
Merged

bump to Dune 3.5 or later and Dune-Coq 0.6 #19

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
bca0798
bump to Dune 3.5 or later and Dune-Coq 0.6
palmskog Jul 24, 2024
d9421f7
fix for mathcomp master
palmskog Jul 24, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/docker-action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- 'mathcomp/mathcomp:2.0.0-coq-8.16'
fail-fast: false
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: coq-community/docker-coq-action@v1
with:
custom_image: ${{ matrix.image }}
Expand Down
2 changes: 1 addition & 1 deletion coq-gaia-numbers.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Elements of Mathematics in Coq using the Mathematical Components library."""

build: ["dune" "build" "-p" name "-j" jobs]
depends: [
"dune" {>= "2.8"}
"dune" {>= "3.5"}
"coq" {>= "8.16"}
"coq-mathcomp-ssreflect" {>= "2.0"}
"coq-mathcomp-algebra"
Expand Down
2 changes: 1 addition & 1 deletion coq-gaia-ordinals.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ the Mathematical Components library."""

build: ["dune" "build" "-p" name "-j" jobs]
depends: [
"dune" {>= "2.8"}
"dune" {>= "3.5"}
"coq" {>= "8.16"}
"coq-mathcomp-ssreflect" {>= "2.0"}
"coq-gaia-theory-of-sets" {= version}
Expand Down
2 changes: 1 addition & 1 deletion coq-gaia-schutte.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ following the approaches of Schütte and Ackermann."""

build: ["dune" "build" "-p" name "-j" jobs]
depends: [
"dune" {>= "2.8"}
"dune" {>= "3.5"}
"coq" {>= "8.16"}
"coq-mathcomp-ssreflect" {>= "2.0"}
]
Expand Down
2 changes: 1 addition & 1 deletion coq-gaia-stern.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Mathematical Components library."""

build: ["dune" "build" "-p" name "-j" jobs]
depends: [
"dune" {>= "2.8"}
"dune" {>= "3.5"}
"coq" {>= "8.16"}
"coq-mathcomp-ssreflect" {>= "2.0"}
"coq-mathcomp-algebra"
Expand Down
2 changes: 1 addition & 1 deletion coq-gaia-theory-of-sets.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Elements of Mathematics in Coq using the Mathematical Components library."""

build: ["dune" "build" "-p" name "-j" jobs]
depends: [
"dune" {>= "2.8"}
"dune" {>= "3.5"}
"coq" {>= "8.16"}
"coq-mathcomp-ssreflect" {>= "2.0"}
]
Expand Down
4 changes: 2 additions & 2 deletions dune-project
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
(lang dune 2.8)
(using coq 0.3)
(lang dune 3.5)
(using coq 0.6)
(name gaia)
2 changes: 1 addition & 1 deletion theories/numbers/ssetz.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ Lemma BZopp_sg x: intp x -> x <> \0z ->
Proof.
move => pa pb; rewrite /int_np /int_pp.
have pnz: (P x <> \0c) by move => h; case: pb; apply: BZ_0_if_val0.
by rewrite /BZopp /BZ_of_nat /BZm_of_nat; Ytac0;Ytac sx; aw; rewrite ? sx.
by rewrite /BZopp /BZ_of_nat /BZm_of_nat; Ytac0;Ytac sx; aw; rewrite ? sx; split.
Qed.

Lemma BZopp_positive1 x: inc x BZps -> inc (BZopp x) BZms.
Expand Down
Loading