From 557961a46a32af03a6c2c15a63a04262511f5204 Mon Sep 17 00:00:00 2001 From: Doreen Date: Thu, 22 Oct 2026 11:33:35 +0200 Subject: [PATCH] ci: install upstream Nix with cachix/install-nix-action --- .github/actions/setup-nix/action.yml | 13 ++----------- .github/workflows/flake-closure-diff.yml | 5 +---- .github/workflows/renovate-dev-kit-lock.yml | 7 ++----- 3 files changed, 5 insertions(+), 20 deletions(-) diff --git a/.github/actions/setup-nix/action.yml b/.github/actions/setup-nix/action.yml index d8cff97..4dd1900 100644 --- a/.github/actions/setup-nix/action.yml +++ b/.github/actions/setup-nix/action.yml @@ -20,17 +20,8 @@ runs: using: composite steps: - name: Install nix - uses: DeterminateSystems/nix-installer-action@3138316df39ed29be04236d7ffc686fa525866aa # v23 - with: - # Use upstream Nix, not the Determinate fork (avoids the - # determinate-nixd binary + FlakeHub auto-enablement we don't want). - # Upstream announced this option would stop working on 2026-01-01; - # nix-installer still honours --prefer-upstream-nix as of 2026-08-31, - # but the action always fetches the latest installer, so this is not - # pinned. If it ever flips, this is the one place to change. - determinate: false - # Don't post install telemetry to Determinate Systems. - diagnostic-endpoint: '' + # Upstream Nix, with the version pinned by the action. + uses: cachix/install-nix-action@448cde739abec1eaf0646249e3d25bb8d9bc7702 # v31.11.2 - name: Use ${{ inputs.cachix-name }} Cachix cache uses: cachix/cachix-action@38b082610b782e7e93e209c35fd730d399dee866 # v17 with: diff --git a/.github/workflows/flake-closure-diff.yml b/.github/workflows/flake-closure-diff.yml index 7b9f406..27ece6b 100644 --- a/.github/workflows/flake-closure-diff.yml +++ b/.github/workflows/flake-closure-diff.yml @@ -46,10 +46,7 @@ jobs: # would need the release's own SHA before that commit exists. Keep these # two pins in step with .github/actions/setup-nix. - name: Install nix - uses: DeterminateSystems/nix-installer-action@3138316df39ed29be04236d7ffc686fa525866aa # v23 - with: - determinate: false - diagnostic-endpoint: '' + uses: cachix/install-nix-action@448cde739abec1eaf0646249e3d25bb8d9bc7702 # v31.11.2 - name: Use the shared Cachix cache uses: cachix/cachix-action@38b082610b782e7e93e209c35fd730d399dee866 # v17 with: diff --git a/.github/workflows/renovate-dev-kit-lock.yml b/.github/workflows/renovate-dev-kit-lock.yml index 349083a..cce6b94 100644 --- a/.github/workflows/renovate-dev-kit-lock.yml +++ b/.github/workflows/renovate-dev-kit-lock.yml @@ -67,11 +67,8 @@ jobs: sparse-checkout-cone-mode: false persist-credentials: false - name: Install nix - uses: DeterminateSystems/nix-installer-action@3138316df39ed29be04236d7ffc686fa525866aa # v23 - with: - # Upstream Nix and no telemetry, as in setup-nix. - determinate: false - diagnostic-endpoint: '' + # Upstream Nix, as in setup-nix. + uses: cachix/install-nix-action@448cde739abec1eaf0646249e3d25bb8d9bc7702 # v31.11.2 - name: Relock id: relock working-directory: repo