Unverified Commit 65b04e5f authored by Sefa Eyeoglu's avatar Sefa Eyeoglu
Browse files

treewide: migrate to fetchPnpmDeps and pnpmConfigHook 



This moves all packages to the new top-level attributes introduced
previously.

This doesn't cause any rebuilds.

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

pkgs/applications/audio/youtube-music/default.nix

+7 −4
Original line number Diff line number Diff line
@@ -7,11 +7,12 @@ 
  python3,

  copyDesktopItems,

  nodejs,

  pnpm,

  pnpm_10,

  fetchPnpmDeps,

  pnpmConfigHook,

  makeDesktopItem,

  nix-update-script,

}:



stdenv.mkDerivation (finalAttrs: {

  pname = "youtube-music";

  version = "3.11.0";
@@ -28,8 +29,9 @@ stdenv.mkDerivation (finalAttrs: { 
    ./fix-mpris-desktop-entry.patch

  ];



  pnpmDeps = pnpm.fetchDeps {

  pnpmDeps = fetchPnpmDeps {

    inherit (finalAttrs) pname version src;

    pnpm = pnpm_10;

    fetcherVersion = 2;

    hash = "sha256-xZQ8rnLGD0ZxxUUPLHmNJ6mA+lnUHCTBvtJTiIPxaZU=";

  };
@@ -38,7 +40,8 @@ stdenv.mkDerivation (finalAttrs: { 
    makeWrapper

    python3

    nodejs

    pnpm.configHook

    pnpmConfigHook

    pnpm_10

  ]

  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ copyDesktopItems ];

pkgs/applications/editors/vscode/extensions/eamodio.gitlens/default.nix

+4 −2
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ 
  stdenv,

  fetchFromGitHub,

  pnpm,

  fetchPnpmDeps,

  pnpmConfigHook,

  nodejs,

  vscode-utils,

  nix-update-script,
@@ -22,7 +24,7 @@ let 
      hash = "sha256-9XEv50WIG1BJenY9MswES6d72Ead2VqW5dgBr7Eu8ek=";

    };



    pnpmDeps = pnpm.fetchDeps {

    pnpmDeps = fetchPnpmDeps {

      inherit (finalAttrs) pname version src;

      fetcherVersion = 2;

      hash = "sha256-QHITHoaz/lzZ3Th/YPlQayFMU9rtlnAZWEYkLyBuAkc=";
@@ -36,7 +38,7 @@ let 


    nativeBuildInputs = [

      nodejs

      pnpm.configHook

      pnpmConfigHook

      pnpm

    ];

pkgs/applications/editors/vscode/extensions/kilocode.kilo-code/default.nix

+4 −2
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ 
  stdenvNoCC,

  fetchFromGitHub,

  pnpm,

  fetchPnpmDeps,

  pnpmConfigHook,

  nodejs,

  vscode-utils,

  nix-update-script,
@@ -21,7 +23,7 @@ let 
      hash = "sha256-Dy0dd07pWsSbrO6BX7GEYf7CunXD0itaeIFRv9mQJks=";

    };



    pnpmDeps = pnpm.fetchDeps {

    pnpmDeps = fetchPnpmDeps {

      inherit (finalAttrs) pname version src;

      fetcherVersion = 2;

      hash = "sha256-hxgzmJD+Sl7E+ape1M1/Xl8XLtAhtht3AE45zHFctsQ=";
@@ -29,7 +31,7 @@ let 


    nativeBuildInputs = [

      nodejs

      pnpm.configHook

      pnpmConfigHook

      pnpm

    ];

pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix

+4 −2
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ 
  stdenvNoCC,

  fetchFromGitHub,

  pnpm,

  fetchPnpmDeps,

  pnpmConfigHook,

  nodejs,

  vscode-utils,

  nix-update-script,
@@ -21,7 +23,7 @@ let 
      hash = "sha256-YO3TxKcCDoIJeBoMGFFrHUp6lne1e84Tf1I2vHF6w1c=";

    };



    pnpmDeps = pnpm.fetchDeps {

    pnpmDeps = fetchPnpmDeps {

      inherit (finalAttrs) pname version src;

      fetcherVersion = 2;

      hash = "sha256-k6Bw6MlFDNPNPdaKJ7tW8wje2j9LJvREtlAWyySnOC0=";
@@ -29,7 +31,7 @@ let 


    nativeBuildInputs = [

      nodejs

      pnpm.configHook

      pnpmConfigHook

      pnpm

    ];

pkgs/build-support/node/fetch-pnpm-deps/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ in 
                --registry="$NIX_NPM_REGISTRY" \

                --frozen-lockfile



            # Store newer fetcherVersion in case pnpm.configHook also needs it

            # Store newer fetcherVersion in case pnpmConfigHook also needs it

            if [[ ${toString fetcherVersion} -gt 1 ]]; then

              echo ${toString fetcherVersion} > $out/.fetcher-version

            fi