From ad9bb77719d1f8b432ae4e7e1b6d1e866b40ee90 Mon Sep 17 00:00:00 2001 From: Cyril Cohen Date: Thu, 11 Mar 2021 21:15:01 +0100 Subject: [PATCH] V2up (#16) * update --- .nix/coq-nix-toolbox.nix | 1 + README.md | 10 +++++++--- README_TEMPLATE.md | 10 +++++++--- default.nix | 9 +++++---- 4 files changed, 20 insertions(+), 10 deletions(-) create mode 100644 .nix/coq-nix-toolbox.nix diff --git a/.nix/coq-nix-toolbox.nix b/.nix/coq-nix-toolbox.nix new file mode 100644 index 0000000..ba2d943 --- /dev/null +++ b/.nix/coq-nix-toolbox.nix @@ -0,0 +1 @@ +"e54b920493f0494ede95b5f7d083cc8b20b1f5a6" diff --git a/README.md b/README.md index 6f069a8..493d1c9 100644 --- a/README.md +++ b/README.md @@ -21,12 +21,12 @@ 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 @@ -34,6 +34,10 @@ If some mathcomp extra package is missing, there might be two reasons: + 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: diff --git a/README_TEMPLATE.md b/README_TEMPLATE.md index a6646ec..fd20de7 100644 --- a/README_TEMPLATE.md +++ b/README_TEMPLATE.md @@ -21,12 +21,12 @@ 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 @@ -34,4 +34,8 @@ If some mathcomp extra package is missing, there might be two reasons: + 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. diff --git a/default.nix b/default.nix index 71c3300..11a4ae5 100644 --- a/default.nix +++ b/default.nix @@ -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 (