Unverified Commit 89153437 authored by Sefa Eyeoglu's avatar Sefa Eyeoglu
Browse files

treewide: override pnpm nodejs versions 



Some packages in nixpkgs were using different nodejs versions, but were
not overriding pnpm to match. Apart from reducing the derivation size,
this could prevent future issues due to version mismatches.

Signed-off-by: default avatarSefa Eyeoglu <contact@scrumplex.net>
parent 63cdea53

pkgs/by-name/cl/claude-code-router/package.nix

+5 −4
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
}:

let

  buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_24; };

  pnpm' = pnpm_9.override { nodejs = nodejs_24; };

in

buildNpmPackage' (finalAttrs: {

  pname = "claude-code-router";
@@ -32,7 +33,7 @@ buildNpmPackage' (finalAttrs: { 
  npmDeps = null;

  pnpmDeps = fetchPnpmDeps {

    inherit (finalAttrs) pname src;

    pnpm = pnpm_9;

    pnpm = pnpm';

    fetcherVersion = 2;

    hash = "sha256-BLPGTbDvvI40kuXfE/p3+s9hkE0reXr7OJA6UGXN4ys=";

  };
@@ -40,7 +41,7 @@ buildNpmPackage' (finalAttrs: { 
  nativeBuildInputs = [

    esbuild

    makeBinaryWrapper

    pnpm_9

    pnpm'

  ];



  npmConfigHook = pnpmConfigHook;
@@ -81,13 +82,13 @@ buildNpmPackage' (finalAttrs: { 
    npmDeps = null;

    pnpmDeps = fetchPnpmDeps {

      inherit (finalAttrs') pname src sourceRoot;

      pnpm = pnpm_9;

      pnpm = pnpm';

      fetcherVersion = 2;

      hash = "sha256-ZjYLUec9EADQmKfju8hMbq0y4f1TDVwjbe3yw8Gh4Ac=";

    };



    nativeBuildInputs = [

      pnpm_9

      pnpm'

    ];



    npmConfigHook = pnpmConfigHook;

pkgs/by-name/e-/e-search/package.nix

+3 −2
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
}:



let

  pnpm' = pnpm_10.override { nodejs = nodejs_20; };

  eSearch-OCR-ch = fetchzip {

    url = "https://github.com/xushengfeng/eSearch-OCR/releases/download/4.0.0/ch.zip";

    hash = "sha256-0NCXuy8k9/AdpK4ie49S8032u37gNhX6Jc6bOGufrV4=";
@@ -64,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { 


  pnpmDeps = fetchPnpmDeps {

    inherit (finalAttrs) pname version src;

    pnpm = pnpm_10;

    pnpm = pnpm';

    fetcherVersion = 2;

    prePnpmInstall = ''

      export PATH=$PATH:${gitMinimal}/bin
@@ -76,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { 
    autoPatchelfHook

    gobject-introspection

    pnpmConfigHook

    pnpm_10

    pnpm'

    makeWrapper

    nodejs_20

  ];

pkgs/by-name/mo/moonlight/package.nix

+5 −4
Original line number Diff line number Diff line
@@ -12,6 +12,9 @@ 
  discord-canary,

  discord-development,

}:

let

  pnpm' = pnpm_10.override { nodejs = nodejs_22; };

in

stdenv.mkDerivation (finalAttrs: {

  pname = "moonlight";

  version = "1.3.33";
@@ -26,14 +29,12 @@ stdenv.mkDerivation (finalAttrs: { 
  nativeBuildInputs = [

    nodejs_22

    pnpmConfigHook

    pnpm_10

    pnpm'

  ];



  pnpmDeps = fetchPnpmDeps {

    inherit (finalAttrs) pname version src;

    pnpm = pnpm_10;



    buildInputs = [ nodejs_22 ];

    pnpm = pnpm';



    fetcherVersion = 2;

    hash = "sha256-PRlgwyePFpFdQRcojGDEC4ESZEGTJf1Ad9EFgm8hmKY=";

pkgs/by-name/pa/paperless-ngx/package.nix

+5 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
  unpaper,

  fetchPnpmDeps,

  pnpmConfigHook,

  pnpm,

  pnpm_10,

  poppler-utils,

  liberation_ttf,

  xcbuild,
@@ -61,6 +61,8 @@ let 
    };

  };



  pnpm' = pnpm_10.override { nodejs = nodejs_20; };



  path = lib.makeBinPath [

    ghostscript_headless

    (imagemagickBig.override { ghostscript = ghostscript_headless; })
@@ -81,6 +83,7 @@ let 


    pnpmDeps = fetchPnpmDeps {

      inherit (finalAttrs) pname version src;

      pnpm = pnpm';

      fetcherVersion = 2;

      hash = "sha256-pG7olcBq5P52CvZYLqUjb+RwxjbQbSotlS50pvgm7WQ=";

    };
@@ -90,7 +93,7 @@ let 
      nodejs_20

      pkg-config

      pnpmConfigHook

      pnpm

      pnpm'

      python3

    ]

    ++ lib.optionals stdenv.hostPlatform.isDarwin [

pkgs/by-name/po/porn-vault/package.nix

+3 −2
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ let 
    };

  };

  nodejs = nodejs_22;

  pnpm' = pnpm_9.override { nodejs = nodejs_22; };

in

stdenvNoCC.mkDerivation (finalAttrs: {

  pname = "porn-vault";
@@ -52,7 +53,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { 


  pnpmDeps = fetchPnpmDeps {

    inherit (finalAttrs) pname version src;

    pnpm = pnpm_9;

    pnpm = pnpm';

    fetcherVersion = 1;

    hash = "sha256-Xr9tRiP1hW+aFs9FnPvPkeJ0/LtJI57cjWY5bZQaRTQ=";

  };
@@ -60,7 +61,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { 
  nativeBuildInputs = [

    nodejs

    pnpmConfigHook

    pnpm_9

    pnpm'

    makeWrapper

  ];