From 47939bd55607e7cecfc98a33e63a1b435f796b0c Mon Sep 17 00:00:00 2001 From: t8y2 Date: Tue, 22 Sep 2026 21:23:18 +0800 Subject: [PATCH] fix(nix): refresh pnpm deps hash and accept spaced hash report format --- .github/workflows/update-nix-pnpm-hash.yml | 2 +- flake.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update-nix-pnpm-hash.yml b/.github/workflows/update-nix-pnpm-hash.yml index 3e2a9d0a75..49e819cc04 100644 --- a/.github/workflows/update-nix-pnpm-hash.yml +++ b/.github/workflows/update-nix-pnpm-hash.yml @@ -41,7 +41,7 @@ jobs: fi cat "$build_log" - expected_hash=$(sed -n 's/.*got: \(sha256-[A-Za-z0-9+/=]*\).*/\1/p' "$build_log" | tail -1) + expected_hash=$(sed -n -e 's/.*got:[[:space:]]*\(sha256-[A-Za-z0-9+/=]*\).*/\1/p' -e 's/.*use[[:space:]]"\(sha256-[A-Za-z0-9+/=]*\)".*/\1/p' "$build_log" | tail -1) if [ -z "$expected_hash" ]; then echo "Nix build failed without reporting a replacement fixed-output hash." exit 1 diff --git a/flake.nix b/flake.nix index dcffdacfd2..2aae31d57d 100644 --- a/flake.nix +++ b/flake.nix @@ -197,7 +197,7 @@ fetcherVersion = 4; # Update with the hash reported by a failed fixed-output build: # nix build .#dbx-pnpm-deps 2>&1 | grep 'got:' - hash = "sha256-8hA97KK+5J9w1YZpMEQuzFZnsXMuIQ0oSYySc3AVGcg="; + hash = "sha256-Y2St1Pf2+/R+WHd8RIbwUHeCvmYsFAh07+8LVGhOjTo="; }; # ── Step 2: vendor Cargo dependencies ───────────────────────────── #