Merge pull request #725 from math-comp/nix_v2

Update nix CI

4 files changed, 12 insertions, 12 deletions

diff --git a/.github/workflows/nix-action.yml b/.github/workflows/nix-action.yml
index 4e8130a..a9ff81a 100644
--- a/.github/workflows/nix-action.yml
+++ b/.github/workflows/nix-action.yml
@@ -39,7 +39,7 @@ jobs:
         matrix=$(nix-shell --arg do-nothing true --run nixTasks)
         echo ::set-output name=matrix::{\"task\":$(echo $matrix)}\"
 
-  main:
+  mathcomp:
     runs-on: ubuntu-latest
     needs:
     - setup
@@ -67,11 +67,11 @@ jobs:
       with:
         fetch-depth: 0
     - name: Building/fetching dependencies
-      run: nix-build --no-out-link --argstr ci "${{ matrix.task }}" --argstr ci-job dependencies
+      run: nix-build --no-out-link --argstr ci "${{ matrix.task }}" --argstr ci-job "_deps"
     - name: Building/fetching current project
-      run: nix-build --no-out-link --argstr ci "${{ matrix.task }}" --argstr ci-job main
+      run: nix-build --no-out-link --argstr ci "${{ matrix.task }}" --argstr ci-job mathcomp
 
-  shell:
+  mathcomp-single:
     runs-on: ubuntu-latest
     needs:
     - setup
@@ -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 dependencies
+      run: nix-build --no-out-link --argstr ci "${{ matrix.task }}" --argstr ci-job _deps
     - name: Building/fetching current project
-      run: nix-build --no-out-link --argstr ci "${{ matrix.task }}" --argstr ci-job shell
+      run: nix-build --no-out-link --argstr ci "${{ matrix.task }}" --argstr ci-job mathcomp-single
 
diff --git a/.nix/config.nix b/.nix/config.nix
index 5656f01..2f20a52 100644
--- a/.nix/config.nix
+++ b/.nix/config.nix
@@ -6,11 +6,11 @@
 
   ## The attribute to build, either from nixpkgs
   ## of from the overlays located in `.nix/coq-overlays`
-  coq-attribute = "mathcomp";
+  attribute = "mathcomp";
 
   ## If you want to select a different attribute
   ## to serve as a basis for nix-shell edit this
-  shell-coq-attribute = "mathcomp-single";
+  shell-attribute = "mathcomp-single";
 
   ## Indicate the relative location of your _CoqProject
   ## If not specified, it defaults to "_CoqProject"
@@ -18,7 +18,7 @@
 
   ## select an entry to build in the following `tasks` set
   ## defaults to "default"
-  select = "coq-8.13";
+  default-task = "coq-8.13";
 
   ## write one `tasks.name` attribute set per
   ## alternative configuration, the can be used to
diff --git a/.nix/coq-nix-toolbox.nix b/.nix/coq-nix-toolbox.nix
index 5499a57..8fb74c6 100644
--- a/.nix/coq-nix-toolbox.nix
+++ b/.nix/coq-nix-toolbox.nix
@@ -1 +1 @@
-"de89ff16c149b7a7aec3cfe9d379641ee1aca229"
+"8fd39e891d8d5a74321b156d68bc3c615560dade"
diff --git a/default.nix b/default.nix
index a588f43..dbc0c1b 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, ci-job ? null,
+  update-nixpkgs ? false, ci-matrix ? false,
   override ? {}, ocaml-override ? {}, global-override ? {},
-  ci ? (!isNull ci-job), inNixShell ? null, src ? ./.,
+  task ? null, job ? null, inNixShell ? null, src ? ./.,
 }@args:
 let auto = fetchGit {
   url = "https://github.com/coq-community/coq-nix-toolbox.git";