diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index 0e067cf1f55..049d21d01b2 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -214,6 +214,11 @@ have a look at the official repo. + + + Nodejs 8 is scheduled EOL under the lifetime of 19.09 and has been dropped. + + diff --git a/pkgs/applications/networking/instant-messengers/rambox/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/bare.nix index a9ee4dd6aea..60a4dd39fb0 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/bare.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/bare.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchNodeModules, nodejs-8_x, ruby, sencha +{ stdenv, fetchFromGitHub, fetchNodeModules, nodejs-10_x, ruby, sencha , auth0ClientID, auth0Domain }: stdenv.mkDerivation rec { @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { sha256 = "1h44srl2gzkhjaazpwz1pwy4dp5x776fc685kahlvjlsfls0fvy9"; }; - nativeBuildInputs = [ nodejs-8_x ruby sencha ]; + nativeBuildInputs = [ nodejs-10_x ruby sencha ]; node_modules = fetchNodeModules { inherit src; - nodejs = nodejs-8_x; + nodejs = nodejs-10_x; sha256 = "0qsgr8cq81yismal5sqr02skakqpynwwzk5s98dr5bg91y361fgy"; }; diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix index e29801c51f9..6821474c4d0 100644 --- a/pkgs/development/mobile/titaniumenv/default.nix +++ b/pkgs/development/mobile/titaniumenv/default.nix @@ -12,7 +12,7 @@ rec { buildApp = import ./build-app.nix { inherit (pkgs) stdenv python which file jdk nodejs; - inherit (pkgs.nodePackages_8_x) alloy titanium; + inherit (pkgs.nodePackages_10_x) alloy titanium; inherit (androidenv) composeAndroidPackages; inherit (xcodeenv) composeXcodeWrapper; inherit titaniumsdk; diff --git a/pkgs/development/node-packages/composition-v10.nix b/pkgs/development/node-packages/composition-v10.nix index fa4b4c3be56..9f723a6da47 100644 --- a/pkgs/development/node-packages/composition-v10.nix +++ b/pkgs/development/node-packages/composition-v10.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.7.0. Do not edit! +# This file has been generated by node2nix 1.6.0. Do not edit! {pkgs ? import { inherit system; diff --git a/pkgs/development/node-packages/composition-v12.nix b/pkgs/development/node-packages/composition-v12.nix index 880d72efd35..4f05009f3ef 100644 --- a/pkgs/development/node-packages/composition-v12.nix +++ b/pkgs/development/node-packages/composition-v12.nix @@ -1,8 +1,8 @@ -# This file has been generated by node2nix 1.7.0. Do not edit! +# This file has been generated by node2nix 1.6.0. Do not edit! {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: let nodeEnv = import ./node-env.nix { diff --git a/pkgs/development/node-packages/composition-v8.nix b/pkgs/development/node-packages/composition-v8.nix deleted file mode 100644 index 7fcc3f81133..00000000000 --- a/pkgs/development/node-packages/composition-v8.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file has been generated by node2nix 1.7.0. Do not edit! - -{pkgs ? import { - inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}: - -let - nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; - inherit nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; - }; -in -import ./node-packages-v8.nix { - inherit (pkgs) fetchurl fetchgit; - inherit nodeEnv; -} \ No newline at end of file diff --git a/pkgs/development/node-packages/default-v10.nix b/pkgs/development/node-packages/default-v10.nix index 50b33f7effd..8a479924d46 100644 --- a/pkgs/development/node-packages/default-v10.nix +++ b/pkgs/development/node-packages/default-v10.nix @@ -7,15 +7,6 @@ let }; in nodePackages // { - aws-azure-login = nodePackages.aws-azure-login.override { - PUPPETEER_SKIP_CHROMIUM_DOWNLOAD = "true"; - - buildInputs = [ pkgs.makeWrapper ]; - postInstall = '' - wrapProgram "$out/bin/aws-azure-login" --set PUPPETEER_EXECUTABLE_PATH "${pkgs.chromium}/bin/chromium" - ''; - }; - bower2nix = nodePackages.bower2nix.override { buildInputs = [ pkgs.makeWrapper ]; postInstall = '' diff --git a/pkgs/development/node-packages/default-v8.nix b/pkgs/development/node-packages/default-v8.nix deleted file mode 100644 index d90c3ab3364..00000000000 --- a/pkgs/development/node-packages/default-v8.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ pkgs, nodejs, stdenv }: - -let - nodePackages = import ./composition-v8.nix { - inherit pkgs nodejs; - inherit (stdenv.hostPlatform) system; - }; -in -nodePackages // { - pnpm = nodePackages.pnpm.override { - nativeBuildInputs = [ pkgs.makeWrapper ]; - postInstall = let - pnpmLibPath = stdenv.lib.makeBinPath [ - nodejs.passthru.python - nodejs - ]; - in '' - for prog in $out/bin/*; do - wrapProgram "$prog" --prefix PATH : ${pnpmLibPath} - done - ''; - }; - - stf = nodePackages.stf.override { - nativeBuildInputs = with pkgs; [ yasm czmq protobufc ]; - }; -} diff --git a/pkgs/development/node-packages/generate.sh b/pkgs/development/node-packages/generate.sh index 5975cc8966b..dafbcb17f7e 100755 --- a/pkgs/development/node-packages/generate.sh +++ b/pkgs/development/node-packages/generate.sh @@ -4,6 +4,5 @@ set -eu -o pipefail rm -f node-env.nix -node2nix -8 -i node-packages-v8.json -o node-packages-v8.nix -c composition-v8.nix node2nix --nodejs-10 -i node-packages-v10.json -o node-packages-v10.nix -c composition-v10.nix node2nix --nodejs-12 -i node-packages-v12.json -o node-packages-v12.nix -c composition-v12.nix diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index 670556bf271..720e0cc0850 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -11,7 +11,7 @@ let cat > $out/bin/tar < { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: let nodeEnv = import ../../node-packages/node-env.nix { diff --git a/pkgs/misc/base16-builder/node-packages.nix b/pkgs/misc/base16-builder/node-packages.nix index 9df36bde4b0..e7b4f81f7e0 100644 --- a/pkgs/misc/base16-builder/node-packages.nix +++ b/pkgs/misc/base16-builder/node-packages.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: let nodeEnv = import ../../development/node-packages/node-env.nix { diff --git a/pkgs/servers/web-apps/cryptpad/node-packages.nix b/pkgs/servers/web-apps/cryptpad/node-packages.nix index cae300a53f4..75e28e2382e 100644 --- a/pkgs/servers/web-apps/cryptpad/node-packages.nix +++ b/pkgs/servers/web-apps/cryptpad/node-packages.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { @@ -14,4 +14,4 @@ in import ./node-packages-generated.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} \ No newline at end of file +} diff --git a/pkgs/tools/networking/airfield/node.nix b/pkgs/tools/networking/airfield/node.nix index 0983d3e127b..8fe405e1b3e 100644 --- a/pkgs/tools/networking/airfield/node.nix +++ b/pkgs/tools/networking/airfield/node.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { diff --git a/pkgs/tools/package-management/nixui/nixui.nix b/pkgs/tools/package-management/nixui/nixui.nix index 0983d3e127b..8fe405e1b3e 100644 --- a/pkgs/tools/package-management/nixui/nixui.nix +++ b/pkgs/tools/package-management/nixui/nixui.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { diff --git a/pkgs/tools/security/bitwarden-cli/node-packages.nix b/pkgs/tools/security/bitwarden-cli/node-packages.nix index 6fb6421eb2d..ea2be5965aa 100644 --- a/pkgs/tools/security/bitwarden-cli/node-packages.nix +++ b/pkgs/tools/security/bitwarden-cli/node-packages.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e90d4be263b..f5b9a1b6bde 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -653,7 +653,7 @@ in iamy = callPackage ../tools/admin/iamy { }; - azure-cli = nodePackages_8_x.azure-cli; + azure-cli = nodePackages_10_x.azure-cli; azure-storage-azcopy = callPackage ../development/tools/azcopy { }; @@ -4313,9 +4313,6 @@ in nodejs-slim = nodejs-slim-10_x; - nodejs-8_x = callPackage ../development/web/nodejs/v8.nix {}; - nodejs-slim-8_x = callPackage ../development/web/nodejs/v8.nix { enableNpm = false; }; - nodejs-10_x = callPackage ../development/web/nodejs/v10.nix { openssl = openssl_1_1; }; @@ -4350,10 +4347,6 @@ in nodejs = pkgs.nodejs-10_x; }); - nodePackages_8_x = dontRecurseIntoAttrs (callPackage ../development/node-packages/default-v8.nix { - nodejs = pkgs.nodejs-8_x; - }); - nodePackages = nodePackages_10_x; now-cli = callPackage ../development/web/now-cli {}; @@ -16537,7 +16530,7 @@ in iosevka = callPackage ../data/fonts/iosevka { - nodejs = nodejs-8_x; + nodejs = nodejs-10_x; }; iosevka-bin = callPackage ../data/fonts/iosevka/bin.nix {};