Author: urkud
Date: Mon Aug 15 19:28:12 2011
New Revision: 28600
URL: https://svn.nixos.org/websvn/nix/?rev=28600&sc=1
Log:
Add attribute that holds the resulting hierarchy
See comment in the committed code for details
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.7/default.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.7/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.7/default.nix Mon Aug 15 18:59:23
2011 (r28599)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.7/default.nix Mon Aug 15 19:28:12
2011 (r28600)
@@ -48,7 +48,11 @@
pkgs);
in
runCommand "${module}-${release}"
- ({passthru = attrs // { propagatedUserEnvPackages = list;
recurseForDerivations = true;};})
+ ({passthru = attrs // {
+ propagatedUserEnvPackages = list;
+ recurseForDerivations = true;
+ projects = attrs;
+ };})
''
mkdir -pv $out/nix-support
echo "${toString list}" | tee
$out/nix-support/propagated-user-env-packages
@@ -117,9 +121,12 @@
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;
l10n = callPackage ./l10n { inherit release; };
-
- subdirNames = map (x: x.module) (stdenv.lib.filter (x: !x.split && (x ?
pkgs)) manifest.modules);
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
