Merge pull request NixOS#2 from briangebala/release-14.12

Inline swizzle of NodeJs.
briangebala · Jun 11, 2015 · fa9731f · fa9731f
2 parents fa6da30 + 0a70602
commit fa9731f
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -1609,7 +1609,8 @@ let
 
   ninka = callPackage ../development/tools/misc/ninka { };
 
-  nodejs = callPackage ../development/web/nodejs { };
+  #nodejs = callPackage ../development/web/nodejs { };
+
   nodejs-unstable = callPackage ../development/web/nodejs { unstableVersion = true; };
 
   nodePackages = callPackage ./node-packages.nix {
@@ -13011,7 +13012,6 @@ let
 
 
   ### Custom packages.
-
-  nodejs12 = callPackage ../ai2/nodejs {};
+  nodejs = callPackage ../ai2/nodejs {};
 
 }; in self; in pkgs