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
2 changes: 1 addition & 1 deletion .nix/config.nix
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ in

bundles."8.20".coqPackages = common-bundle // {
coq.override.version = "8.20";
mathcomp.override.version = "2.2.0";
mathcomp.override.version = "2.3.0";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should also be testing mathcomp 2.4.0

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will open a new PR for that.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's already tested in the 9.0 bundle, that's probably enough?

Copy link
Member

@CohenCyril CohenCyril Jul 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There can be some weird things happening when combining different versions. I would not be willing to try my luck with the last version of mathcomp.

};

bundles."9.0".coqPackages = common-bundle // {
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG_UNRELEASED.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@

### Removed

- file `forms.v` (superseded by MathComp's `sesquilinear.v`)

### Infrastructure

### Misc
1 change: 0 additions & 1 deletion _CoqProject
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ theories/esum.v
theories/measurable_realfun.v
theories/lebesgue_measure.v
theories/lebesgue_stieltjes_measure.v
theories/forms.v
theories/derive.v
theories/measure.v
theories/numfun.v
Expand Down
2 changes: 1 addition & 1 deletion coq-mathcomp-classical.opam
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ install: [make "-C" "classical" "install"]
depends: [
("coq" {>= "8.20" & < "8.21~"}
| "coq-core" { (>= "9.0" & < "9.1~") | (= "dev") })
"coq-mathcomp-ssreflect" { (>= "2.2.0" & < "2.5~") | (= "dev") }
"coq-mathcomp-ssreflect" { (>= "2.3.0" & < "2.5~") | (= "dev") }
"coq-mathcomp-fingroup"
"coq-mathcomp-algebra"
"coq-mathcomp-finmap" { (>= "2.1.0") }
Expand Down
1 change: 0 additions & 1 deletion theories/Make
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ trigo.v
esum.v
measurable_realfun.v
lebesgue_measure.v
forms.v
derive.v
measure.v
numfun.v
Expand Down
1 change: 0 additions & 1 deletion theories/all_analysis.v
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ From mathcomp Require Export exp.
From mathcomp Require Export trigo.
From mathcomp Require Export esum.
From mathcomp Require Export lebesgue_measure.
From mathcomp Require Export forms.
From mathcomp Require Export derive.
From mathcomp Require Export measure.
From mathcomp Require Export numfun.
Expand Down
3 changes: 2 additions & 1 deletion theories/derive.v
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
(* mathcomp analysis (c) 2017 Inria and AIST. License: CeCILL-C. *)
From HB Require Import structures.
From mathcomp Require Import all_ssreflect ssralg ssrnum matrix interval poly.
From mathcomp Require Import sesquilinear.
From mathcomp Require Import mathcomp_extra unstable boolp classical_sets.
From mathcomp Require Import functions reals interval_inference topology.
From mathcomp Require Import prodnormedzmodule tvs normedtype landau forms.
From mathcomp Require Import prodnormedzmodule tvs normedtype landau.

(**md**************************************************************************)
(* # Differentiation *)
Expand Down
Loading