diff options
| -rw-r--r-- | .github/workflows/nix-action.yml | 12 | ||||
| -rw-r--r-- | .nix/config.nix | 12 | ||||
| -rw-r--r-- | .nix/coq-nix-toolbox.nix | 2 | ||||
| -rw-r--r-- | default.nix | 2 |
4 files changed, 14 insertions, 14 deletions
diff --git a/.github/workflows/nix-action.yml b/.github/workflows/nix-action.yml index a9ff81a..5457181 100644 --- a/.github/workflows/nix-action.yml +++ b/.github/workflows/nix-action.yml @@ -36,8 +36,8 @@ jobs: - name: Setup build matrix id: set-matrix run: | - matrix=$(nix-shell --arg do-nothing true --run nixTasks) - echo ::set-output name=matrix::{\"task\":$(echo $matrix)}\" + matrix=$(nix-shell --arg do-nothing true --run nixBundles) + echo ::set-output name=matrix::{\"bundle\":$(echo $matrix)}\" mathcomp: runs-on: ubuntu-latest @@ -67,9 +67,9 @@ jobs: with: fetch-depth: 0 - name: Building/fetching dependencies - run: nix-build --no-out-link --argstr ci "${{ matrix.task }}" --argstr ci-job "_deps" + run: nix-build --no-out-link --argstr ci "${{ matrix.bundle }}" --argstr ci-job "_deps" - name: Building/fetching current project - run: nix-build --no-out-link --argstr ci "${{ matrix.task }}" --argstr ci-job mathcomp + run: nix-build --no-out-link --argstr ci "${{ matrix.bundle }}" --argstr ci-job mathcomp mathcomp-single: runs-on: ubuntu-latest @@ -99,7 +99,7 @@ jobs: with: fetch-depth: 0 - name: Building/fetching dependencies - run: nix-build --no-out-link --argstr ci "${{ matrix.task }}" --argstr ci-job _deps + run: nix-build --no-out-link --argstr ci "${{ matrix.bundle }}" --argstr ci-job _deps - name: Building/fetching current project - run: nix-build --no-out-link --argstr ci "${{ matrix.task }}" --argstr ci-job mathcomp-single + run: nix-build --no-out-link --argstr ci "${{ matrix.bundle }}" --argstr ci-job mathcomp-single diff --git a/.nix/config.nix b/.nix/config.nix index 2f20a52..8e8d289 100644 --- a/.nix/config.nix +++ b/.nix/config.nix @@ -16,18 +16,18 @@ ## If not specified, it defaults to "_CoqProject" coqproject = "mathcomp/_CoqProject"; - ## select an entry to build in the following `tasks` set + ## select an entry to build in the following `bundles` set ## defaults to "default" - default-task = "coq-8.13"; + default-bundle = "coq-8.13"; - ## write one `tasks.name` attribute set per + ## write one `bundles.name` attribute set per ## alternative configuration, the can be used to ## compute several ci jobs as well ## You can override Coq and other Coq coqPackages ## through the following attribute - tasks."coq-8.13".coqPackages.coq.override.version = "8.13"; - tasks."coq-8.12".coqPackages.coq.override.version = "8.12"; - tasks."coq-8.11".coqPackages.coq.override.version = "8.11"; + bundles."coq-8.13".coqPackages.coq.override.version = "8.13"; + bundles."coq-8.12".coqPackages.coq.override.version = "8.12"; + bundles."coq-8.11".coqPackages.coq.override.version = "8.11"; } diff --git a/.nix/coq-nix-toolbox.nix b/.nix/coq-nix-toolbox.nix index 8fb74c6..7049c5d 100644 --- a/.nix/coq-nix-toolbox.nix +++ b/.nix/coq-nix-toolbox.nix @@ -1 +1 @@ -"8fd39e891d8d5a74321b156d68bc3c615560dade" +"751410ed320b348e8d066b1b939db0eab40f3a93" diff --git a/default.nix b/default.nix index dbc0c1b..916aa51 100644 --- a/default.nix +++ b/default.nix @@ -1,7 +1,7 @@ { config ? {}, withEmacs ? false, print-env ? false, do-nothing ? false, update-nixpkgs ? false, ci-matrix ? false, override ? {}, ocaml-override ? {}, global-override ? {}, - task ? null, job ? null, inNixShell ? null, src ? ./., + bundle ? null, job ? null, inNixShell ? null, src ? ./., }@args: let auto = fetchGit { url = "https://github.com/coq-community/coq-nix-toolbox.git"; |