BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

nodejs*: normalise names to better fit other packages

Browse source 
Versioned package attributes are usually named like $pname_$version
eg: nodejs-14_x -> nodejs_14
This commit is contained in:
Sandro Jäckel 2022-11-06 11:59:21 +01:00
parent 1c6cb4cabd
commit aad577bd30
57 changed files with 117 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/languages-frameworks/javascript.section.md
View file

@ -229,7 +229,7 @@ See `node2nix` [docs](https://github.com/svanderburg/node2nix) for more info.
#### Pitfalls {#javascript-node2nix-pitfalls} #### Pitfalls {#javascript-node2nix-pitfalls}
- If upstream package.json does not have a "version" attribute, `node2nix` will crash. You will need to add it like shown in [the package.json section](#javascript-upstream-package-json). - If upstream package.json does not have a "version" attribute, `node2nix` will crash. You will need to add it like shown in [the package.json section](#javascript-upstream-package-json).
- `node2nix` has some [bugs](https://github.com/svanderburg/node2nix/issues/238) related to working with lock files from NPM distributed with `nodejs-16_x`. - `node2nix` has some [bugs](https://github.com/svanderburg/node2nix/issues/238) related to working with lock files from NPM distributed with `nodejs_16`.
- `node2nix` does not like missing packages from NPM. If you see something like `Cannot resolve version: vue-loader-v16@undefined` then you might want to try another tool. The package might have been pulled off of NPM. - `node2nix` does not like missing packages from NPM. If you see something like `Cannot resolve version: vue-loader-v16@undefined` then you might want to try another tool. The package might have been pulled off of NPM.
### yarn2nix {#javascript-yarn2nix} ### yarn2nix {#javascript-yarn2nix}

4
nixos/modules/services/web-apps/peertube.nix
View file

@ -429,7 +429,7 @@ in {
environment = env; environment = env;
path = with pkgs; [ bashInteractive ffmpeg nodejs-16_x openssl yarn python3 ]; path = with pkgs; [ bashInteractive ffmpeg nodejs_16 openssl yarn python3 ];
script = '' script = ''
#!/bin/sh #!/bin/sh
@ -859,7 +859,7 @@ in {
home = cfg.package; home = cfg.package;
}; };
}) })
(lib.attrsets.setAttrByPath [ cfg.user "packages" ] [ cfg.package peertubeEnv peertubeCli pkgs.ffmpeg pkgs.nodejs-16_x pkgs.yarn ]) (lib.attrsets.setAttrByPath [ cfg.user "packages" ] [ cfg.package peertubeEnv peertubeCli pkgs.ffmpeg pkgs.nodejs_16 pkgs.yarn ])
(lib.mkIf cfg.redis.enableUnixSocket {${config.services.peertube.user}.extraGroups = [ "redis-peertube" ];}) (lib.mkIf cfg.redis.enableUnixSocket {${config.services.peertube.user}.extraGroups = [ "redis-peertube" ];})
]; ];

2
nixos/modules/services/web-apps/wiki-js.nix
View file

@ -133,7 +133,7 @@ in {
WorkingDirectory = "/var/lib/${cfg.stateDirectoryName}"; WorkingDirectory = "/var/lib/${cfg.stateDirectoryName}";
DynamicUser = true; DynamicUser = true;
PrivateTmp = true; PrivateTmp = true;
ExecStart = "${pkgs.nodejs-16_x}/bin/node ${pkgs.wiki-js}/server"; ExecStart = "${pkgs.nodejs_16}/bin/node ${pkgs.wiki-js}/server";
}; };
}; };
}; };

2
pkgs/applications/editors/pulsar/update.mjs
View file

@ -1,6 +1,6 @@
#!/usr/bin/env nix-shell #!/usr/bin/env nix-shell
/* /*
#!nix-shell -i node -p nodejs-18_x #!nix-shell -i node -p nodejs_18
*/ */
import { promises as fs } from 'node:fs'; import { promises as fs } from 'node:fs';

2
pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/build-deps/default.nix
View file

