diff options
author | Timo Kaufmann <timokau@zoho.com> | 2019-10-04 20:19:34 +0200 |
---|---|---|
committer | Timo Kaufmann <timokau@zoho.com> | 2019-10-04 20:19:58 +0200 |
commit | 699e081a6007e2552dc6c8fe8d2150cbf6fe7e1a (patch) | |
tree | f7b2f6b2ea114651818ef260c1c484b348f0aec6 /pkgs | |
parent | 4e3230f71911ce5e64a3abe437ca1988705da95b (diff) |
Revert "nodejs-11_x: remove"
This reverts commit 3a12434b93f0360e924621be590675dabc5977cf. The commit broke eval since the removed attribute is still in use.
Diffstat (limited to 'pkgs')
-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 |
3 files changed, 17 insertions, 3 deletions
diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix index 4b12d66a3a2d8..f20ede9db05df 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 0000000000000..7b60a3772d3cb --- /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 5f96c3532d689..c7dd797324ef8 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; |