From a0c17bf99f99332ee7119af00c1223215328500f Mon Sep 17 00:00:00 2001 From: Padreug Date: Sun, 6 Sep 2026 19:13:54 +0200 Subject: [PATCH 1/2] 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 Claude-Session: https://claude.ai/code/session_01Nx87UjQtd1HS5u4DwCMve8 --- flake.lock | 8 ++++---- flake.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index f428ce8..9806866 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1767313136, - "narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=", + "lastModified": 1788584326, + "narHash": "sha256-Fd3OB8J9JhgliQwOKcqx4M672CInxi1I5VnwsaXeSQo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d", + "rev": "6713828a351efa628b025a1adf7f43cbf8597513", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-26.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index c82dc13..e6ada69 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { 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 }: let From 54dd3f51d73255e87492b6bde32ce6dc886ddc86 Mon Sep 17 00:00:00 2001 From: Padreug Date: Sun, 6 Sep 2026 19:13:54 +0200 Subject: [PATCH 2/2] nix: migrate to top-level fetchPnpmDeps and pnpmConfigHook 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 Claude-Session: https://claude.ai/code/session_01Nx87UjQtd1HS5u4DwCMve8 --- package.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/package.nix b/package.nix index 27d8cc5..07446fb 100644 --- a/package.nix +++ b/package.nix @@ -2,6 +2,8 @@ lib, stdenv, pnpm_10, + fetchPnpmDeps, + pnpmConfigHook, nodejs_24, makeWrapper, # Pin to prisma-engines_6 (6.19.3) — package.json's `@prisma/client` + @@ -48,8 +50,9 @@ stdenv.mkDerivation (finalAttrs: { src = ./.; - pnpmDeps = pnpm_10.fetchDeps { + pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + pnpm = pnpm_10; fetcherVersion = 3; prePnpmInstall = patchNdk; hash = "sha256-gnEfkEmHCRxDcFRlT9rdlUR38xzOdhn8iDKcsYW7QY0="; @@ -58,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = patchNdk; nativeBuildInputs = [ - pnpm_10.configHook + pnpmConfigHook pnpm_10 nodejs_24 makeWrapper