diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 7f853358c164..c89a8b709df0 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -119,6 +119,7 @@ mapAliases { parcel-bundler = parcel; # added 2023-09-04 pkg = pkgs.vercel-pkg; # added 2023-10-04 inherit (pkgs) pm2; # added 2024-01-22 + inherit (pkgs) pnpm; # added 2024-06-26 prettier_d_slim = pkgs.prettier-d-slim; # added 2023-09-14 inherit (pkgs) pxder; # added 2023-09-26 inherit (pkgs) quicktype; # added 2023-09-09 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 003445804e73..0d2a10d51da8 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -181,7 +181,6 @@ , "patch-package" , "peerflix" , "peerflix-server" -, "pnpm" , "poor-mans-t-sql-formatter-cli" , "postcss" , "postcss-cli" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 82d127df70f2..761085cc1f63 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -85656,24 +85656,6 @@ in bypassCache = true; reconstructLock = true; }; - pnpm = nodeEnv.buildNodePackage { - name = "pnpm"; - packageName = "pnpm"; - version = "9.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-9.3.0.tgz"; - sha512 = "7nuT4MK9EUCcZCT5K4ZvMdPqG+9fvkfTx1AM3DyWaIM9LlVoGtZt9bZAxh+p3CXVRu+lTXbX+L9UsTYUrCk2MQ=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Fast, disk space efficient package manager"; - homepage = "https://pnpm.io"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; poor-mans-t-sql-formatter-cli = nodeEnv.buildNodePackage { name = "poor-mans-t-sql-formatter-cli"; packageName = "poor-mans-t-sql-formatter-cli"; diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index 7f56b6d74c51..c725197bddb6 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -217,25 +217,6 @@ final: prev: { ''; }; - pnpm = prev.pnpm.override { - nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; - - preRebuild = '' - sed 's/"link:/"file:/g' --in-place package.json - ''; - - postInstall = let - pnpmLibPath = lib.makeBinPath [ - nodejs.passthru.python - nodejs - ]; - in '' - for prog in $out/bin/*; do - wrapProgram "$prog" --prefix PATH : ${pnpmLibPath} - done - ''; - }; - postcss-cli = prev.postcss-cli.override (oldAttrs: let esbuild-version = (lib.findFirst (dep: dep.name == "esbuild") null oldAttrs.dependencies).version; esbuild-linux-x64 = {