diff --git a/flake.lock b/flake.lock index 9806866..f428ce8 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1788584326, - "narHash": "sha256-Fd3OB8J9JhgliQwOKcqx4M672CInxi1I5VnwsaXeSQo=", + "lastModified": 1767313136, + "narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6713828a351efa628b025a1adf7f43cbf8597513", + "rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-26.05", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index e6ada69..c82dc13 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-26.05"; + inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; outputs = { self, nixpkgs }: let diff --git a/package.nix b/package.nix index 07446fb..27d8cc5 100644 --- a/package.nix +++ b/package.nix @@ -2,8 +2,6 @@ lib, stdenv, pnpm_10, - fetchPnpmDeps, - pnpmConfigHook, nodejs_24, makeWrapper, # Pin to prisma-engines_6 (6.19.3) — package.json's `@prisma/client` + @@ -50,9 +48,8 @@ stdenv.mkDerivation (finalAttrs: { src = ./.; - pnpmDeps = fetchPnpmDeps { + pnpmDeps = pnpm_10.fetchDeps { inherit (finalAttrs) pname version src; - pnpm = pnpm_10; fetcherVersion = 3; prePnpmInstall = patchNdk; hash = "sha256-gnEfkEmHCRxDcFRlT9rdlUR38xzOdhn8iDKcsYW7QY0="; @@ -61,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = patchNdk; nativeBuildInputs = [ - pnpmConfigHook + pnpm_10.configHook pnpm_10 nodejs_24 makeWrapper