diff options
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-1909.xml | 5 | ||||
| -rw-r--r-- | pkgs/applications/version-management/sourcehut/core.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/web/nodejs/v11.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
4 files changed, 8 insertions, 17 deletions
diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index f42471c5969..66f803ac442 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -519,6 +519,11 @@ Please use the fork <literal>cawbird</literal> instead which has been adapted to the API changes and is still maintained. </para> </listitem> + <listitem> + <para> + The <literal>nodejs-11_x</literal> package has been removed as it's EOLed by upstream. + </para> + </listitem> </itemizedlist> </section> diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix index ca054c5cfde..21ee99684bd 100644 --- a/pkgs/applications/version-management/sourcehut/core.nix +++ b/pkgs/applications/version-management/sourcehut/core.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, fetchNodeModules, buildPythonPackage , pgpy, flask, bleach, misaka, humanize, markdown, psycopg2, pygments, requests , sqlalchemy, flask_login, beautifulsoup4, sqlalchemy-utils, celery, alembic -, sassc, nodejs-11_x +, sassc, nodejs , writeText }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { node_modules = fetchNodeModules { src = "${src}/srht"; - nodejs = nodejs-11_x; + nodejs = nodejs; sha256 = "0axl50swhcw8llq8z2icwr4nkr5qsw2riih0a040f9wx4xiw4p6p"; }; @@ -26,7 +26,7 @@ buildPythonPackage rec { nativeBuildInputs = [ sassc - nodejs-11_x + nodejs ]; propagatedBuildInputs = [ diff --git a/pkgs/development/web/nodejs/v11.nix b/pkgs/development/web/nodejs/v11.nix deleted file mode 100644 index 7b60a3772d3..00000000000 --- a/pkgs/development/web/nodejs/v11.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ callPackage, openssl, enableNpm ? true }: - -let - buildNodejs = callPackage ./nodejs.nix { inherit openssl; }; -in - buildNodejs { - inherit enableNpm; - version = "11.15.0"; - sha256 = "68a776c5d8b8b91a8f2adac2ca4ce4390ae1804883ec7ec9c0d6a6a64d306a76"; - } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 614cd4e4e40..f76b3d98712 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4452,10 +4452,6 @@ in nodejs-slim-10_x = callPackage ../development/web/nodejs/v10.nix { enableNpm = false; }; - nodejs-11_x = callPackage ../development/web/nodejs/v11.nix { }; - nodejs-slim-11_x = callPackage ../development/web/nodejs/v11.nix { - enableNpm = false; - }; nodejs-12_x = callPackage ../development/web/nodejs/v12.nix { }; nodejs-slim-12_x = callPackage ../development/web/nodejs/v12.nix { enableNpm = false; |