From 2d0e07c24203f5f6b206f8237122a9069ec59d7f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 26 Mar 2012 10:22:27 +0000 Subject: [PATCH] * Don't recurse into perl510Packages. It confuses nix-env -u since it can't distinguish between 5.10 and 5.14 packages. (We should probably include the Perl version number in the name of Perl packages, like GHC packages.) svn path=/nixpkgs/trunk/; revision=33422 --- 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 c92c7517db4..1cf32638a83 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4930,12 +4930,12 @@ let inherit pkgs; }); - perl510Packages = recurseIntoAttrs (import ./perl-packages.nix { + perl510Packages = import ./perl-packages.nix { pkgs = pkgs // { perl = perl510; buildPerlPackage = import ../development/perl-modules/generic perl510; }; - }); + }; perlXMLParser = perlPackages.XMLParser;