diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index 79f8edcc81a5..c93d5706de4d 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -930,11 +930,6 @@
Please use the fork cawbird instead which has been adapted to the API changes and is still maintained.
-
-
- The nodejs-11_x package has been removed as it's EOLed by upstream.
-
-
diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/applications/science/math/sage/sage-env.nix
index 8fd69f62171a..0b67b3cff12b 100644
--- a/pkgs/applications/science/math/sage/sage-env.nix
+++ b/pkgs/applications/science/math/sage/sage-env.nix
@@ -44,6 +44,7 @@
, gsl
, ntl
, jdk
+, less
}:
# This generates a `sage-env` shell file that will be sourced by sage on startup.
@@ -92,6 +93,7 @@ let
rubiks
flintqs
jdk # only needed for `jmol` which may be replaced in the future
+ less # needed to prevent transient test errors until https://github.com/ipython/ipython/pull/11864 is resolved
]
));
in
diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix
index 4b12d66a3a2d..f20ede9db05d 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
+, sassc, nodejs-11_x
, writeText }:
buildPythonPackage rec {
@@ -16,7 +16,7 @@ buildPythonPackage rec {
node_modules = fetchNodeModules {
src = "${src}/srht";
- nodejs = nodejs;
+ nodejs = nodejs-11_x;
sha256 = "0axl50swhcw8llq8z2icwr4nkr5qsw2riih0a040f9wx4xiw4p6p";
};
@@ -26,7 +26,7 @@ buildPythonPackage rec {
nativeBuildInputs = [
sassc
- nodejs
+ nodejs-11_x
];
propagatedBuildInputs = [
diff --git a/pkgs/development/web/nodejs/v11.nix b/pkgs/development/web/nodejs/v11.nix
new file mode 100644
index 000000000000..7b60a3772d3c
--- /dev/null
+++ b/pkgs/development/web/nodejs/v11.nix
@@ -0,0 +1,10 @@
+{ 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 5f96c3532d68..c7dd797324ef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4412,6 +4412,10 @@ 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;