From 83a3030dd318fc7418cac29f57f106a59623b0ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Roche?= <jfroche@pyxel.be>
Date: Mon, 26 Jan 2026 16:11:56 +0100
Subject: [PATCH] fix: enable stickydisk again with new nix-installer-action

---
 .github/actions/nix-install-ephemeral/action.yml | 6 ++----
 .github/workflows/nix-eval.yml                   | 9 +++++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.github/actions/nix-install-ephemeral/action.yml b/.github/actions/nix-install-ephemeral/action.yml
index 934965494..ae59e9f7e 100644
--- a/.github/actions/nix-install-ephemeral/action.yml
+++ b/.github/actions/nix-install-ephemeral/action.yml
@@ -40,11 +40,9 @@ runs:
         sudo chmod +x /etc/nix/upload-to-cache.sh
       env:
         NIX_SIGN_SECRET_KEY: ${{ env.NIX_SIGN_SECRET_KEY }}
-    - name: Install nix
-      uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31.9.0
+    - uses: NixOS/nix-installer-action@61b03e15be288c02a101757b1c79573afa475773
       with:
-        install_url: https://releases.nixos.org/nix/nix-2.32.2/install
-        extra_nix_config: |
+        extra-conf: |
           substituters = https://cache.nixos.org https://nix-postgres-artifacts.s3.amazonaws.com
           trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
           ${{ inputs.push-to-cache == 'true' && 'post-build-hook = /etc/nix/upload-to-cache.sh' || '' }}
diff --git a/.github/workflows/nix-eval.yml b/.github/workflows/nix-eval.yml
index cb3f0f2fd..f5e427ce1 100644
--- a/.github/workflows/nix-eval.yml
+++ b/.github/workflows/nix-eval.yml
@@ -24,6 +24,15 @@ jobs:
     steps:
       - name: Checkout Repo
         uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
+      - name: Mount Nix cache disk
+        uses: useblacksmith/stickydisk@a652394bf1bf95399f406e648482b41fbd25c51f # v1
+        with:
+          key: ${{ github.repository }}-nix-cache-eval-${{ runner.os }}
+          path: /nix
+      - name: Remove existing Nix socket
+        run: |
+          sudo rm /nix/var/nix/daemon-socket/socket /nix/receipt.json || true
+          sudo chown root /nix /nix/var /nix/var/nix || true
       - name: Install nix
         uses: ./.github/actions/nix-install-ephemeral
         with: