Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
11e8a7d
Sampling theorem
hoheinzollern Jun 19, 2025
3723148
mfunM no longer needed
hoheinzollern Jun 20, 2025
6e8c01a
removed finite_prod_fin_num and finite_prod_ge0
hoheinzollern Jun 20, 2025
1bc1754
removing subset_itvW_bound
hoheinzollern Jun 20, 2025
c8be49c
removed gtr0_derive1_homo and ger0_derive1_homo
hoheinzollern Jun 20, 2025
1a7cd3f
removed bigcup_mkord_ord
hoheinzollern Jun 20, 2025
1fbff46
removed measurability of tuples
hoheinzollern Jun 21, 2025
2947a5f
cleaning
affeldt-aist Jun 24, 2025
a693dbd
rm dup
affeldt-aist Jun 24, 2025
071657d
generalize integral_sum so that integrable_sum_ord becomes
affeldt-aist Jun 24, 2025
f15bf26
renaming
affeldt-aist Jun 24, 2025
0b25b9e
rebase
affeldt-aist Jun 24, 2025
cf458de
rm dead code, cleaning, rebase
affeldt-aist Jun 26, 2025
64d49d8
tuple_of_pair
affeldt-aist Jun 26, 2025
ff9e066
cleaning
affeldt-aist Jun 26, 2025
9884905
generalize ipro to sigma_finite
t6s Jun 27, 2025
db9caa8
cleaning
affeldt-aist Jun 28, 2025
4ede82a
rm dup code
affeldt-aist Jun 28, 2025
9452b23
rebase
affeldt-aist Jul 7, 2025
3b0d4bc
remove preimage_set1
t6s Jul 7, 2025
65a0eff
ipro -> power_measure
affeldt-aist Jul 7, 2025
43eb2a9
nitpicking
affeldt-aist Jul 8, 2025
8baaf86
Adding interval dependency to OPAM package
proux01 Jul 9, 2025
089fb26
[CI] Add interval dependency to mathcomp-analysis-stdlib
proux01 Jul 9, 2025
57d7978
moving sampling.v to analysis_stdlib/
hoheinzollern Jul 9, 2025
ea5d731
[CI] New attempt
proux01 Jul 9, 2025
2e4192e
[CI] Further fix
proux01 Jul 9, 2025
2dacfd1
typo
hoheinzollern Aug 14, 2025
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
22 changes: 12 additions & 10 deletions .github/workflows/nix-action-8.20.yml
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,10 @@ jobs:
name: 'Building/fetching previous CI target: hierarchy-builder'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.20" --argstr
job "hierarchy-builder"
- if: steps.stepCheck.outputs.status != 'fetched'
name: 'Building/fetching previous CI target: stdlib'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.20" --argstr
job "stdlib"
- if: steps.stepCheck.outputs.status != 'fetched'
name: Building/fetching current CI target
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.20" --argstr
Expand Down Expand Up @@ -283,15 +287,17 @@ jobs:
name: 'Building/fetching previous CI target: hierarchy-builder'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.20" --argstr
job "hierarchy-builder"
- if: steps.stepCheck.outputs.status != 'fetched'
name: 'Building/fetching previous CI target: interval'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.20" --argstr
job "interval"
- if: steps.stepCheck.outputs.status != 'fetched'
name: Building/fetching current CI target
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.20" --argstr
job "mathcomp-analysis-single"
mathcomp-analysis-stdlib:
needs:
- coq
- mathcomp-analysis
- mathcomp-reals-stdlib
runs-on: ubuntu-latest
steps:
- name: Determine which commit to initially checkout
Expand Down Expand Up @@ -345,17 +351,13 @@ jobs:
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.20" --argstr
job "coq"
- if: steps.stepCheck.outputs.status != 'fetched'
name: 'Building/fetching previous CI target: mathcomp-analysis'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.20" --argstr
job "mathcomp-analysis"
- if: steps.stepCheck.outputs.status != 'fetched'
name: 'Building/fetching previous CI target: mathcomp-reals-stdlib'
name: 'Building/fetching previous CI target: mathcomp-field'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.20" --argstr
job "mathcomp-reals-stdlib"
job "mathcomp-field"
- if: steps.stepCheck.outputs.status != 'fetched'
name: 'Building/fetching previous CI target: stdlib'
name: 'Building/fetching previous CI target: mathcomp-bigenough'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.20" --argstr
job "stdlib"
job "mathcomp-bigenough"
- if: steps.stepCheck.outputs.status != 'fetched'
name: 'Building/fetching previous CI target: hierarchy-builder'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.20" --argstr
Expand Down
18 changes: 8 additions & 10 deletions .github/workflows/nix-action-9.0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -216,15 +216,17 @@ jobs:
name: 'Building/fetching previous CI target: hierarchy-builder'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "9.0" --argstr
job "hierarchy-builder"
- if: steps.stepCheck.outputs.status != 'fetched'
name: 'Building/fetching previous CI target: interval'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "9.0" --argstr
job "interval"
- if: steps.stepCheck.outputs.status != 'fetched'
name: Building/fetching current CI target
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "9.0" --argstr
job "mathcomp-analysis-single"
mathcomp-analysis-stdlib:
needs:
- coq
- mathcomp-analysis
- mathcomp-reals-stdlib
runs-on: ubuntu-latest
steps:
- name: Determine which commit to initially checkout
Expand Down Expand Up @@ -278,17 +280,13 @@ jobs:
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "9.0" --argstr
job "coq"
- if: steps.stepCheck.outputs.status != 'fetched'
name: 'Building/fetching previous CI target: mathcomp-analysis'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "9.0" --argstr
job "mathcomp-analysis"
- if: steps.stepCheck.outputs.status != 'fetched'
name: 'Building/fetching previous CI target: mathcomp-reals-stdlib'
name: 'Building/fetching previous CI target: mathcomp-field'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "9.0" --argstr
job "mathcomp-reals-stdlib"
job "mathcomp-field"
- if: steps.stepCheck.outputs.status != 'fetched'
name: 'Building/fetching previous CI target: stdlib'
name: 'Building/fetching previous CI target: mathcomp-bigenough'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "9.0" --argstr
job "stdlib"
job "mathcomp-bigenough"
- if: steps.stepCheck.outputs.status != 'fetched'
name: 'Building/fetching previous CI target: hierarchy-builder'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "9.0" --argstr
Expand Down
36 changes: 9 additions & 27 deletions .github/workflows/nix-action-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -244,13 +244,11 @@ jobs:
name: Building/fetching current CI target
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "master"
--argstr job "mathcomp"
mathcomp-analysis-single:
mathcomp-analysis:
needs:
- coq
- mathcomp-finmap
- mathcomp-bigenough
- mathcomp-reals
- mathcomp-bigenough
- stdlib
- hierarchy-builder
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -288,11 +286,11 @@ jobs:
extraPullNames: coq, coq-community
name: math-comp
- id: stepGetDerivation
name: Getting derivation for current job (mathcomp-analysis-single)
name: Getting derivation for current job (mathcomp-analysis)
run: "NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link \\\n --argstr bundle
\"master\" --argstr job \"mathcomp-analysis-single\" \\\n --dry-run 2> err
> out || (touch fail; true)\ncat out err\nif [ -e fail ]; then echo \"Error:
getting derivation failed\"; exit 1; fi\n"
\"master\" --argstr job \"mathcomp-analysis\" \\\n --dry-run 2> err > out
|| (touch fail; true)\ncat out err\nif [ -e fail ]; then echo \"Error: getting
derivation failed\"; exit 1; fi\n"
- id: stepCheck
name: Checking presence of CI target for current job
run: "if $(cat out err | grep -q \"built:\") ; then\n echo \"CI target needs
Expand All @@ -305,21 +303,9 @@ jobs:
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "master"
--argstr job "coq"
- if: steps.stepCheck.outputs.status != 'fetched'
name: 'Building/fetching previous CI target: mathcomp-ssreflect'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "master"
--argstr job "mathcomp-ssreflect"
- if: steps.stepCheck.outputs.status != 'fetched'
name: 'Building/fetching previous CI target: mathcomp-algebra'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "master"
--argstr job "mathcomp-algebra"
- if: steps.stepCheck.outputs.status != 'fetched'
name: 'Building/fetching previous CI target: mathcomp-finmap'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "master"
--argstr job "mathcomp-finmap"
- if: steps.stepCheck.outputs.status != 'fetched'
name: 'Building/fetching previous CI target: mathcomp-bigenough'
name: 'Building/fetching previous CI target: mathcomp-reals'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "master"
--argstr job "mathcomp-bigenough"
--argstr job "mathcomp-reals"
- if: steps.stepCheck.outputs.status != 'fetched'
name: 'Building/fetching previous CI target: mathcomp-field'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "master"
Expand All @@ -328,18 +314,14 @@ jobs:
name: 'Building/fetching previous CI target: mathcomp-bigenough'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "master"
--argstr job "mathcomp-bigenough"
- if: steps.stepCheck.outputs.status != 'fetched'
name: 'Building/fetching previous CI target: stdlib'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "master"
--argstr job "stdlib"
- if: steps.stepCheck.outputs.status != 'fetched'
name: 'Building/fetching previous CI target: hierarchy-builder'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "master"
--argstr job "hierarchy-builder"
- if: steps.stepCheck.outputs.status != 'fetched'
name: Building/fetching current CI target
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "master"
--argstr job "mathcomp-analysis-single"
--argstr job "mathcomp-analysis"
mathcomp-bigenough:
needs:
- coq
Expand Down
9 changes: 7 additions & 2 deletions .nix/config.nix
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ in
## when calling `nix-shell` and `nix-build` without the `--argstr job` argument
shell-attribute = "mathcomp-analysis-single";

