diff options
| author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2022-11-06 11:59:21 +0100 |
|---|---|---|
| committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2023-04-25 11:28:17 +0200 |
| commit | aad577bd30b0ab16a7859973c88edd6d0d5becde (patch) | |
| tree | 7f24e0060e8644031402d0e2770ca080aeea4f7a /pkgs/development/node-packages | |
| parent | 1c6cb4cabd84351cbc2dbc2dec4f5636a75f543a (diff) | |
nodejs*: normalise names to better fit other packages
Versioned package attributes are usually named like $pname_$version eg: nodejs-14_x -> nodejs_14
Diffstat (limited to 'pkgs/development/node-packages')
| -rw-r--r-- | pkgs/development/node-packages/composition.nix | 2 | ||||
| -rwxr-xr-x | pkgs/development/node-packages/generate.sh | 2 | ||||
| -rw-r--r-- | pkgs/development/node-packages/overrides.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/node-packages/composition.nix b/pkgs/development/node-packages/composition.nix index 6bbc431049eee..d9c0daef7834c 100644 --- a/pkgs/development/node-packages/composition.nix +++ b/pkgs/development/node-packages/composition.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-18_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_18"}: let nodeEnv = import ./node-env.nix { diff --git a/pkgs/development/node-packages/generate.sh b/pkgs/development/node-packages/generate.sh index bee53d7a1e62b..1a65ebd6cd26a 100755 --- a/pkgs/development/node-packages/generate.sh +++ b/pkgs/development/node-packages/generate.sh @@ -13,7 +13,7 @@ rm -f ./node-env.nix -i node-packages.json \ -o node-packages.nix \ -c composition.nix \ - --pkg-name nodejs-18_x + --pkg-name nodejs_18 # using --no-out-link in nix-build argument would cause the # gc to run before the script finishes diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index a1957bf935a0d..a4acdc0d1c4d5 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -281,7 +281,7 @@ final: prev: { }; manta = prev.manta.override ( oldAttrs: { - nativeBuildInputs = with pkgs; [ nodejs-14_x installShellFiles ]; + nativeBuildInputs = with pkgs; [ nodejs_14 installShellFiles ]; postInstall = '' # create completions, following upstream procedure https://github.com/joyent/node-manta/blob/v5.2.3/Makefile#L85-L91 completion_cmds=$(find ./bin -type f -printf "%f\n") |