Add attribute that holds the resulting hierarchy

See comment in the committed code for details

svn path=/nixpkgs/trunk/; revision=28600
This commit is contained in:
Yury G. Kudryashov 2011-08-15 19:28:12 +00:00
parent 05bd532964
commit 519f4ea4b8

View File

@ -48,7 +48,11 @@ let
pkgs); pkgs);
in in
runCommand "${module}-${release}" runCommand "${module}-${release}"
({passthru = attrs // { propagatedUserEnvPackages = list; recurseForDerivations = true;};}) ({passthru = attrs // {
propagatedUserEnvPackages = list;
recurseForDerivations = true;
projects = attrs;
};})
'' ''
mkdir -pv $out/nix-support mkdir -pv $out/nix-support
echo "${toString list}" | tee $out/nix-support/propagated-user-env-packages echo "${toString list}" | tee $out/nix-support/propagated-user-env-packages
@ -117,9 +121,12 @@ kdepkgs // kdepkgs.kdebase //
inherit release; inherit release;
# nix-instantiate /etc/nixos/nixpkgs -A kde47.moduleNames --strict to see
# available packages
moduleNames = stdenv.lib.mapAttrs
(n: v: if v ? projects then builtins.attrNames v.projects else null) kdepkgs;
full = stdenv.lib.attrValues kdepkgs; full = stdenv.lib.attrValues kdepkgs;
l10n = callPackage ./l10n { inherit release; }; l10n = callPackage ./l10n { inherit release; };
subdirNames = map (x: x.module) (stdenv.lib.filter (x: !x.split && (x ? pkgs)) manifest.modules);
} }