Unverified Commit f5c2101b authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 835dd6a0 99feb072

.github/workflows/build.yml

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ jobs: 
        with:

          merged-as-untrusted-at: ${{ inputs.mergedSha }}



      - uses: cachix/install-nix-action@9280e7aca88deada44c930f1e2c78e21c3ae3edd # v31

      - uses: cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801 # v31

        with:

          # Sandbox is disabled on MacOS by default.

          extra_nix_config: sandbox = true

.github/workflows/check.yml

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ jobs: 
        with:

          merged-as-untrusted-at: ${{ inputs.mergedSha }}



      - uses: cachix/install-nix-action@9280e7aca88deada44c930f1e2c78e21c3ae3edd # v31

      - uses: cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801 # v31



      - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16

        with:

.github/workflows/eval.yml

+4 −4
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ jobs: 
            ci/pinned.json



      - name: Install Nix

        uses: cachix/install-nix-action@9280e7aca88deada44c930f1e2c78e21c3ae3edd # v31

        uses: cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801 # v31



      - name: Load supported versions

        id: versions
@@ -92,7 +92,7 @@ jobs: 
          target-as-trusted-at: ${{ inputs.targetSha }}



      - name: Install Nix

        uses: cachix/install-nix-action@9280e7aca88deada44c930f1e2c78e21c3ae3edd # v31

        uses: cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801 # v31



      - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16

        with:
@@ -190,7 +190,7 @@ jobs: 
          merge-multiple: true



      - name: Install Nix

        uses: cachix/install-nix-action@9280e7aca88deada44c930f1e2c78e21c3ae3edd # v31

        uses: cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801 # v31



      - name: Combine all output paths and eval stats

        run: |
@@ -350,7 +350,7 @@ jobs: 
          merged-as-untrusted-at: ${{ inputs.mergedSha }}



      - name: Install Nix

        uses: cachix/install-nix-action@9280e7aca88deada44c930f1e2c78e21c3ae3edd # v31

        uses: cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801 # v31



      - name: Run misc eval tasks in parallel

        run: |

.github/workflows/lint.yml

+3 −3
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ jobs: 
        with:

          merged-as-untrusted-at: ${{ inputs.mergedSha }}



      - uses: cachix/install-nix-action@9280e7aca88deada44c930f1e2c78e21c3ae3edd # v31

      - uses: cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801 # v31



      # TODO: Figure out how to best enable caching for the treefmt job. Cachix won't work well,

      # because the cache would be invalidated on every commit - treefmt checks every file.
@@ -66,7 +66,7 @@ jobs: 
        with:

          merged-as-untrusted-at: ${{ inputs.mergedSha }}



      - uses: cachix/install-nix-action@9280e7aca88deada44c930f1e2c78e21c3ae3edd # v31

      - uses: cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801 # v31



      - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16

        with:
@@ -94,7 +94,7 @@ jobs: 
          merged-as-untrusted-at: ${{ inputs.mergedSha }}

          target-as-trusted-at: ${{ inputs.targetSha }}



      - uses: cachix/install-nix-action@9280e7aca88deada44c930f1e2c78e21c3ae3edd # v31

      - uses: cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801 # v31



      - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16

        with:

.github/workflows/reviewers.yml

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ jobs: 
          sparse-checkout: ci



      - name: Install Nix

        uses: cachix/install-nix-action@9280e7aca88deada44c930f1e2c78e21c3ae3edd # v31

        uses: cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801 # v31



      - name: Build the requestReviews derivation

        run: nix-build trusted/ci -A requestReviews