From a1835b9924d3786170a7df3347f58d84ab09f455 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Thu, 22 Feb 2018 10:52:07 +0800
Subject: [PATCH] treewide: Remove references to nodejs-4_x

---
 pkgs/development/node-packages/generate.sh    | 1 -
 pkgs/development/web/remarkjs/nodepkgs.nix    | 4 ++--
 pkgs/servers/web-apps/pump.io/composition.nix | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/node-packages/generate.sh b/pkgs/development/node-packages/generate.sh
index 5ce63dd882fe..c3aa741ef806 100755
--- a/pkgs/development/node-packages/generate.sh
+++ b/pkgs/development/node-packages/generate.sh
@@ -2,6 +2,5 @@
 #! nix-shell -i bash -p nodePackages.node2nix
 
 rm -f node-env.nix
-node2nix -i node-packages-v4.json -o node-packages-v4.nix -c composition-v4.nix
 node2nix -6 -i node-packages-v6.json -o node-packages-v6.nix -c composition-v6.nix
 node2nix -8 -i node-packages-v8.json -o node-packages-v8.nix -c composition-v8.nix
diff --git a/pkgs/development/web/remarkjs/nodepkgs.nix b/pkgs/development/web/remarkjs/nodepkgs.nix
index 751638e02da8..dde8ada0db93 100644
--- a/pkgs/development/web/remarkjs/nodepkgs.nix
+++ b/pkgs/development/web/remarkjs/nodepkgs.nix
@@ -2,7 +2,7 @@
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-4_x"}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}:
 
 let
   nodeEnv = import ../../node-packages/node-env.nix {
@@ -13,4 +13,4 @@ in
 import ./node-packages.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
-}
\ No newline at end of file
+}
diff --git a/pkgs/servers/web-apps/pump.io/composition.nix b/pkgs/servers/web-apps/pump.io/composition.nix
index ee4dab5ad64a..da8cc0e73b13 100644
--- a/pkgs/servers/web-apps/pump.io/composition.nix
+++ b/pkgs/servers/web-apps/pump.io/composition.nix
@@ -2,7 +2,7 @@
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-4_x"}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}:
 
 let
   nodeEnv = import ../../../development/node-packages/node-env.nix {
@@ -13,4 +13,4 @@ in
 import ./node-packages.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
-}
\ No newline at end of file
+}