diff options
| author | Cyril Cohen | 2021-03-12 17:30:13 +0100 |
|---|---|---|
| committer | GitHub | 2021-03-12 17:30:13 +0100 |
| commit | efcea89b58f1c8c9a66b59284fdb884581cd7e0b (patch) | |
| tree | 44e2e2682fecec863cd0c8a3a2e2e6382e2e9c40 | |
| parent | 0e8ddcaa4f3887b599415870c73a49ceec372016 (diff) | |
Update nix toolbox version (#715)
* toolbox update
* remove unnecessary step
* update local shell version
| -rw-r--r-- | .github/workflows/nix-action.yml | 12 | ||||
| -rw-r--r-- | .nix/coq-nix-toolbox.nix | 2 | ||||
| -rw-r--r-- | .nix/coq-overlays/mathcomp-single/default.nix | 2 |
3 files changed, 7 insertions, 9 deletions
diff --git a/.github/workflows/nix-action.yml b/.github/workflows/nix-action.yml index dc920d9..4e8130a 100644 --- a/.github/workflows/nix-action.yml +++ b/.github/workflows/nix-action.yml @@ -9,7 +9,7 @@ on: - '**' jobs: - dependencies: + setup: runs-on: ubuntu-latest outputs: matrix: ${{ steps.set-matrix.outputs.matrix }} @@ -33,8 +33,6 @@ jobs: uses: actions/checkout@v2 with: fetch-depth: 0 - - name: Building/fetching dependencies - run: nix-build --argstr ci-job dependencies - name: Setup build matrix id: set-matrix run: | @@ -44,9 +42,9 @@ jobs: main: runs-on: ubuntu-latest needs: - - dependencies + - setup strategy: - matrix: ${{fromJson(needs.dependencies.outputs.matrix)}} + matrix: ${{fromJson(needs.setup.outputs.matrix)}} fail-fast: false steps: - name: Cachix install @@ -76,9 +74,9 @@ jobs: shell: runs-on: ubuntu-latest needs: - - dependencies + - setup strategy: - matrix: ${{fromJson(needs.dependencies.outputs.matrix)}} + matrix: ${{fromJson(needs.setup.outputs.matrix)}} fail-fast: false steps: - name: Cachix install diff --git a/.nix/coq-nix-toolbox.nix b/.nix/coq-nix-toolbox.nix index 4267323..b227c71 100644 --- a/.nix/coq-nix-toolbox.nix +++ b/.nix/coq-nix-toolbox.nix @@ -1 +1 @@ -"6bc8d19328c17c44d787da39b1794255cd244008" +"abedd5c5b61c5650f661993b16c113e0672b2b94" diff --git a/.nix/coq-overlays/mathcomp-single/default.nix b/.nix/coq-overlays/mathcomp-single/default.nix index 65be1c4..c58be5b 100644 --- a/.nix/coq-overlays/mathcomp-single/default.nix +++ b/.nix/coq-overlays/mathcomp-single/default.nix @@ -1,2 +1,2 @@ { mathcomp, version ? null }: -mathcomp.override {single = true; version = null;} +mathcomp.override {single = true; inherit version;} |