summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2019-10-04 20:37:06 +0200
committerMaximilian Bosch <maximilian@mbosch.me>2019-10-04 20:37:06 +0200
commit973530c8b6ddf0e5ed96bf37a62ac38126e83176 (patch)
treeb397cb695a5b5c5575b9cb7f01f0cc2ee4bdd69f /pkgs
parent33cf7a8fcd5a23bb4df43caa31d8953a57aeac0d (diff)
Revert "Revert "nodejs-11_x: remove""
This reverts commit 699e081a6007e2552dc6c8fe8d2150cbf6fe7e1a.
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/version-management/sourcehut/core.nix6
-rw-r--r--pkgs/development/web/nodejs/v11.nix10
-rw-r--r--pkgs/top-level/all-packages.nix4
3 files changed, 3 insertions, 17 deletions
diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix
index f20ede9db05df..4b12d66a3a2d8 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 7b60a3772d3cb..0000000000000
--- 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 c7dd797324ef8..5f96c3532d689 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4412,10 +4412,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;