Compare commits

..

2 commits

Author SHA1 Message Date
54dd3f51d7 nix: migrate to top-level fetchPnpmDeps and pnpmConfigHook
Some checks failed
Docker image / build-and-push-image (push) Has been cancelled
pnpm_10.fetchDeps / pnpm_10.configHook are deprecated shims on
nixos-unstable and warn on every evaluation. The shims forwarded to
exactly these attributes (fetchDeps passed pnpm = pnpm_10; configHook
propagated pnpm_10, which is already in nativeBuildInputs), so the
pnpmDeps hash is unchanged.

Verified by building against server-deploy's pinned nixpkgs
(56c02bc) via --override-input, and evaluating standalone on the
nixos-26.05 lock.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Nx87UjQtd1HS5u4DwCMve8
2026-09-06 19:13:54 +02:00
a0c17bf99f nix: track nixos-26.05 in the standalone flake
nixos-25.05 predates the top-level fetchPnpmDeps / pnpmConfigHook
attributes the next commit moves to. server-deploy overrides this
input via follows, so only standalone builds are affected.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Nx87UjQtd1HS5u4DwCMve8
2026-09-06 19:13:54 +02:00
3 changed files with 10 additions and 7 deletions

8
flake.lock generated
View file

@ -2,16 +2,16 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1767313136, "lastModified": 1788584326,
"narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=", "narHash": "sha256-Fd3OB8J9JhgliQwOKcqx4M672CInxi1I5VnwsaXeSQo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d", "rev": "6713828a351efa628b025a1adf7f43cbf8597513",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-25.05", "ref": "nixos-26.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

View file

@ -1,7 +1,7 @@
{ {
description = "nsecbunkerd — Nostr remote signing daemon (NIP-46)"; description = "nsecbunkerd — Nostr remote signing daemon (NIP-46)";
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05";
outputs = { self, nixpkgs }: outputs = { self, nixpkgs }:
let let

View file

@ -2,6 +2,8 @@
lib, lib,
stdenv, stdenv,
pnpm_10, pnpm_10,
fetchPnpmDeps,
pnpmConfigHook,
nodejs_24, nodejs_24,
makeWrapper, makeWrapper,
# Pin to prisma-engines_6 (6.19.3) — package.json's `@prisma/client` + # Pin to prisma-engines_6 (6.19.3) — package.json's `@prisma/client` +
@ -48,8 +50,9 @@ stdenv.mkDerivation (finalAttrs: {
src = ./.; src = ./.;
pnpmDeps = pnpm_10.fetchDeps { pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src; inherit (finalAttrs) pname version src;
pnpm = pnpm_10;
fetcherVersion = 3; fetcherVersion = 3;
prePnpmInstall = patchNdk; prePnpmInstall = patchNdk;
hash = "sha256-gnEfkEmHCRxDcFRlT9rdlUR38xzOdhn8iDKcsYW7QY0="; hash = "sha256-gnEfkEmHCRxDcFRlT9rdlUR38xzOdhn8iDKcsYW7QY0=";
@ -58,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
postPatch = patchNdk; postPatch = patchNdk;
nativeBuildInputs = [ nativeBuildInputs = [
pnpm_10.configHook pnpmConfigHook
pnpm_10 pnpm_10
nodejs_24 nodejs_24
makeWrapper makeWrapper