diff options
57 files changed, 117 insertions, 107 deletions
diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md index 6d5e465ec337..fdb570ebc320 100644 --- a/doc/languages-frameworks/javascript.section.md +++ b/doc/languages-frameworks/javascript.section.md @@ -229,7 +229,7 @@ See `node2nix` [docs](https://github.com/svanderburg/node2nix) for more info. #### 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). -- `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. ### yarn2nix {#javascript-yarn2nix} diff --git a/nixos/modules/services/web-apps/peertube.nix b/nixos/modules/services/web-apps/peertube.nix index 7e418f2869c8..65b3b70c48ad 100644 --- a/nixos/modules/services/web-apps/peertube.nix +++ b/nixos/modules/services/web-apps/peertube.nix @@ -429,7 +429,7 @@ in { environment = env; - path = with pkgs; [ bashInteractive ffmpeg nodejs-16_x openssl yarn python3 ]; + path = with pkgs; [ bashInteractive ffmpeg nodejs_16 openssl yarn python3 ]; script = '' #!/bin/sh @@ -859,7 +859,7 @@ in { 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" ];}) ]; diff --git a/nixos/modules/services/web-apps/wiki-js.nix b/nixos/modules/services/web-apps/wiki-js.nix index b0210c8a5d2b..22682002532d 100644 --- a/nixos/modules/services/web-apps/wiki-js.nix +++ b/nixos/modules/services/web-apps/wiki-js.nix @@ -133,7 +133,7 @@ in { WorkingDirectory = "/var/lib/${cfg.stateDirectoryName}"; DynamicUser = true; PrivateTmp = true; - ExecStart = "${pkgs.nodejs-16_x}/bin/node ${pkgs.wiki-js}/server"; + ExecStart = "${pkgs.nodejs_16}/bin/node ${pkgs.wiki-js}/server"; }; }; }; diff --git a/pkgs/applications/editors/pulsar/update.mjs b/pkgs/applications/editors/pulsar/update.mjs index 82e86be072d4..2e4155d87422 100755 --- a/pkgs/applications/editors/pulsar/update.mjs +++ b/pkgs/applications/editors/pulsar/update.mjs @@ -1,6 +1,6 @@ #!/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'; diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/build-deps/default.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/build-deps/default.nix index 08f947ea46bc..b795f708f189 100644 --- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/build-deps/default.nix +++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/build-deps/default.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: let nodeEnv = import ./node-env.nix { diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-composition.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-composition.nix index 2f29f37d72c1..12949e6195aa 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-composition.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: let nodeEnv = import ../../../../development/node-packages/node-env.nix { diff --git a/pkgs/applications/misc/tandoor-recipes/frontend.nix b/pkgs/applications/misc/tandoor-recipes/frontend.nix index 47dcde5aca51..2050d062d6a6 100644 --- a/pkgs/applications/misc/tandoor-recipes/frontend.nix +++ b/pkgs/applications/misc/tandoor-recipes/frontend.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchYarnDeps, fixup_yarn_lock, callPackage, nodejs-16_x }: +{ stdenv, fetchYarnDeps, fixup_yarn_lock, callPackage, nodejs_16 }: let common = callPackage ./common.nix { }; in @@ -16,8 +16,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ fixup_yarn_lock # Use Node JS 16 because of @achrinza/node-ipc@9.2.2 - nodejs-16_x - nodejs-16_x.pkgs.yarn + nodejs_16 + nodejs_16.pkgs.yarn ]; configurePhase = '' diff --git a/pkgs/applications/networking/cluster/spacegun/node-composition.nix b/pkgs/applications/networking/cluster/spacegun/node-composition.nix index 0c0b678d98f2..b57a68b0da70 100644 --- a/pkgs/applications/networking/cluster/spacegun/node-composition.nix +++ b/pkgs/applications/networking/cluster/spacegun/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: let nodeEnv = import ../../../../development/node-packages/node-env.nix { diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix b/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix index c1eafe304a9d..f9be0da6d5a1 100644 --- a/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix +++ b/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: let nodeEnv = import ./node-env.nix { diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix b/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix index f2b02ebdec4f..35510badf42e 100644 --- a/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix +++ b/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix @@ -6,13 +6,13 @@ postInstall = '' mkdir "$out/bin" 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/bin/matrix-recorder" echo '#!/bin/sh' >> "$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 "'${pkgs.nodejs-14_x}/bin/node'" \ + echo "'${pkgs.nodejs_14}/bin/node'" \ "'$out/lib/node_modules/matrix-recorder/recorder-to-html.js'" \ '.' >> "$out/bin/matrix-recorder-to-html" chmod a+x "$out/bin/matrix-recorder" diff --git a/pkgs/applications/networking/n8n/default.nix b/pkgs/applications/networking/n8n/default.nix index 41ff2b74a064..8cc96f1b6e5c 100644 --- a/pkgs/applications/networking/n8n/default.nix +++ b/pkgs/applications/networking/n8n/default.nix @@ -1,4 +1,4 @@ -{ pkgs, nodejs-16_x, stdenv, lib, nixosTests }: +{ pkgs, nodejs_16, stdenv, lib, nixosTests }: let nodePackages = import ./node-composition.nix { diff --git a/pkgs/applications/networking/n8n/node-composition.nix b/pkgs/applications/networking/n8n/node-composition.nix index ca76a98f5a65..6377a4b2c12c 100644 --- a/pkgs/applications/networking/n8n/node-composition.nix +++ b/pkgs/applications/networking/n8n/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-16_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_16"}: let nodeEnv = import ./node-env.nix { diff --git a/pkgs/applications/version-management/cz-cli/node-composition.nix b/pkgs/applications/version-management/cz-cli/node-composition.nix index 4dfddf3e5bca..5bd4f169fc8c 100644 --- a/pkgs/applications/version-management/cz-cli/node-composition.nix +++ b/pkgs/applications/version-management/cz-cli/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: let nodeEnv = import ./node-env.nix { diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 8ebe0d816de4..69f88d3aaf4e 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -3,7 +3,7 @@ let # To control nodejs version we pass down - nodejs = pkgs.nodejs-14_x; + nodejs = pkgs.nodejs_14; fetchElmDeps = pkgs.callPackage ./fetchElmDeps.nix { }; @@ -116,7 +116,7 @@ let nodePkgs = pkgs.callPackage ./packages/node-composition.nix { inherit pkgs; - nodejs = pkgs.nodejs-14_x; + nodejs = pkgs.nodejs_14; inherit (pkgs.stdenv.hostPlatform) system; }; diff --git a/pkgs/development/compilers/elm/packages/node-composition.nix b/pkgs/development/compilers/elm/packages/node-composition.nix index bbb39db07b71..b6110ac4db99 100644 --- a/pkgs/development/compilers/elm/packages/node-composition.nix +++ b/pkgs/development/compilers/elm/packages/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: let nodeEnv = import ../../../node-packages/node-env.nix { diff --git a/pkgs/development/node-packages/composition.nix b/pkgs/development/node-packages/composition.nix index 6bbc431049ee..d9c0daef7834 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 bee53d7a1e62..1a65ebd6cd26 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 a1957bf935a0..a4acdc0d1c4d 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") diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index 36931247d129..6774499d8cc2 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -9,7 +9,7 @@ , glibcLocales , lib , nixosTests -, nodejs-16_x +, nodejs_16 , stdenv , which }: @@ -156,7 +156,7 @@ buildDotnetModule rec { preCheck = '' mkdir -p _layout/externals - ln -s ${nodejs-16_x} _layout/externals/node16 + ln -s ${nodejs_16} _layout/externals/node16 ''; postInstall = '' @@ -193,7 +193,7 @@ buildDotnetModule rec { # externals/node16. As opposed to the official releases, we don't # link the Alpine Node flavors. 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 -D src/Misc/layoutbin/hashFiles/index.js $out/lib/github-runner/hashFiles/index.js diff --git a/pkgs/development/tools/electron-fiddle/default.nix b/pkgs/development/tools/electron-fiddle/default.nix index f0ce8ce76860..102c3cbaf31a 100644 --- a/pkgs/development/tools/electron-fiddle/default.nix +++ b/pkgs/development/tools/electron-fiddle/default.nix @@ -6,7 +6,7 @@ , git , lib , makeDesktopItem -, nodejs-16_x +, nodejs_16 , stdenvNoCC , util-linux , zip @@ -16,7 +16,7 @@ let pname = "electron-fiddle"; version = "0.32.1"; electron = electron_22; - nodejs = nodejs-16_x; + nodejs = nodejs_16; src = fetchFromGitHub { owner = "electron"; diff --git a/pkgs/development/tools/language-servers/docker-compose-language-service/default.nix b/pkgs/development/tools/language-servers/docker-compose-language-service/default.nix index 98375eef01ca..53581e0c1d30 100644 --- a/pkgs/development/tools/language-servers/docker-compose-language-service/default.nix +++ b/pkgs/development/tools/language-servers/docker-compose-language-service/default.nix @@ -1,10 +1,10 @@ { lib , buildNpmPackage -, nodejs-16_x +, nodejs_16 , fetchFromGitHub }: let - buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs-16_x; }; + buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_16; }; in buildNpmPackage' rec { pname = "docker-compose-language-service"; diff --git a/pkgs/development/tools/misc/kibana/7.x.nix b/pkgs/development/tools/misc/kibana/7.x.nix index fa58d1fbbf42..69aa71a6f245 100644 --- a/pkgs/development/tools/misc/kibana/7.x.nix +++ b/pkgs/development/tools/misc/kibana/7.x.nix @@ -4,13 +4,13 @@ , stdenv , makeWrapper , fetchurl -, nodejs-16_x +, nodejs_16 , coreutils , which }: let - nodejs = nodejs-16_x; + nodejs = nodejs_16; inherit (builtins) elemAt; info = lib.splitString "-" stdenv.hostPlatform.system; arch = elemAt info 0; diff --git a/pkgs/development/web/netlify-cli/composition.nix b/pkgs/development/web/netlify-cli/composition.nix index ca76a98f5a65..6377a4b2c12c 100644 --- a/pkgs/development/web/netlify-cli/composition.nix +++ b/pkgs/development/web/netlify-cli/composition.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-16_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_16"}: let nodeEnv = import ./node-env.nix { diff --git a/pkgs/development/web/newman/node-composition.nix b/pkgs/development/web/newman/node-composition.nix index 08f947ea46bc..b795f708f189 100644 --- a/pkgs/development/web/newman/node-composition.nix +++ b/pkgs/development/web/newman/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: let nodeEnv = import ./node-env.nix { diff --git a/pkgs/misc/base16-builder/node-packages.nix b/pkgs/misc/base16-builder/node-packages.nix index dacf1581ada0..bde04ea963e4 100644 --- a/pkgs/misc/base16-builder/node-packages.nix +++ b/pkgs/misc/base16-builder/node-packages.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: let globalBuildInputs = pkgs.lib.attrValues (import ./supplement.nix { diff --git a/pkgs/servers/ariang/default.nix b/pkgs/servers/ariang/default.nix index 7217fd069ce3..c604bfe95307 100644 --- a/pkgs/servers/ariang/default.nix +++ b/pkgs/servers/ariang/default.nix @@ -2,7 +2,7 @@ , stdenv , pkgs , fetchFromGitHub -, nodejs ? pkgs.nodejs-14_x +, nodejs ? pkgs.nodejs_14 }: stdenv.mkDerivation rec { diff --git a/pkgs/servers/ariang/node-composition.nix b/pkgs/servers/ariang/node-composition.nix index 80e4e292949e..68f9f64e6cf3 100644 --- a/pkgs/servers/ariang/node-composition.nix +++ b/pkgs/servers/ariang/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: let nodeEnv = import ../../development/node-packages/node-env.nix { diff --git a/pkgs/servers/audiobookshelf/default.nix b/pkgs/servers/audiobookshelf/default.nix index ae03bb5d3b02..893e9635f96c 100644 --- a/pkgs/servers/audiobookshelf/default.nix +++ b/pkgs/servers/audiobookshelf/default.nix @@ -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 - nodejs = nodejs-16_x; + nodejs = nodejs_16; pname = "audiobookshelf"; version = "2.2.18"; diff --git a/pkgs/servers/code-server/default.nix b/pkgs/servers/code-server/default.nix index 05808d605d26..8f0416c6ad32 100644 --- a/pkgs/servers/code-server/default.nix +++ b/pkgs/servers/code-server/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule, makeWrapper, runCommand +{ lib, stdenv, fetchFromGitHub, buildGoModule, makeWrapper , 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 }: let system = stdenv.hostPlatform.system; - nodejs = nodejs-16_x; + nodejs = nodejs_16; python = python3; yarn' = yarn.override { inherit nodejs; }; defaultYarnOpts = [ ]; @@ -241,7 +241,7 @@ in stdenv.mkDerivation rec { ln -s "${cloudAgent}/bin/cloud-agent" $out/libexec/code-server/lib/coder-cloud-agent # 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" ''; diff --git a/pkgs/servers/haste-server/node-composition.nix b/pkgs/servers/haste-server/node-composition.nix index 03dc6f3e5be3..5fb8e7ba5692 100644 --- a/pkgs/servers/haste-server/node-composition.nix +++ b/pkgs/servers/haste-server/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: let nodeEnv = import ./node-env.nix { diff --git a/pkgs/servers/jellyfin/node-composition.nix b/pkgs/servers/jellyfin/node-composition.nix index 80e4e292949e..68f9f64e6cf3 100644 --- a/pkgs/servers/jellyfin/node-composition.nix +++ b/pkgs/servers/jellyfin/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: let nodeEnv = import ../../development/node-packages/node-env.nix { diff --git a/pkgs/servers/misc/navidrome/ui/node-composition.nix b/pkgs/servers/misc/navidrome/ui/node-composition.nix index 08f947ea46bc..b795f708f189 100644 --- a/pkgs/servers/misc/navidrome/ui/node-composition.nix +++ b/pkgs/servers/misc/navidrome/ui/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: let nodeEnv = import ./node-env.nix { diff --git a/pkgs/servers/mjolnir/node-composition.nix b/pkgs/servers/mjolnir/node-composition.nix index 03dc6f3e5be3..5fb8e7ba5692 100644 --- a/pkgs/servers/mjolnir/node-composition.nix +++ b/pkgs/servers/mjolnir/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: let nodeEnv = import ./node-env.nix { diff --git a/pkgs/servers/monitoring/karma/default.nix b/pkgs/servers/monitoring/karma/default.nix index 8980d913aecf..416e388d8f49 100644 --- a/pkgs/servers/monitoring/karma/default.nix +++ b/pkgs/servers/monitoring/karma/default.nix @@ -5,7 +5,7 @@ , callPackage , fetchFromGitHub , nixosTests -, nodejs-18_x +, nodejs_18 }: let @@ -13,7 +13,7 @@ let inherit pkgs; inherit (stdenv.hostPlatform) system; # pin nodejs version - nodejs = nodejs-18_x; + nodejs = nodejs_18; }).nodeDependencies; in @@ -31,7 +31,7 @@ buildGoModule rec { vendorHash = "sha256-ZsXPA4KyKbc/bwkidyHNDg62mE8KlE+yIssOBZLmHVg="; nativeBuildInputs = [ - nodejs-18_x + nodejs_18 ]; postPatch = '' diff --git a/pkgs/servers/monitoring/karma/generate-dependencies.sh b/pkgs/servers/monitoring/karma/generate-dependencies.sh index e37e125b7b12..15354c7182bc 100755 --- a/pkgs/servers/monitoring/karma/generate-dependencies.sh +++ b/pkgs/servers/monitoring/karma/generate-dependencies.sh @@ -1,5 +1,5 @@ #! /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> # Use the same version format as in ./default.nix (without the 'v') diff --git a/pkgs/servers/monitoring/karma/node-composition.nix b/pkgs/servers/monitoring/karma/node-composition.nix index 6bbc431049ee..d9c0daef7834 100644 --- a/pkgs/servers/monitoring/karma/node-composition.nix +++ b/pkgs/servers/monitoring/karma/node-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/servers/mx-puppet-discord/default.nix b/pkgs/servers/mx-puppet-discord/default.nix index f53bcd9cc7a7..be32bda99354 100644 --- a/pkgs/servers/mx-puppet-discord/default.nix +++ b/pkgs/servers/mx-puppet-discord/default.nix @@ -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 }: let - nodejs = nodejs-14_x; + nodejs = nodejs_14; version = "0.1.1"; diff --git a/pkgs/servers/mx-puppet-discord/node-composition.nix b/pkgs/servers/mx-puppet-discord/node-composition.nix index 2abd4105c9ca..2042629fe9f5 100644 --- a/pkgs/servers/mx-puppet-discord/node-composition.nix +++ b/pkgs/servers/mx-puppet-discord/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import ../../.. { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: let nodeEnv = import ../../development/node-packages/node-env.nix { diff --git a/pkgs/servers/openvscode-server/default.nix b/pkgs/servers/openvscode-server/default.nix index d8eccd3e1076..b5b133026336 100644 --- a/pkgs/servers/openvscode-server/default.nix +++ b/pkgs/servers/openvscode-server/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule, makeWrapper, runCommand +{ lib, stdenv, fetchFromGitHub, buildGoModule, makeWrapper , 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 }: let system = stdenv.hostPlatform.system; - nodejs = nodejs-16_x; + nodejs = nodejs_16; yarn' = yarn.override { inherit nodejs; }; defaultYarnOpts = [ "frozen-lockfile" "non-interactive" "no-progress"]; diff --git a/pkgs/servers/polaris/node-composition.nix b/pkgs/servers/polaris/node-composition.nix index edf4bf579d4c..cc96551dc980 100644 --- a/pkgs/servers/polaris/node-composition.nix +++ b/pkgs/servers/polaris/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_12"}: let nodeEnv = import ../../development/node-packages/node-env.nix { diff --git a/pkgs/servers/psitransfer/default.nix b/pkgs/servers/psitransfer/default.nix index 791f656eeba9..2ca5c95a9aff 100644 --- a/pkgs/servers/psitransfer/default.nix +++ b/pkgs/servers/psitransfer/default.nix @@ -7,13 +7,13 @@ { stdenv , pkgs , lib -, nodejs-14_x +, nodejs_14 , fetchzip }: let - # nodejs-16_x fails with ENOTCACHED - nodejs = nodejs-14_x; + # nodejs_16 fails with ENOTCACHED + nodejs = nodejs_14; nodePackages = import ./node-composition.nix { inherit pkgs nodejs; diff --git a/pkgs/servers/psitransfer/node-composition.nix b/pkgs/servers/psitransfer/node-composition.nix index 1de33eb05b83..7785ceeba4e2 100644 --- a/pkgs/servers/psitransfer/node-composition.nix +++ b/pkgs/servers/psitransfer/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: let nodeEnv = import ../../development/node-packages/node-env.nix { diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index b5b02fc70c84..504a96d36147 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -37,7 +37,7 @@ , yarn , fixup_yarn_lock , nodePackages -, nodejs-16_x +, nodejs_16 , plugins ? [] }@args: @@ -159,9 +159,9 @@ let cd ../.. 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 echo '--- !ruby/object:Libv8::Node::Location::Vendor {}' >ext/libv8-node/.location.yml @@ -208,7 +208,7 @@ let nodePackages.uglify-js nodePackages.terser yarn - nodejs-16_x + nodejs_16 ]; outputs = [ "out" "javascripts" ]; diff --git a/pkgs/servers/web-apps/ethercalc/default.nix b/pkgs/servers/web-apps/ethercalc/default.nix index 270b2e4cff7b..229e5341cd8d 100644 --- a/pkgs/servers/web-apps/ethercalc/default.nix +++ b/pkgs/servers/web-apps/ethercalc/default.nix @@ -1,11 +1,11 @@ { stdenv , pkgs , lib -, nodejs-14_x +, nodejs_14 }: let - nodejs = nodejs-14_x; + nodejs = nodejs_14; nodePackages = import ./node-packages.nix { inherit pkgs nodejs; diff --git a/pkgs/servers/web-apps/ethercalc/node-packages.nix b/pkgs/servers/web-apps/ethercalc/node-packages.nix index 862d22340099..bdc44fec6fde 100644 --- a/pkgs/servers/web-apps/ethercalc/node-packages.nix +++ b/pkgs/servers/web-apps/ethercalc/node-packages.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { diff --git a/pkgs/servers/web-apps/whitebophir/default.nix b/pkgs/servers/web-apps/whitebophir/default.nix index 577a05186356..f9b5aff84477 100644 --- a/pkgs/servers/web-apps/whitebophir/default.nix +++ b/pkgs/servers/web-apps/whitebophir/default.nix @@ -1,12 +1,12 @@ { stdenv , pkgs , lib -, nodejs-16_x +, nodejs_16 , runtimeShell }: let - nodejs = nodejs-16_x; + nodejs = nodejs_16; nodePackages = import ./node-packages.nix { inherit pkgs nodejs; diff --git a/pkgs/servers/web-apps/whitebophir/node-packages.nix b/pkgs/servers/web-apps/whitebophir/node-packages.nix index 87e4c4462b13..ebd06cd4a284 100644 --- a/pkgs/servers/web-apps/whitebophir/node-packages.nix +++ b/pkgs/servers/web-apps/whitebophir/node-packages.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { diff --git a/pkgs/tools/admin/meshcentral/default.nix b/pkgs/tools/admin/meshcentral/default.nix index e3a5880fcd03..234f7d905679 100644 --- a/pkgs/tools/admin/meshcentral/default.nix +++ b/pkgs/tools/admin/meshcentral/default.nix @@ -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 { version = "1.1.5"; @@ -24,7 +24,7 @@ yarn2nix-moretea.mkYarnPackage { preFixup = '' mkdir -p $out/bin 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 ''; diff --git a/pkgs/tools/audio/botamusique/default.nix b/pkgs/tools/audio/botamusique/default.nix index 249e9629a6f1..c9bf6ed07cd5 100644 --- a/pkgs/tools/audio/botamusique/default.nix +++ b/pkgs/tools/audio/botamusique/default.nix @@ -15,7 +15,7 @@ , nodePackages }: let - nodejs = pkgs.nodejs-14_x; + nodejs = pkgs.nodejs_14; nodeEnv = import ../../../development/node-packages/node-env.nix { inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; diff --git a/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix b/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix index c85f89b56038..a621dc22dee9 100644 --- a/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix +++ b/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: let nodeEnv = import ../../../../development/node-packages/node-env.nix { diff --git a/pkgs/tools/misc/ntfy-sh/node-composition.nix b/pkgs/tools/misc/ntfy-sh/node-composition.nix index a038d882e7fe..f8182c1e6e59 100644 --- a/pkgs/tools/misc/ntfy-sh/node-composition.nix +++ b/pkgs/tools/misc/ntfy-sh/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { diff --git a/pkgs/tools/networking/airfield/node.nix b/pkgs/tools/networking/airfield/node.nix index f9a1999f36d7..d88767570510 100644 --- a/pkgs/tools/networking/airfield/node.nix +++ b/pkgs/tools/networking/airfield/node.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index b7434491ba99..f638c4bfca81 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -11,7 +11,7 @@ , makeDesktopItem , makeWrapper , moreutils -, nodejs-16_x +, nodejs_16 , pkg-config , python3 , rustPlatform @@ -22,7 +22,7 @@ let description = "A secure and free password manager for all of your devices"; icon = "bitwarden"; - buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs-16_x; }; + buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_16; }; version = "2023.3.2"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/onlykey/onlykey.nix b/pkgs/tools/security/onlykey/onlykey.nix index a038d882e7fe..f8182c1e6e59 100644 --- a/pkgs/tools/security/onlykey/onlykey.nix +++ b/pkgs/tools/security/onlykey/onlykey.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { diff --git a/pkgs/tools/security/vaultwarden/webvault.nix b/pkgs/tools/security/vaultwarden/webvault.nix index 43de28a914a9..7cc2a7e429de 100644 --- a/pkgs/tools/security/vaultwarden/webvault.nix +++ b/pkgs/tools/security/vaultwarden/webvault.nix @@ -3,12 +3,12 @@ , fetchFromGitHub , git , nixosTests -, nodejs-16_x +, nodejs_16 , python3 }: let - buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs-16_x; }; + buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_16; }; version = "2023.3.0b"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 28e9c8e40df2..55e7e3dd17ad 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1121,9 +1121,19 @@ mapAliases ({ 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"; # Modified 2022-04-26 - nodejs-10_x = 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 = throw "nodejs-10_x has been removed. Use a newer version instead."; # Added 2022-05-31 + 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-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 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 739980d28097..3126407fe6de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3590,7 +3590,7 @@ with pkgs; 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 { }; @@ -6174,9 +6174,9 @@ with pkgs; hedgedoc = callPackage ../servers/web-apps/hedgedoc { inherit (callPackage ../development/tools/yarn2nix-moretea/yarn2nix { - nodejs = nodejs-16_x; + nodejs = nodejs_16; }) mkYarnPackage; - nodejs = nodejs-16_x; + nodejs = nodejs_16; }; colord = callPackage ../tools/misc/colord { }; @@ -9400,27 +9400,27 @@ with pkgs; 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; }; - nodejs-slim-14_x = callPackage ../development/web/nodejs/v14.nix { + nodejs-slim_14 = callPackage ../development/web/nodejs/v14.nix { openssl = openssl_1_1; enableNpm = false; }; - nodejs-16_x = callPackage ../development/web/nodejs/v16.nix { }; - nodejs-slim-16_x = callPackage ../development/web/nodejs/v16.nix { + nodejs_16 = callPackage ../development/web/nodejs/v16.nix { }; + nodejs-slim_16 = callPackage ../development/web/nodejs/v16.nix { enableNpm = false; }; - nodejs-18_x = callPackage ../development/web/nodejs/v18.nix { }; - nodejs-slim-18_x = callPackage ../development/web/nodejs/v18.nix { + nodejs_18 = callPackage ../development/web/nodejs/v18.nix { }; + nodejs-slim_18 = callPackage ../development/web/nodejs/v18.nix { enableNpm = false; }; - nodejs-19_x = callPackage ../development/web/nodejs/v19.nix { }; - nodejs-slim-19_x = callPackage ../development/web/nodejs/v19.nix { + nodejs_19 = callPackage ../development/web/nodejs/v19.nix { }; + nodejs-slim_19 = callPackage ../development/web/nodejs/v19.nix { enableNpm = false; }; nodejs_20 = callPackage ../development/web/nodejs/v20.nix { }; @@ -9987,10 +9987,10 @@ with pkgs; }; 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 { - nodejs = nodejs-16_x; - yarn = yarn.override { nodejs = nodejs-16_x; }; + nodejs = nodejs_16; + yarn = yarn.override { nodejs = nodejs_16; }; }) mkYarnPackage; }; @@ -20960,7 +20960,7 @@ with pkgs; }; isso = callPackage ../servers/isso { - nodejs = nodejs-14_x; + nodejs = nodejs_14; }; 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 { - nodejs = nodejs-14_x; + nodejs = nodejs_14; }; lightgbm = callPackage ../development/libraries/lightgbm { }; @@ -25422,7 +25422,7 @@ with pkgs; outline = callPackage ../servers/web-apps/outline (lib.fix (super: { yarn2nix-moretea = yarn2nix-moretea.override { inherit (super) nodejs yarn; }; yarn = yarn.override { inherit (super) nodejs; }; - nodejs = nodejs-16_x; + nodejs = nodejs_16; })); openbgpd = callPackage ../servers/openbgpd { }; @@ -29875,7 +29875,7 @@ with pkgs; epeg = callPackage ../applications/graphics/epeg { }; epgstation = callPackage ../applications/video/epgstation { - nodejs = nodejs-16_x; + nodejs = nodejs_16; }; inherit (gnome) epiphany; @@ -33000,7 +33000,7 @@ with pkgs; peek = callPackage ../applications/video/peek { }; peertube = callPackage ../servers/peertube { - nodejs = nodejs-16_x; + nodejs = nodejs_16; }; peroxide = callPackage ../applications/networking/peroxide { }; |