Skip to content

Commit

Permalink
V2up (#16)
Browse files Browse the repository at this point in the history
* update
  • Loading branch information
CohenCyril authored Mar 11, 2021
1 parent 063fa75 commit ad9bb77
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 10 deletions.
1 change: 1 addition & 0 deletions .nix/coq-nix-toolbox.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
"e54b920493f0494ede95b5f7d083cc8b20b1f5a6"
10 changes: 7 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,23 @@ Here is a synthesis of all available mathcomp packages.

If a mathcomp-coq combination is missing, please add it to the `mc-coq-set` attribute in the file [`matrix/default.nix`](https://github.com/math-comp/math-comp-nix/blob/v2/mstrix/default.nix).

If some mathcomp extra package is missing, there might be two reasons:
- Either the (upadate of the) package has not been pushed on [NixOS/nixpkgs](https://github.com/NixOS/nixpkgs).
If some mathcomp extra package is missing, there might be three reasons:
1. The (update of the) package has not been pushed on [NixOS/nixpkgs](https://github.com/NixOS/nixpkgs).
If that's the case you can either
+ open a pull request to add it, or
+ open an issue and tag @CohenCyril to prompt for the addition of the package.
- Or the nixpkgs commit has not been updated in https://github.com/coq-nix-toolbox/.
2. The nixpkgs commit has not been updated in https://github.com/coq-community/coq-nix-toolbox/.
In which case, you should go there and run `nix-shell --arg update-nixpkgs true`, commit and push **there**.
+ This command is also applicable in the current directory but is strongly discouraged
outside of development purpose, since it would desynchronize the nixpkgs versions at use
between https://github.com/coq-nix-toolbox/ and https://math-comp.github.io/nix.
+ It can take some time for a package pushed to NixOS/nixpkgs to reach the unstable branch.
If you are too impatient you can run `nix-shell --arg do-nothing true --run updateNixpkgsMaster`
**on your own projects**.
3. The current repository is not in sync with
https://github.com/coq-community/coq-nix-toolbox/.
You should run `nix-shell --run updateNixToolBox`, commit and make
a pull request to see if it goes through.

### Mathematical Components 1.12.0 and Coq 8.13
Available packages:
Expand Down
10 changes: 7 additions & 3 deletions README_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,21 @@ Here is a synthesis of all available mathcomp packages.

If a mathcomp-coq combination is missing, please add it to the `mc-coq-set` attribute in the file [`matrix/default.nix`](https://github.com/math-comp/math-comp-nix/blob/v2/mstrix/default.nix).

If some mathcomp extra package is missing, there might be two reasons:
- Either the (upadate of the) package has not been pushed on [NixOS/nixpkgs](https://github.com/NixOS/nixpkgs).
If some mathcomp extra package is missing, there might be three reasons:
1. The (update of the) package has not been pushed on [NixOS/nixpkgs](https://github.com/NixOS/nixpkgs).
If that's the case you can either
+ open a pull request to add it, or
+ open an issue and tag @CohenCyril to prompt for the addition of the package.
- Or the nixpkgs commit has not been updated in https://github.com/coq-nix-toolbox/.
2. The nixpkgs commit has not been updated in https://github.com/coq-community/coq-nix-toolbox/.
In which case, you should go there and run `nix-shell --arg update-nixpkgs true`, commit and push **there**.
+ This command is also applicable in the current directory but is strongly discouraged
outside of development purpose, since it would desynchronize the nixpkgs versions at use
between https://github.com/coq-nix-toolbox/ and https://math-comp.github.io/nix.
+ It can take some time for a package pushed to NixOS/nixpkgs to reach the unstable branch.
If you are too impatient you can run `nix-shell --arg do-nothing true --run updateNixpkgsMaster`
**on your own projects**.
3. The current repository is not in sync with
https://github.com/coq-community/coq-nix-toolbox/.
You should run `nix-shell --run updateNixToolBox`, commit and make
a pull request to see if it goes through.

9 changes: 5 additions & 4 deletions default.nix
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
{ core ? false,
config ? {}, withEmacs ? false, print-env ? false, do-nothing ? false,
update-nixpkgs ? false, ci-matrix ? false, ci-step ? null,
update-nixpkgs ? false, ci-matrix ? false, ci-job ? null,
override ? {}, ocaml-override ? {}, global-override ? {},
ci ? (!isNull ci-step), inNixShell ? null
ci ? (!isNull ci-job), inNixShell ? null, src ? ./.,
}@args:
let auto = fetchGit {
url = "https://github.com/coq-community/nix-toolbox.git";
url = "https://github.com/coq-community/coq-nix-toolbox.git";
ref = "master";
rev = "b1e5c52bdc1d79b7cd220476ebd9bc552a2331c7";
# putting a ref here is strongly advised
rev = import .nix/coq-nix-toolbox.nix;
};
in
(import auto (
Expand Down

0 comments on commit ad9bb77

Please sign in to comment.