From 4a5f675c7890b4e8c44f669e061d2131acc9bbbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 29 Jun 2026 15:51:32 -0700 Subject: [PATCH] pnpm: don't require knownVulnerabilities to be set --- pkgs/development/tools/pnpm/default.nix | 13 +++++++------ pkgs/development/tools/pnpm/generic.nix | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix index 58a8fa8ed79f..cbd81c20526e 100644 --- a/pkgs/development/tools/pnpm/default.nix +++ b/pkgs/development/tools/pnpm/default.nix @@ -72,12 +72,13 @@ let callPnpm = variant: - callPackage ./generic.nix { - inherit (variant) version hash; - knownVulnerabilities = variant.knownVulnerabilities or [ ]; - #FIXME: remove this hack in a future version. - nodejs = null; # Passing null to detect out-of-tree overrides - }; + callPackage ./generic.nix ( + variant + // { + #FIXME: remove this hack in a future version. + nodejs = null; # Passing null to detect out-of-tree overrides + } + ); mkPnpm = versionSuffix: variant: nameValuePair "pnpm_${versionSuffix}" (callPnpm variant); in diff --git a/pkgs/development/tools/pnpm/generic.nix b/pkgs/development/tools/pnpm/generic.nix index f3cdc920f26d..9de5e0ab6bef 100644 --- a/pkgs/development/tools/pnpm/generic.nix +++ b/pkgs/development/tools/pnpm/generic.nix @@ -17,7 +17,7 @@ withNode ? true, version, hash, - knownVulnerabilities, + knownVulnerabilities ? [ ], }: let majorVersion = lib.versions.major version;