summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2014-02-03 17:28:12 -0500
committerShea Levy <shea@shealevy.com>2014-02-03 17:28:38 -0500
commitf2210651eb5bb01a46a64c565d2cf3faf74d6f55 (patch)
tree39a19d7aa2266f02a3d5ba1b7ac549bdcdff8f12 /pkgs
parent3bec816e0d4f4719c29d5f7ef2e2860b72c01318 (diff)
downloadnixpkgs-f2210651eb5bb01a46a64c565d2cf3faf74d6f55.tar
nixpkgs-f2210651eb5bb01a46a64c565d2cf3faf74d6f55.tar.gz
nixpkgs-f2210651eb5bb01a46a64c565d2cf3faf74d6f55.tar.bz2
nixpkgs-f2210651eb5bb01a46a64c565d2cf3faf74d6f55.tar.lz
nixpkgs-f2210651eb5bb01a46a64c565d2cf3faf74d6f55.tar.xz
nixpkgs-f2210651eb5bb01a46a64c565d2cf3faf74d6f55.tar.zst
nixpkgs-f2210651eb5bb01a46a64c565d2cf3faf74d6f55.zip
Revert "Hide nodePackages from nix-env"
Now node packages that aren't just programs have a node- prefix in their
names.

This reverts commit 2f11bc495b50c36c1984f334df6867c1b9200a91.

Signed-off-by: Shea Levy <shea@shealevy.com>
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/top-level/all-packages.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4d1a6dadbb7..cca8cd32368 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1253,11 +1253,11 @@ let
 
   nodejs = callPackage ../development/web/nodejs {};
 
-  nodePackages = import ./node-packages.nix {
+  nodePackages = recurseIntoAttrs (import ./node-packages.nix {
     inherit pkgs stdenv nodejs fetchurl fetchgit;
     neededNatives = [python] ++ lib.optional (lib.elem system lib.platforms.linux) utillinux;
     self = pkgs.nodePackages;
-  };
+  });
 
   ldapvi = callPackage ../tools/misc/ldapvi { };