fix(nix): refresh pnpm deps hash and accept spaced hash report format

This commit is contained in:
t8y2
2026-09-22 22:33:07 +08:00
parent 4c1809f0c7
commit 47939bd556
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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 ───────────────────────────── #