Skip to content

Fix nix-shell #1993

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

Merged
CohenCyril merged 3 commits into from
Jun 11, 2026
Merged

Fix nix-shell #1993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f1a14d
Fix nix-shell
CohenCyril Jun 10, 2026
993d0fb
override coq.mathcomp too
CohenCyril Jun 10, 2026
2c09c41
override more too
CohenCyril Jun 10, 2026
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
10 changes: 3 additions & 7 deletions .github/workflows/nix-action-9.0-master.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ jobs:
mathcomp-experimental-reals:
needs:
- rocq-core
- mathcomp-reals
- mathcomp-analysis
- mathcomp-bigenough
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -546,9 +546,9 @@ jobs:
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
"9.0-master" --argstr job "rocq-core"
- if: steps.stepCheck.outputs.status != 'fetched'
name: 'Building/fetching previous CI target: mathcomp-reals'
name: 'Building/fetching previous CI target: mathcomp-analysis'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
"9.0-master" --argstr job "mathcomp-reals"
"9.0-master" --argstr job "mathcomp-analysis"
- if: steps.stepCheck.outputs.status != 'fetched'
name: 'Building/fetching previous CI target: mathcomp-bigenough'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
Expand Down Expand Up @@ -680,10 +680,6 @@ jobs:
name: 'Building/fetching previous CI target: mathcomp-analysis-stdlib'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
"9.0-master" --argstr job "mathcomp-analysis-stdlib"
- if: steps.stepCheck.outputs.status != 'fetched'
name: 'Building/fetching previous CI target: mathcomp-algebra-tactics'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
"9.0-master" --argstr job "mathcomp-algebra-tactics"
- 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
Expand Down
10 changes: 3 additions & 7 deletions .github/workflows/nix-action-9.1-master.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ jobs:
mathcomp-experimental-reals:
needs:
- rocq-core
- mathcomp-reals
- mathcomp-analysis
- mathcomp-bigenough
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -546,9 +546,9 @@ jobs:
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
"9.1-master" --argstr job "rocq-core"
- if: steps.stepCheck.outputs.status != 'fetched'
name: 'Building/fetching previous CI target: mathcomp-reals'
name: 'Building/fetching previous CI target: mathcomp-analysis'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
"9.1-master" --argstr job "mathcomp-reals"
"9.1-master" --argstr job "mathcomp-analysis"
- if: steps.stepCheck.outputs.status != 'fetched'
name: 'Building/fetching previous CI target: mathcomp-bigenough'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
Expand Down Expand Up @@ -680,10 +680,6 @@ jobs:
name: 'Building/fetching previous CI target: mathcomp-analysis-stdlib'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
"9.1-master" --argstr job "mathcomp-analysis-stdlib"
- if: steps.stepCheck.outputs.status != 'fetched'
name: 'Building/fetching previous CI target: mathcomp-algebra-tactics'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
"9.1-master" --argstr job "mathcomp-algebra-tactics"
- 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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/nix-action-master.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,7 @@ jobs:
mathcomp-experimental-reals:
needs:
- rocq-core
- mathcomp-reals
- mathcomp-analysis
- mathcomp-bigenough
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -672,9 +672,9 @@ jobs:
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
"master" --argstr job "rocq-core"
- if: steps.stepCheck.outputs.status != 'fetched'
name: 'Building/fetching previous CI target: mathcomp-reals'
name: 'Building/fetching previous CI target: mathcomp-analysis'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
"master" --argstr job "mathcomp-reals"
"master" --argstr job "mathcomp-analysis"
- if: steps.stepCheck.outputs.status != 'fetched'
name: 'Building/fetching previous CI target: mathcomp-bigenough'
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle
Expand Down
8 changes: 8 additions & 0 deletions .nix/config.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ let
mathcomp-analysis-stdlib.job = true;
ssprove.override.version = "main";
mathcomp-infotheo.override.version = "master";
interval.override.version = "master";
coquelicot.override.version = "master";
};
in {
## DO NOT CHANGE THIS
Expand Down Expand Up @@ -59,6 +61,9 @@ in {
};
coqPackages = common-bundle // {
coq.override.version = "9.0";
mathcomp.override.version = "master";
mathcomp-bigenough.override.version = "master";
mathcomp-finmap.override.version = "master";
ssprove.job = false; # not yet available for 9.1
};
};
Expand All @@ -84,6 +89,9 @@ in {
};
coqPackages = common-bundle // {
coq.override.version = "9.1";
mathcomp.override.version = "master";
mathcomp-bigenough.override.version = "master";
mathcomp-finmap.override.version = "master";
ssprove.job = false; # not yet available for 9.1
};
};
Expand Down
2 changes: 1 addition & 1 deletion .nix/coq-nix-toolbox.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"6b32b8cd491ec44b75da86fb17e4353f2f102328"
"4a441c50de5618ef066128f9f6f84e6bc13066da"
2 changes: 1 addition & 1 deletion .nix/rocq-overlays/mathcomp-analysis-single/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{ mathcomp-analysis }:
{ mathcomp-analysis, ... }:
mathcomp-analysis.override {single = true;}
Loading