@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> { {pkgs ? import <nixpkgs> {
inherit system; inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}:
let let
nodeEnv = import ./node-env.nix { nodeEnv = import ./node-env.nix {

2
pkgs/applications/misc/ArchiSteamFarm/web-ui/node-composition.nix
View file

@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> { {pkgs ? import <nixpkgs> {
inherit system; inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}:
let let
nodeEnv = import ../../../../development/node-packages/node-env.nix { nodeEnv = import ../../../../development/node-packages/node-env.nix {

6
pkgs/applications/misc/tandoor-recipes/frontend.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchYarnDeps, fixup_yarn_lock, callPackage, nodejs-16_x }: { stdenv, fetchYarnDeps, fixup_yarn_lock, callPackage, nodejs_16 }:
let let
common = callPackage ./common.nix { }; common = callPackage ./common.nix { };
in in
@ -16,8 +16,8 @@ stdenv.mkDerivation {
nativeBuildInputs = [ nativeBuildInputs = [
fixup_yarn_lock fixup_yarn_lock
# Use Node JS 16 because of @achrinza/node-ipc@9.2.2 # Use Node JS 16 because of @achrinza/node-ipc@9.2.2
nodejs-16_x nodejs_16
nodejs-16_x.pkgs.yarn nodejs_16.pkgs.yarn
]; ];
configurePhase = '' configurePhase = ''

2
pkgs/applications/networking/cluster/spacegun/node-composition.nix
View file

@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> { {pkgs ? import <nixpkgs> {
inherit system; inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}:
let let
nodeEnv = import ../../../../development/node-packages/node-env.nix { nodeEnv = import ../../../../development/node-packages/node-env.nix {

2
pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix
View file

@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> { {pkgs ? import <nixpkgs> {
inherit system; inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}:
let let
nodeEnv = import ./node-env.nix { nodeEnv = import ./node-env.nix {

4
pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix
View file

@ -6,13 +6,13 @@
postInstall = '' postInstall = ''
mkdir "$out/bin" mkdir "$out/bin"
echo '#!/bin/sh' >> "$out/bin/matrix-recorder" echo '#!/bin/sh' >> "$out/bin/matrix-recorder"
echo "'${pkgs.nodejs-14_x}/bin/node'" \ echo "'${pkgs.nodejs_14}/bin/node'" \
"'$out/lib/node_modules/matrix-recorder/matrix-recorder.js'" \ "'$out/lib/node_modules/matrix-recorder/matrix-recorder.js'" \
'"$@"' >> "$out/bin/matrix-recorder" '"$@"' >> "$out/bin/matrix-recorder"
echo '#!/bin/sh' >> "$out/bin/matrix-recorder-to-html" echo '#!/bin/sh' >> "$out/bin/matrix-recorder-to-html"
echo 'cd "$1"' >> "$out/bin/matrix-recorder-to-html" echo 'cd "$1"' >> "$out/bin/matrix-recorder-to-html"
echo "test -d templates/ || ln -sfT '$out/lib/node_modules/matrix-recorder/templates' templates" >> "$out/bin/matrix-recorder-to-html" echo "test -d templates/ || ln -sfT '$out/lib/node_modules/matrix-recorder/templates' templates" >> "$out/bin/matrix-recorder-to-html"
echo "'${pkgs.nodejs-14_x}/bin/node'" \ echo "'${pkgs.nodejs_14}/bin/node'" \
"'$out/lib/node_modules/matrix-recorder/recorder-to-html.js'" \ "'$out/lib/node_modules/matrix-recorder/recorder-to-html.js'" \
'.' >> "$out/bin/matrix-recorder-to-html" '.' >> "$out/bin/matrix-recorder-to-html"
chmod a+x "$out/bin/matrix-recorder" chmod a+x "$out/bin/matrix-recorder"

2
pkgs/applications/networking/n8n/default.nix
View file

@ -1,4 +1,4 @@
{ pkgs, nodejs-16_x, stdenv, lib, nixosTests }: { pkgs, nodejs_16, stdenv, lib, nixosTests }:
let let
nodePackages = import ./node-composition.nix { nodePackages = import ./node-composition.nix {

2
pkgs/applications/networking/n8n/node-composition.nix
View file

@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> { {pkgs ? import <nixpkgs> {
inherit system; inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-16_x"}: }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_16"}:
let let
nodeEnv = import ./node-env.nix { nodeEnv = import ./node-env.nix {

2
pkgs/applications/version-management/cz-cli/node-composition.nix
View file

@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> { {pkgs ? import <nixpkgs> {
inherit system; inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}:
let let
nodeEnv = import ./node-env.nix { nodeEnv = import ./node-env.nix {

4
pkgs/development/compilers/elm/default.nix
View file

@ -3,7 +3,7 @@
let let
# To control nodejs version we pass down # To control nodejs version we pass down
nodejs = pkgs.nodejs-14_x; nodejs = pkgs.nodejs_14;
fetchElmDeps = pkgs.callPackage ./fetchElmDeps.nix { }; fetchElmDeps = pkgs.callPackage ./fetchElmDeps.nix { };
@ -116,7 +116,7 @@ let
nodePkgs = pkgs.callPackage ./packages/node-composition.nix { nodePkgs = pkgs.callPackage ./packages/node-composition.nix {
inherit pkgs; inherit pkgs;
nodejs = pkgs.nodejs-14_x; nodejs = pkgs.nodejs_14;
inherit (pkgs.stdenv.hostPlatform) system; inherit (pkgs.stdenv.hostPlatform) system;
}; };

2
pkgs/development/compilers/elm/packages/node-composition.nix
View file

@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> { {pkgs ? import <nixpkgs> {
inherit system; inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}:
let let
nodeEnv = import ../../../node-packages/node-env.nix { nodeEnv = import ../../../node-packages/node-env.nix {

2
pkgs/development/node-packages/composition.nix
View file

@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> { {pkgs ? import <nixpkgs> {
inherit system; inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-18_x"}: }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_18"}:
let let
nodeEnv = import ./node-env.nix { nodeEnv = import ./node-env.nix {

2
pkgs/development/node-packages/generate.sh
View file

@ -13,7 +13,7 @@ rm -f ./node-env.nix
-i node-packages.json \ -i node-packages.json \
-o node-packages.nix \ -o node-packages.nix \
-c composition.nix \ -c composition.nix \
--pkg-name nodejs-18_x --pkg-name nodejs_18
# using --no-out-link in nix-build argument would cause the # using --no-out-link in nix-build argument would cause the
# gc to run before the script finishes # gc to run before the script finishes

2
pkgs/development/node-packages/overrides.nix
View file

@ -281,7 +281,7 @@ final: prev: {
}; };
manta = prev.manta.override ( oldAttrs: { manta = prev.manta.override ( oldAttrs: {
nativeBuildInputs = with pkgs; [ nodejs-14_x installShellFiles ]; nativeBuildInputs = with pkgs; [ nodejs_14 installShellFiles ];
postInstall = '' postInstall = ''
# create completions, following upstream procedure https://github.com/joyent/node-manta/blob/v5.2.3/Makefile#L85-L91 # 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") completion_cmds=$(find ./bin -type f -printf "%f\n")

6
pkgs/development/tools/continuous-integration/github-runner/default.nix
View file

@ -9,7 +9,7 @@
, glibcLocales , glibcLocales
, lib , lib
, nixosTests , nixosTests
, nodejs-16_x , nodejs_16
, stdenv , stdenv
, which , which
}: }:
@ -156,7 +156,7 @@ buildDotnetModule rec {
preCheck = '' preCheck = ''
mkdir -p _layout/externals mkdir -p _layout/externals
ln -s ${nodejs-16_x} _layout/externals/node16 ln -s ${nodejs_16} _layout/externals/node16
''; '';
postInstall = '' postInstall = ''
@ -193,7 +193,7 @@ buildDotnetModule rec {
# externals/node16. As opposed to the official releases, we don't # externals/node16. As opposed to the official releases, we don't
# link the Alpine Node flavors. # link the Alpine Node flavors.
mkdir -p $out/lib/externals mkdir -p $out/lib/externals
ln -s ${nodejs-16_x} $out/lib/externals/node16 ln -s ${nodejs_16} $out/lib/externals/node16
# Install Nodejs scripts called from workflows # Install Nodejs scripts called from workflows
install -D src/Misc/layoutbin/hashFiles/index.js $out/lib/github-runner/hashFiles/index.js install -D src/Misc/layoutbin/hashFiles/index.js $out/lib/github-runner/hashFiles/index.js

4
pkgs/development/tools/electron-fiddle/default.nix
View file

@ -6,7 +6,7 @@
, git , git
, lib , lib
, makeDesktopItem , makeDesktopItem
, nodejs-16_x , nodejs_16
, stdenvNoCC , stdenvNoCC
, util-linux , util-linux
, zip , zip
@ -16,7 +16,7 @@ let
pname = "electron-fiddle"; pname = "electron-fiddle";
version = "0.32.1"; version = "0.32.1";
electron = electron_22; electron = electron_22;
nodejs = nodejs-16_x; nodejs = nodejs_16;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "electron"; owner = "electron";

4
pkgs/development/tools/language-servers/docker-compose-language-service/default.nix
View file

@ -1,10 +1,10 @@
{ lib { lib
, buildNpmPackage , buildNpmPackage
, nodejs-16_x , nodejs_16
, fetchFromGitHub , fetchFromGitHub
}: }:
let let
buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs-16_x; }; buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_16; };
in in
buildNpmPackage' rec { buildNpmPackage' rec {
pname = "docker-compose-language-service"; pname = "docker-compose-language-service";

4
pkgs/development/tools/misc/kibana/7.x.nix
View file

@ -4,13 +4,13 @@
, stdenv , stdenv
, makeWrapper , makeWrapper
, fetchurl , fetchurl
, nodejs-16_x , nodejs_16
, coreutils , coreutils
, which , which
}: }:
let let
nodejs = nodejs-16_x; nodejs = nodejs_16;
inherit (builtins) elemAt; inherit (builtins) elemAt;
info = lib.splitString "-" stdenv.hostPlatform.system; info = lib.splitString "-" stdenv.hostPlatform.system;
arch = elemAt info 0; arch = elemAt info 0;

2
pkgs/development/web/netlify-cli/composition.nix
View file

@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> { {pkgs ? import <nixpkgs> {
inherit system; inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-16_x"}: }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_16"}:
let let
nodeEnv = import ./node-env.nix { nodeEnv = import ./node-env.nix {

2
pkgs/development/web/newman/node-composition.nix
View file

@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> { {pkgs ? import <nixpkgs> {
inherit system; inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}:
let let
nodeEnv = import ./node-env.nix { nodeEnv = import ./node-env.nix {

2
pkgs/misc/base16-builder/node-packages.nix generated
View file

@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> { {pkgs ? import <nixpkgs> {
inherit system; inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}:
let let
globalBuildInputs = pkgs.lib.attrValues (import ./supplement.nix { globalBuildInputs = pkgs.lib.attrValues (import ./supplement.nix {

2
pkgs/servers/ariang/default.nix
View file

@ -2,7 +2,7 @@
, stdenv , stdenv
, pkgs , pkgs
, fetchFromGitHub , fetchFromGitHub
, nodejs ? pkgs.nodejs-14_x , nodejs ? pkgs.nodejs_14
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

2
pkgs/servers/ariang/node-composition.nix
View file

@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> { {pkgs ? import <nixpkgs> {
inherit system; inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}:
let let
nodeEnv = import ../../development/node-packages/node-env.nix { nodeEnv = import ../../development/node-packages/node-env.nix {

4
pkgs/servers/audiobookshelf/default.nix
View file

@ -1,7 +1,7 @@
{ lib, stdenv, pkgs, fetchFromGitHub, runCommand, buildNpmPackage, nodejs-16_x, tone, ffmpeg-full, util-linux, libwebp }: { lib, stdenv, pkgs, fetchFromGitHub, runCommand, buildNpmPackage, nodejs_16, tone, ffmpeg-full, util-linux, libwebp }:
let let
nodejs = nodejs-16_x; nodejs = nodejs_16;
pname = "audiobookshelf"; pname = "audiobookshelf";
version = "2.2.18"; version = "2.2.18";

8
pkgs/servers/code-server/default.nix
View file

@ -1,12 +1,12 @@
{ lib, stdenv, fetchFromGitHub, buildGoModule, makeWrapper, runCommand { lib, stdenv, fetchFromGitHub, buildGoModule, makeWrapper
, cacert, moreutils, jq, git, rsync, pkg-config, yarn, python3 , cacert, moreutils, jq, git, rsync, pkg-config, yarn, python3
, esbuild, nodejs-16_x, node-gyp, libsecret, xorg, ripgrep , esbuild, nodejs_16, node-gyp, libsecret, xorg, ripgrep
, AppKit, Cocoa, CoreServices, Security, cctools, xcbuild, quilt }: , AppKit, Cocoa, CoreServices, Security, cctools, xcbuild, quilt }:
let let
system = stdenv.hostPlatform.system; system = stdenv.hostPlatform.system;
nodejs = nodejs-16_x; nodejs = nodejs_16;
python = python3; python = python3;
yarn' = yarn.override { inherit nodejs; }; yarn' = yarn.override { inherit nodejs; };
defaultYarnOpts = [ ]; defaultYarnOpts = [ ];
@ -241,7 +241,7 @@ in stdenv.mkDerivation rec {
ln -s "${cloudAgent}/bin/cloud-agent" $out/libexec/code-server/lib/coder-cloud-agent ln -s "${cloudAgent}/bin/cloud-agent" $out/libexec/code-server/lib/coder-cloud-agent
# create wrapper # create wrapper
makeWrapper "${nodejs-16_x}/bin/node" "$out/bin/code-server" \ makeWrapper "${nodejs_16}/bin/node" "$out/bin/code-server" \
--add-flags "$out/libexec/code-server/out/node/entry.js" --add-flags "$out/libexec/code-server/out/node/entry.js"
''; '';

2
pkgs/servers/haste-server/node-composition.nix
View file

@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> { {pkgs ? import <nixpkgs> {
inherit system; inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}:
let let
nodeEnv = import ./node-env.nix { nodeEnv = import ./node-env.nix {

2
pkgs/servers/jellyfin/node-composition.nix
View file

@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> { {pkgs ? import <nixpkgs> {
inherit system; inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}:
let let
nodeEnv = import ../../development/node-packages/node-env.nix { nodeEnv = import ../../development/node-packages/node-env.nix {

2
pkgs/servers/misc/navidrome/ui/node-composition.nix
View file

@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> { {pkgs ? import <nixpkgs> {
inherit system; inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}:
let let
nodeEnv = import ./node-env.nix { nodeEnv = import ./node-env.nix {

2
pkgs/servers/mjolnir/node-composition.nix
View file

@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> { {pkgs ? import <nixpkgs> {
inherit system; inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}:
let let
nodeEnv = import ./node-env.nix { nodeEnv = import ./node-env.nix {

6
pkgs/servers/monitoring/karma/default.nix
View file

@ -5,7 +5,7 @@
, callPackage , callPackage
, fetchFromGitHub , fetchFromGitHub
, nixosTests , nixosTests
, nodejs-18_x , nodejs_18
}: }:
let let
@ -13,7 +13,7 @@ let
inherit pkgs; inherit pkgs;
inherit (stdenv.hostPlatform) system; inherit (stdenv.hostPlatform) system;
# pin nodejs version # pin nodejs version
nodejs = nodejs-18_x; nodejs = nodejs_18;
}).nodeDependencies; }).nodeDependencies;
in in
@ -31,7 +31,7 @@ buildGoModule rec {
vendorHash = "sha256-ZsXPA4KyKbc/bwkidyHNDg62mE8KlE+yIssOBZLmHVg="; vendorHash = "sha256-ZsXPA4KyKbc/bwkidyHNDg62mE8KlE+yIssOBZLmHVg=";
nativeBuildInputs = [ nativeBuildInputs = [
nodejs-18_x nodejs_18
]; ];
postPatch = '' postPatch = ''

2
pkgs/servers/monitoring/karma/generate-dependencies.sh
View file

@ -1,5 +1,5 @@
#! /usr/bin/env nix-shell #! /usr/bin/env nix-shell
#! nix-shell -i bash -p nodePackages.node2nix nodejs-18_x gnused wget #! nix-shell -i bash -p nodePackages.node2nix nodejs_18 gnused wget
# Usage: ./generate-dependencies.sh <version> # Usage: ./generate-dependencies.sh <version>
# Use the same version format as in ./default.nix (without the 'v') # Use the same version format as in ./default.nix (without the 'v')

2
pkgs/servers/monitoring/karma/node-composition.nix
View file

@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> { {pkgs ? import <nixpkgs> {
inherit system; inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-18_x"}: }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_18"}:
let let
nodeEnv = import ./node-env.nix { nodeEnv = import ./node-env.nix {

4
pkgs/servers/mx-puppet-discord/default.nix
View file

@ -1,8 +1,8 @@
{ stdenv, fetchFromGitLab, pkgs, lib, nodejs-14_x, pkg-config { stdenv, fetchFromGitLab, pkgs, lib, nodejs_14, pkg-config
, libjpeg, pixman, cairo, pango, which, postgresql }: , libjpeg, pixman, cairo, pango, which, postgresql }:
let let
nodejs = nodejs-14_x; nodejs = nodejs_14;
version = "0.1.1"; version = "0.1.1";

2
pkgs/servers/mx-puppet-discord/node-composition.nix
View file

@ -2,7 +2,7 @@
{pkgs ? import ../../.. { {pkgs ? import ../../.. {
inherit system; inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}:
let let
nodeEnv = import ../../development/node-packages/node-env.nix { nodeEnv = import ../../development/node-packages/node-env.nix {

6
pkgs/servers/openvscode-server/default.nix
View file

@ -1,12 +1,12 @@
{ lib, stdenv, fetchFromGitHub, buildGoModule, makeWrapper, runCommand { lib, stdenv, fetchFromGitHub, buildGoModule, makeWrapper
, cacert, moreutils, jq, git, pkg-config, yarn, python3 , cacert, moreutils, jq, git, pkg-config, yarn, python3
, esbuild, nodejs-16_x, libsecret, xorg, ripgrep , esbuild, nodejs_16, libsecret, xorg, ripgrep
, AppKit, Cocoa, Security, cctools }: , AppKit, Cocoa, Security, cctools }:
let let
system = stdenv.hostPlatform.system; system = stdenv.hostPlatform.system;
nodejs = nodejs-16_x; nodejs = nodejs_16;
yarn' = yarn.override { inherit nodejs; }; yarn' = yarn.override { inherit nodejs; };
defaultYarnOpts = [ "frozen-lockfile" "non-interactive" "no-progress"]; defaultYarnOpts = [ "frozen-lockfile" "non-interactive" "no-progress"];

2
pkgs/servers/polaris/node-composition.nix
View file

@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> { {pkgs ? import <nixpkgs> {
inherit system; inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_12"}:
let let
nodeEnv = import ../../development/node-packages/node-env.nix { nodeEnv = import ../../development/node-packages/node-env.nix {

6
pkgs/servers/psitransfer/default.nix
View file

@ -7,13 +7,13 @@
{ stdenv { stdenv
, pkgs , pkgs
, lib , lib
, nodejs-14_x , nodejs_14
, fetchzip , fetchzip
}: }:
let let
# nodejs-16_x fails with ENOTCACHED # nodejs_16 fails with ENOTCACHED
nodejs = nodejs-14_x; nodejs = nodejs_14;
nodePackages = import ./node-composition.nix { nodePackages = import ./node-composition.nix {
inherit pkgs nodejs; inherit pkgs nodejs;

2
pkgs/servers/psitransfer/node-composition.nix
View file

@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> { {pkgs ? import <nixpkgs> {
inherit system; inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}:
let let
nodeEnv = import ../../development/node-packages/node-env.nix { nodeEnv = import ../../development/node-packages/node-env.nix {

8
pkgs/servers/web-apps/discourse/default.nix
View file

@ -37,7 +37,7 @@
, yarn , yarn
, fixup_yarn_lock , fixup_yarn_lock
, nodePackages , nodePackages
, nodejs-16_x , nodejs_16
, plugins ? [] , plugins ? []
}@args: }@args:
@ -159,9 +159,9 @@ let
cd ../.. cd ../..
mkdir -p vendor/v8/${stdenv.hostPlatform.system}/libv8/obj/ mkdir -p vendor/v8/${stdenv.hostPlatform.system}/libv8/obj/
ln -s "${nodejs-16_x.libv8}/lib/libv8.a" vendor/v8/${stdenv.hostPlatform.system}/libv8/obj/libv8_monolith.a ln -s "${nodejs_16.libv8}/lib/libv8.a" vendor/v8/${stdenv.hostPlatform.system}/libv8/obj/libv8_monolith.a
ln -s ${nodejs-16_x.libv8}/include vendor/v8/include ln -s ${nodejs_16.libv8}/include vendor/v8/include
mkdir -p ext/libv8-node mkdir -p ext/libv8-node
echo '--- !ruby/object:Libv8::Node::Location::Vendor {}' >ext/libv8-node/.location.yml echo '--- !ruby/object:Libv8::Node::Location::Vendor {}' >ext/libv8-node/.location.yml
@ -208,7 +208,7 @@ let
nodePackages.uglify-js nodePackages.uglify-js
nodePackages.terser nodePackages.terser
yarn yarn
nodejs-16_x nodejs_16
]; ];
outputs = [ "out" "javascripts" ]; outputs = [ "out" "javascripts" ];

4
pkgs/servers/web-apps/ethercalc/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv { stdenv
, pkgs , pkgs
, lib , lib
, nodejs-14_x , nodejs_14
}: }:
let let
nodejs = nodejs-14_x; nodejs = nodejs_14;
nodePackages = import ./node-packages.nix { nodePackages = import ./node-packages.nix {
inherit pkgs nodejs; inherit pkgs nodejs;

2
pkgs/servers/web-apps/ethercalc/node-packages.nix generated
View file

@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> { {pkgs ? import <nixpkgs> {
inherit system; inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}:
let let
nodeEnv = import ../../../development/node-packages/node-env.nix { nodeEnv = import ../../../development/node-packages/node-env.nix {

4
pkgs/servers/web-apps/whitebophir/default.nix
View file

@ -1,12 +1,12 @@
{ stdenv { stdenv
, pkgs , pkgs
, lib , lib
, nodejs-16_x , nodejs_16
, runtimeShell , runtimeShell
}: }:
let let
nodejs = nodejs-16_x; nodejs = nodejs_16;
nodePackages = import ./node-packages.nix { nodePackages = import ./node-packages.nix {
inherit pkgs nodejs; inherit pkgs nodejs;

2
pkgs/servers/web-apps/whitebophir/node-packages.nix generated
View file

@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> { {pkgs ? import <nixpkgs> {
inherit system; inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}:
let let
nodeEnv = import ../../../development/node-packages/node-env.nix { nodeEnv = import ../../../development/node-packages/node-env.nix {

4
pkgs/tools/admin/meshcentral/default.nix
View file

@ -1,4 +1,4 @@
{ lib, fetchpatch, fetchzip, yarn2nix-moretea, nodejs-16_x, jq, dos2unix }: { lib, fetchpatch, fetchzip, yarn2nix-moretea, nodejs_16, jq, dos2unix }:
yarn2nix-moretea.mkYarnPackage { yarn2nix-moretea.mkYarnPackage {
version = "1.1.5"; version = "1.1.5";
@ -24,7 +24,7 @@ yarn2nix-moretea.mkYarnPackage {
preFixup = '' preFixup = ''
mkdir -p $out/bin mkdir -p $out/bin
chmod a+x $out/libexec/meshcentral/deps/meshcentral/meshcentral.js chmod a+x $out/libexec/meshcentral/deps/meshcentral/meshcentral.js
sed -i '1i#!${nodejs-16_x}/bin/node' $out/libexec/meshcentral/deps/meshcentral/meshcentral.js sed -i '1i#!${nodejs_16}/bin/node' $out/libexec/meshcentral/deps/meshcentral/meshcentral.js
ln -s $out/libexec/meshcentral/deps/meshcentral/meshcentral.js $out/bin/meshcentral ln -s $out/libexec/meshcentral/deps/meshcentral/meshcentral.js $out/bin/meshcentral
''; '';

2
pkgs/tools/audio/botamusique/default.nix
View file

@ -15,7 +15,7 @@
, nodePackages , nodePackages
}: }:
let let
nodejs = pkgs.nodejs-14_x; nodejs = pkgs.nodejs_14;
nodeEnv = import ../../../development/node-packages/node-env.nix { nodeEnv = import ../../../development/node-packages/node-env.nix {
inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
inherit pkgs nodejs; inherit pkgs nodejs;

2
pkgs/tools/graphics/ldgallery/viewer/node-composition.nix
View file

@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> { {pkgs ? import <nixpkgs> {
inherit system; inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}:
let let
nodeEnv = import ../../../../development/node-packages/node-env.nix { nodeEnv = import ../../../../development/node-packages/node-env.nix {

2
pkgs/tools/misc/ntfy-sh/node-composition.nix
View file

@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> { {pkgs ? import <nixpkgs> {
inherit system; inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}:
let let
nodeEnv = import ../../../development/node-packages/node-env.nix { nodeEnv = import ../../../development/node-packages/node-env.nix {

2
pkgs/tools/networking/airfield/node.nix
View file

@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> { {pkgs ? import <nixpkgs> {
inherit system; inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}:
let let
nodeEnv = import ../../../development/node-packages/node-env.nix { nodeEnv = import ../../../development/node-packages/node-env.nix {

4
pkgs/tools/security/bitwarden/default.nix
View file

@ -11,7 +11,7 @@
, makeDesktopItem , makeDesktopItem
, makeWrapper , makeWrapper
, moreutils , moreutils
, nodejs-16_x , nodejs_16
, pkg-config , pkg-config
, python3 , python3
, rustPlatform , rustPlatform
@ -22,7 +22,7 @@ let
description = "A secure and free password manager for all of your devices"; description = "A secure and free password manager for all of your devices";
icon = "bitwarden"; icon = "bitwarden";
buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs-16_x; }; buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_16; };
version = "2023.3.2"; version = "2023.3.2";
src = fetchFromGitHub { src = fetchFromGitHub {

2
pkgs/tools/security/onlykey/onlykey.nix
View file

@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> { {pkgs ? import <nixpkgs> {
inherit system; inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}:
let let
nodeEnv = import ../../../development/node-packages/node-env.nix { nodeEnv = import ../../../development/node-packages/node-env.nix {

4
pkgs/tools/security/vaultwarden/webvault.nix
View file

@ -3,12 +3,12 @@
, fetchFromGitHub , fetchFromGitHub
, git , git
, nixosTests , nixosTests
, nodejs-16_x , nodejs_16
, python3 , python3
}: }:
let let
buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs-16_x; }; buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_16; };
version = "2023.3.0b"; version = "2023.3.0b";

14
pkgs/top-level/aliases.nix
View file

@ -1121,9 +1121,19 @@ mapAliases ({
nmap-unfree = nmap; # Added 2021-04-06 nmap-unfree = nmap; # Added 2021-04-06
nmap-graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Added 2022-04-26 nmap-graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Added 2022-04-26
nmap_graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Modified 2022-04-26 nmap_graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Modified 2022-04-26
nodejs-10_x = throw "nodejs-10_x has been removed. Use a newer version instead."; # Added 2022-05-31 nodejs_10 = throw "nodejs-10_x has been removed. Use a newer version instead."; # Added 2022-05-31
nodejs-12_x = throw "nodejs-12_x has been removed. Use a newer version instead."; # Added 2022-07-04 nodejs-10_x = nodejs_10; # Added 2022-11-06
nodejs_12 = throw "nodejs-12_x has been removed. Use a newer version instead."; # Added 2022-07-04
nodejs-12_x = nodejs_12; # Added 2022-11-06
nodejs-14_x = nodejs_14; # Added 2022-11-06
nodejs-slim-14_x = nodejs-slim_14; # Added 2022-11-06
nodejs-16_x = nodejs_16; # Added 2022-11-06
nodejs-16_x-openssl_1_1 = throw "nodejs-16_x-openssl_1_1 has been removed."; # Added 2023-02-04 nodejs-16_x-openssl_1_1 = throw "nodejs-16_x-openssl_1_1 has been removed."; # Added 2023-02-04
nodejs-slim-16_x = nodejs-slim_16; # Added 2022-11-06
nodejs-18_x = nodejs_18; # Added 2022-11-06
nodejs-slim-18_x = nodejs-slim_18; # Added 2022-11-06
nodejs-19_x = nodejs_19; # Added 2022-11-06
nodejs-slim-19_x = nodejs-slim_19; # Added 2022-11-06
nologin = throw "'nologin' has been renamed to/replaced by 'shadow'"; # Converted to throw 2022-02-22 nologin = throw "'nologin' has been renamed to/replaced by 'shadow'"; # Converted to throw 2022-02-22
nomad_1_1 = throw "nomad_1_1 has been removed because it's outdated. Use a a newer version instead"; # Added 2022-05-22 nomad_1_1 = throw "nomad_1_1 has been removed because it's outdated. Use a a newer version instead"; # Added 2022-05-22
nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # Added 2021-05-27 nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # Added 2021-05-27

42
pkgs/top-level/all-packages.nix
View file

@ -3590,7 +3590,7 @@ with pkgs;
play-with-mpv = callPackage ../tools/video/play-with-mpv { }; play-with-mpv = callPackage ../tools/video/play-with-mpv { };
plausible = callPackage ../servers/web-apps/plausible { nodejs = nodejs-16_x; }; plausible = callPackage ../servers/web-apps/plausible { nodejs = nodejs_16; };
pam-reattach = callPackage ../os-specific/darwin/pam-reattach { }; pam-reattach = callPackage ../os-specific/darwin/pam-reattach { };
@ -6174,9 +6174,9 @@ with pkgs;
hedgedoc = callPackage ../servers/web-apps/hedgedoc { hedgedoc = callPackage ../servers/web-apps/hedgedoc {
inherit (callPackage ../development/tools/yarn2nix-moretea/yarn2nix { inherit (callPackage ../development/tools/yarn2nix-moretea/yarn2nix {
nodejs = nodejs-16_x; nodejs = nodejs_16;
}) mkYarnPackage; }) mkYarnPackage;
nodejs = nodejs-16_x; nodejs = nodejs_16;
}; };
colord = callPackage ../tools/misc/colord { }; colord = callPackage ../tools/misc/colord { };
@ -9400,27 +9400,27 @@ with pkgs;
nodenv = callPackage ../development/tools/nodenv { }; nodenv = callPackage ../development/tools/nodenv { };
nodejs = hiPrio nodejs-18_x; nodejs = hiPrio nodejs_18;
nodejs-slim = nodejs-slim-18_x; nodejs-slim = nodejs-slim_18;
nodejs-14_x = callPackage ../development/web/nodejs/v14.nix { nodejs_14 = callPackage ../development/web/nodejs/v14.nix {
openssl = openssl_1_1; openssl = openssl_1_1;
}; };
nodejs-slim-14_x = callPackage ../development/web/nodejs/v14.nix { nodejs-slim_14 = callPackage ../development/web/nodejs/v14.nix {
openssl = openssl_1_1; openssl = openssl_1_1;
enableNpm = false; enableNpm = false;
}; };
nodejs-16_x = callPackage ../development/web/nodejs/v16.nix { }; nodejs_16 = callPackage ../development/web/nodejs/v16.nix { };
nodejs-slim-16_x = callPackage ../development/web/nodejs/v16.nix { nodejs-slim_16 = callPackage ../development/web/nodejs/v16.nix {
enableNpm = false; enableNpm = false;
}; };
nodejs-18_x = callPackage ../development/web/nodejs/v18.nix { }; nodejs_18 = callPackage ../development/web/nodejs/v18.nix { };
nodejs-slim-18_x = callPackage ../development/web/nodejs/v18.nix { nodejs-slim_18 = callPackage ../development/web/nodejs/v18.nix {
enableNpm = false; enableNpm = false;
}; };
nodejs-19_x = callPackage ../development/web/nodejs/v19.nix { }; nodejs_19 = callPackage ../development/web/nodejs/v19.nix { };
nodejs-slim-19_x = callPackage ../development/web/nodejs/v19.nix { nodejs-slim_19 = callPackage ../development/web/nodejs/v19.nix {
enableNpm = false; enableNpm = false;
}; };
nodejs_20 = callPackage ../development/web/nodejs/v20.nix { }; nodejs_20 = callPackage ../development/web/nodejs/v20.nix { };
@ -9987,10 +9987,10 @@ with pkgs;
}; };
mirakurun = callPackage ../applications/video/mirakurun { mirakurun = callPackage ../applications/video/mirakurun {
yarn = yarn.override { nodejs = nodejs-16_x; }; yarn = yarn.override { nodejs = nodejs_16; };
inherit (callPackage ../development/tools/yarn2nix-moretea/yarn2nix { inherit (callPackage ../development/tools/yarn2nix-moretea/yarn2nix {
nodejs = nodejs-16_x; nodejs = nodejs_16;
yarn = yarn.override { nodejs = nodejs-16_x; }; yarn = yarn.override { nodejs = nodejs_16; };
}) mkYarnPackage; }) mkYarnPackage;
}; };
@ -20960,7 +20960,7 @@ with pkgs;
}; };
isso = callPackage ../servers/isso { isso = callPackage ../servers/isso {
nodejs = nodejs-14_x; nodejs = nodejs_14;
}; };
itk_5_2 = callPackage ../development/libraries/itk/5.2.x.nix { itk_5_2 = callPackage ../development/libraries/itk/5.2.x.nix {
@ -25224,7 +25224,7 @@ with pkgs;
}; };
lemmy-ui = callPackage ../servers/web-apps/lemmy/ui.nix { lemmy-ui = callPackage ../servers/web-apps/lemmy/ui.nix {
nodejs = nodejs-14_x; nodejs = nodejs_14;
}; };
lightgbm = callPackage ../development/libraries/lightgbm { }; lightgbm = callPackage ../development/libraries/lightgbm { };
@ -25422,7 +25422,7 @@ with pkgs;
outline = callPackage ../servers/web-apps/outline (lib.fix (super: { outline = callPackage ../servers/web-apps/outline (lib.fix (super: {
yarn2nix-moretea = yarn2nix-moretea.override { inherit (super) nodejs yarn; }; yarn2nix-moretea = yarn2nix-moretea.override { inherit (super) nodejs yarn; };
yarn = yarn.override { inherit (super) nodejs; }; yarn = yarn.override { inherit (super) nodejs; };
nodejs = nodejs-16_x; nodejs = nodejs_16;
})); }));
openbgpd = callPackage ../servers/openbgpd { }; openbgpd = callPackage ../servers/openbgpd { };
@ -29875,7 +29875,7 @@ with pkgs;
epeg = callPackage ../applications/graphics/epeg { }; epeg = callPackage ../applications/graphics/epeg { };
epgstation = callPackage ../applications/video/epgstation { epgstation = callPackage ../applications/video/epgstation {
nodejs = nodejs-16_x; nodejs = nodejs_16;
}; };
inherit (gnome) epiphany; inherit (gnome) epiphany;
@ -33000,7 +33000,7 @@ with pkgs;
peek = callPackage ../applications/video/peek { }; peek = callPackage ../applications/video/peek { };
peertube = callPackage ../servers/peertube { peertube = callPackage ../servers/peertube {
nodejs = nodejs-16_x; nodejs = nodejs_16;
}; };
peroxide = callPackage ../applications/networking/peroxide { }; peroxide = callPackage ../applications/networking/peroxide { };