From 2f11bc495b50c36c1984f334df6867c1b9200a91 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 7 Jan 2014 13:37:51 +0100 Subject: [PATCH] Hide nodePackages from nix-env Many nodePackages have identical names as "normal" packages (e.g., swig, redis, tar) which is obviously bad. So don't make nix-env recursive into nodePackages. A better solution would be to have node packages have a "node-" prefix, similar to Perl and Python packages. --- 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 d66773d9d33..d35430d161b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1237,11 +1237,11 @@ let nodejs = callPackage ../development/web/nodejs {}; - nodePackages = recurseIntoAttrs (import ./node-packages.nix { + nodePackages = 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 { };