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

Updating math-comp-nix to version 2 #22

Open
wants to merge 1 commit into
base: v2
Choose a base branch
from
Open

Updating math-comp-nix to version 2 #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/nix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
nix_path: nixpkgs=channel:nixpkgs-unstable
- name: Setup build matrix
id: set-matrix
run: "echo ::set-output name=matrix::$(./ci-matrix.sh)"
run: echo "matrix=$(./ci-matrix.sh)" >> $GITHUB_OUTPUT

builds:
name: Build mathcomp and coq combination
Expand Down
1 change: 1 addition & 0 deletions .nix/config.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
## In some cases, light overrides are not available/enough
## in which case you can use either
# coqPackages.<coq-pkg>.overrideAttrs = o: <overrides>;
coqPackages.mathcomp.override.version = "2.0.0";
## or a "long" overlay to put in `.nix/coq-overlays
## you may use `nix-shell --run fetchOverlay <coq-pkg>`
## to automatically retrieve the one from nixpkgs
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 @@
"f0370efea6403ad3862e379fdd0892ed5a295d55"
"a407b99285047baaf8e90fef7c33644f623a1a87"
6 changes: 3 additions & 3 deletions .nix/nixpkgs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
fetchTarball {
url = https://github.com/CohenCyril/nixpkgs/archive/8c2fccc525426a1ac5370b8748756934e20e20bf.tar.gz;
sha256 = "18zr88g3p7x4dhldxqzzxn56fq5qvh5vwcy5g7kgq7n3kvaqpk3r";
}
url = https://github.com/NixOS/nixpkgs/archive/493c4e6a0cfb9b05cdc870cbd94b10a0528aff4a.tar.gz;
sha256 = "0m9jz3gnw7b37l1h45xpzjn3rblrvvza1nv5i0k9fvwdxpsa8jr7";
}
5 changes: 3 additions & 2 deletions matrix/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ with import <nixpkgs> {}; with builtins; with lib;
let
old-coq = [ "8.9" "8.8" "8.7" ];
mc-coq-set = {
"2.0.0" = [ "8.18" "8.17" "8.16"];
"1.17.0" = [ "8.17" "8.16" "8.15"];
"1.16.0" = [ "8.17" "8.16" "8.15" "8.14" "8.13" ];
"1.15.0" = [ "8.16" "8.15" "8.14" "8.13" ];
Expand All @@ -11,8 +12,8 @@ let
"1.12.0" = [ "8.13" "8.12" "8.11" "8.10" ];
"1.11.0" = [ "8.12" "8.11" "8.10" ] ++ old-coq;
"1.10.0" = [ "8.11" "8.10" ] ++ old-coq;
"1.9.0" = [ "8.10" ] ++ old-coq;
"1.8.0" = old-coq;
"1.9.0" = [ "8.10" ] ++ old-coq;
"1.8.0" = old-coq;
};

mcs = sort versionAtLeast (attrNames mc-coq-set);
Expand Down
Loading