From 41c866b82aaa1f3aa2a1179bef4c43a7392f0a8b Mon Sep 17 00:00:00 2001 From: Cyril Cohen Date: Thu, 3 Nov 2022 15:19:16 +0100 Subject: [PATCH] update toolbox --- .github/workflows/nix.yml | 18 +++++++++--------- .nix/coq-nix-toolbox.nix | 2 +- matrix/default.nix | 3 +++ shells/.nix/nixpkgs.nix | 4 ---- 4 files changed, 13 insertions(+), 14 deletions(-) delete mode 100644 shells/.nix/nixpkgs.nix diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index f8f7287..ed60079 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -12,7 +12,7 @@ jobs: matrix: ${{ steps.set-matrix.outputs.matrix }} steps: - name: Checkout - uses: actions/checkout@v2.1.1 + uses: actions/checkout@v2.5.0 - uses: cachix/install-nix-action@v12 with: nix_path: nixpkgs=channel:nixpkgs-unstable @@ -28,10 +28,10 @@ jobs: fail-fast: false matrix: ${{fromJson(needs.setup.outputs.matrix)}} steps: - - uses: cachix/install-nix-action@v12 + - uses: cachix/install-nix-action@v18 with: nix_path: nixpkgs=channel:nixpkgs-unstable - - uses: cachix/cachix-action@v8 + - uses: cachix/cachix-action@v12 with: # Name of a cachix cache to push and pull/substitute name: math-comp @@ -39,11 +39,11 @@ jobs: # Authentication token for Cachix, needed only for private cache access authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - name: Checkout - uses: actions/checkout@v2.1.1 + uses: actions/checkout@v2.5.0 - name: Building mathcomp-full-shell target if required run: | overrides="{coq = \"${{ matrix.coq }}\"; mathcomp = \"${{ matrix.mc }}\";}" - storepath=$(nix eval "(\"\${import ./. {override = $overrides;}}\")") + storepath=$(nix eval --raw --impure --expr "import ./. {override = $overrides;}") hash=$(echo $storepath | sed "s/\"//mg" | xargs basename | cut -d- -f1) url=https://math-comp.cachix.org/$hash.narinfo if curl --output /dev/null --silent --head --fail "$url"; then @@ -58,10 +58,10 @@ jobs: runs-on: ubuntu-latest needs: builds steps: - - uses: cachix/install-nix-action@v12 + - uses: cachix/install-nix-action@v18 with: nix_path: nixpkgs=channel:nixpkgs-unstable - - uses: cachix/cachix-action@v8 + - uses: cachix/cachix-action@v12 with: # Name of a cachix cache to push and pull/substitute name: math-comp @@ -70,13 +70,13 @@ jobs: authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' ## does not work because the PR is updated only once - name: Checkout - uses: actions/checkout@v2.1.1 + uses: actions/checkout@v2.5.0 - name: Update README.md id: set-nixenv run: | ./update-readme.sh - name: Commit README.md - uses: EndBug/add-and-commit@v7 + uses: EndBug/add-and-commit@v9.1.1 with: message: 'Updating README.md' add: 'README.md' diff --git a/.nix/coq-nix-toolbox.nix b/.nix/coq-nix-toolbox.nix index 2f46c79..a965d3f 100644 --- a/.nix/coq-nix-toolbox.nix +++ b/.nix/coq-nix-toolbox.nix @@ -1 +1 @@ -"c003251246e91fe279cd01348af89d73e36b02a3" +"cd64bd6bca24e9de1de19ecec8e2f47a97b0d20f" diff --git a/matrix/default.nix b/matrix/default.nix index 7d5bbc9..5f1d035 100644 --- a/matrix/default.nix +++ b/matrix/default.nix @@ -3,6 +3,9 @@ with import {}; with builtins; with lib; let old-coq = [ "8.9" "8.8" "8.7" ]; mc-coq-set = { + "1.15.0" = [ "8.16" "8.15" "8.14" "8.13" ]; + "1.14.0" = [ "8.15" "8.14" "8.13" "8.12" "8.11" ]; + "1.13.0" = [ "8.14" "8.13" "8.12" "8.11" ]; "1.12.0" = [ "8.13" "8.12" "8.11" "8.10" ]; "1.11.0" = [ "8.12" "8.11" "8.10" ] ++ old-coq; "1.10.0" = [ "8.11" "8.10" ] ++ old-coq; diff --git a/shells/.nix/nixpkgs.nix b/shells/.nix/nixpkgs.nix deleted file mode 100644 index 8b0bbd8..0000000 --- a/shells/.nix/nixpkgs.nix +++ /dev/null @@ -1,4 +0,0 @@ -fetchTarball { - url = https://github.com/CohenCyril/nixpkgs/archive/f16c416fc6feab978b95cfd0776d0813c7e4fe08.tar.gz; - sha256 = "152dfhzvn2kyslga568vswqsq9gj6hhbig62145vl4wzcrjzzczg"; - }