diff --git a/nixos/modules/services/web-apps/node-red.nix b/nixos/modules/services/web-apps/node-red.nix index 2d59783d3bbe..cf6429c0094e 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/by-name/au/authentik/package.nix b/pkgs/by-name/au/authentik/package.nix index 74511b866a38..82a0144e1a58 100644 --- a/pkgs/by-name/au/authentik/package.nix +++ b/pkgs/by-name/au/authentik/package.nix @@ -70,7 +70,7 @@ let openapi-generator-cli generate -i ./schema.yml \ -g typescript-fetch -o $out \ -c ./scripts/api-ts-config.yaml \ - --additional-properties=npmVersion=${nodejs.pkgs.npm.version} \ + --additional-properties=npmVersion="$(${lib.getExe' nodejs "npm"} --version)" \ --git-repo-id authentik --git-user-id goauthentik runHook postBuild ''; diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index f8332ddd3654..b81b0d60678a 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -136,6 +136,7 @@ mapAliases { inherit (pkgs) node-pre-gyp; # added 2024-08-05 inherit (pkgs) node-red; # added 2024-10-06 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 3844e327f3da..ba88f38d9fcf 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -147,7 +147,6 @@ , "node-gyp-build" , "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 42ca576348cb..5183a1811ca7 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -76280,24 +76280,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]}")"