From 506df4e38e242bfad65be880a8b76443bf1d0399 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Fri, 4 Oct 2024 15:30:52 -0700
Subject: [PATCH] nodePackages.npm: drop

---
 nixos/modules/services/web-apps/node-red.nix   |  2 +-
 pkgs/development/node-packages/aliases.nix     |  1 +
 .../node-packages/node-packages.json           |  1 -
 .../node-packages/node-packages.nix            | 18 ------------------
 pkgs/servers/authelia/update.sh                |  2 +-
 5 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/nixos/modules/services/web-apps/node-red.nix b/nixos/modules/services/web-apps/node-red.nix
index 4c095ea79bbd..9d64e519a92b 100644
--- a/nixos/modules/services/web-apps/node-red.nix
+++ b/nixos/modules/services/web-apps/node-red.nix
@@ -118,7 +118,7 @@ in
       environment = {
         HOME = cfg.userDir;
       };
-      path = lib.optionals cfg.withNpmAndGcc [ pkgs.nodePackages.npm pkgs.gcc ];
+      path = lib.optionals cfg.withNpmAndGcc [ pkgs.nodejs pkgs.gcc ];
       serviceConfig = mkMerge [
         {
           User = cfg.user;
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 792156d5bde0..f56dbe0b0ea9 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -135,6 +135,7 @@ mapAliases {
   inherit (pkgs) node-gyp; # added 2024-08-13
   inherit (pkgs) node-pre-gyp; # added 2024-08-05
   inherit (pkgs) nodemon; # added 2024-06-28
+  npm = pkgs.nodejs.overrideAttrs (old: { meta = old.meta // { mainProgram = "npm"; }; }); # added 2024-10-04
   inherit (pkgs) npm-check-updates; # added 2023-08-22
   ocaml-language-server = throw "ocaml-language-server was removed because it was abandoned upstream"; # added 2023-09-04
   parcel-bundler = self.parcel; # added 2023-09-04
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 3364d6f72f39..6ca0b2d3e71a 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -148,7 +148,6 @@
 , "node-red"
 , "node2nix"
 , "np"
-, "npm"
 , "npm-merge-driver"
 , "nrm"
 , "orval"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 8bf89bc8b213..e09169ebe64a 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -76695,24 +76695,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  npm = nodeEnv.buildNodePackage {
-    name = "npm";
-    packageName = "npm";
-    version = "10.8.3";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-10.8.3.tgz";
-      sha512 = "0IQlyAYvVtQ7uOhDFYZCGK8kkut2nh8cpAdA9E6FvRSJaTgtZRZgNjlC5ZCct//L73ygrpY93CxXpRJDtNqPVg==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "a package manager for JavaScript";
-      homepage = "https://docs.npmjs.com/";
-      license = "Artistic-2.0";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   npm-merge-driver = nodeEnv.buildNodePackage {
     name = "npm-merge-driver";
     packageName = "npm-merge-driver";
diff --git a/pkgs/servers/authelia/update.sh b/pkgs/servers/authelia/update.sh
index 21776af2a033..a7f56fc6c571 100755
--- a/pkgs/servers/authelia/update.sh
+++ b/pkgs/servers/authelia/update.sh
@@ -1,5 +1,5 @@
 #! /usr/bin/env nix-shell
-#! nix-shell -I nixpkgs=./. -i bash -p coreutils gnused curl nix jq nodePackages.npm
+#! nix-shell -I nixpkgs=./. -i bash -p coreutils gnused curl nix jq nodejs
 set -euo pipefail
 
 DRV_DIR="$(dirname "${BASH_SOURCE[0]}")"