Merge pull request #322580 from pyrox0/nodepackages-drop-git-standup

nodePackages.{git-standup, pnpm}: Remove from nodePackages

pkgs/by-name/mo/modrinth-app-unwrapped/package.nix

@@ -15,7 +15,8 @@
   jq,
   libsoup,
   moreutils,
-  nodePackages,
+  pnpm_8,
+  nodejs,
   openssl,
   pkg-config,
   webkitgtk,
@@ -51,7 +52,7 @@ rustPlatform.buildRustPackage {
       cacert
       jq
       moreutils
-      nodePackages.pnpm
+      pnpm_8
     ];
 
     # https://github.com/NixOS/nixpkgs/blob/763e59ffedb5c25774387bf99bc725df5df82d10/pkgs/applications/misc/pot/default.nix#L56
@@ -77,7 +78,8 @@ rustPlatform.buildRustPackage {
   nativeBuildInputs = [
     cargo-tauri
     desktop-file-utils
-    nodePackages.pnpm
+    pnpm_8
+    nodejs
     pkg-config
   ];
 

pkgs/development/node-packages/aliases.nix

@@ -84,6 +84,7 @@ mapAliases {
   flood = pkgs.flood; # Added 2023-07-25
   generator-code = throw "generator-code was removed because it provides no executable"; # added 2023-09-24
   git-ssb = throw "git-ssb was removed because it was broken"; # added 2023-08-21
+  inherit (pkgs) git-standup; # added 2024-06-26
   inherit (pkgs) gitmoji-cli; # added 2023-09-23
   glob = pkgs.node-glob; # added 2023-08-18
   inherit (pkgs) gqlint; # added 2023-08-19
@@ -118,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

pkgs/development/node-packages/node-packages.json

@@ -114,7 +114,6 @@
 , "gatsby-cli"
 , "get-graphql-schema"
 , "git-run"
-, "git-standup"
 , "@gitbeaker/cli"
 , "gramma"
 , "grammarly-languageserver"
@@ -182,7 +181,6 @@
 , "patch-package"
 , "peerflix"
 , "peerflix-server"
-, "pnpm"
 , "poor-mans-t-sql-formatter-cli"
 , "postcss"
 , "postcss-cli"

pkgs/development/node-packages/node-packages.nix

@@ -74299,24 +74299,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  git-standup = nodeEnv.buildNodePackage {
-    name = "git-standup";
-    packageName = "git-standup";
-    version = "2.3.2";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/git-standup/-/git-standup-2.3.2.tgz";
-      sha512 = "vDYicak+2y+u6TCtneCx/j6LuT9WhJShyWjTB5dhjXqTB9TJ/uF444OmYwrMlaT0/CqxHOV9NXlML+CR8AJxdA==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Recall what you did on the last working day. Psst! or be nosy and find what someone else in your team did ;-)";
-      homepage = "https://github.com/kamranahmedse/git-standup#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   "@gitbeaker/cli" = nodeEnv.buildNodePackage {
     name = "_at_gitbeaker_slash_cli";
     packageName = "@gitbeaker/cli";
@@ -85674,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";

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 = {