## Set this when the package has no rocqPackages version yet
## (either in nixpkgs or in .nix/rocq-overlays)
no-rocq-yet = true;

## Maybe the shortname of the library is different from
## the name of the nixpkgs attribute, if so, set it here:
# pname = "{{shortname}}";
Expand Down Expand Up @@ -63,8 +67,7 @@ in
stdlib.override.version = "master";
rocq-elpi.override.version = "master";
rocq-elpi.override.elpi-version = "2.0.7";
mathcomp-analysis.job = false; # current bug in coq-nix-toolbox
mathcomp-analysis-stdlib.job = false;
hierarchy-builder.override.version = "master";
}; coqPackages = common-bundle // {
coq.override.version = "master";
stdlib.override.version = "master";
Expand All @@ -75,6 +78,8 @@ in
mathcomp-bigenough.override.version = "master";
mathcomp-finmap.override.version = "master";
ssprove.job = false;
mathcomp-analysis-stdlib.job = false; # because of the interval dependency
mathcomp-analysis-single.job = false; # same
}; };

## Cachix caches to use in CI
Expand Down
2 changes: 1 addition & 1 deletion .nix/coq-nix-toolbox.nix
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"52aaa743836510268bf94deb898de0f8bd0501be"
"81869eb0d481e1902143b8c5201cfc488acdab22"
6 changes: 4 additions & 2 deletions .nix/coq-overlays/mathcomp-analysis-single/default.nix
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
{ mathcomp-analysis, version ? null }:
mathcomp-analysis.override {single = true; inherit version;}
{ mathcomp-analysis, interval, version ? null }:
(mathcomp-analysis.overrideAttrs (o:
{ propagatedBuildInputs = o.propagatedBuildInputs ++ [ interval ]; }
)).override {single = true; inherit version;}
Loading
Loading