From f2210651eb5bb01a46a64c565d2cf3faf74d6f55 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 3 Feb 2014 17:28:12 -0500 Subject: [PATCH] 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 --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file 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 { };