Author: urkud Date: Sun Sep 11 12:41:47 2011 New Revision: 29180 URL: https://ssl.nixos.org/websvn/nix/?rev=29180&sc=1
Log: Allow full ~/.nixpkgs/config.nix syntax in nixpkgs.config Namely, allow {pkgs}: { packageOverrides = p: ...; }; Modified: nixos/trunk/modules/misc/nixpkgs.nix Modified: nixos/trunk/modules/misc/nixpkgs.nix ============================================================================== --- nixos/trunk/modules/misc/nixpkgs.nix Sun Sep 11 12:39:06 2011 (r29179) +++ nixos/trunk/modules/misc/nixpkgs.nix Sun Sep 11 12:41:47 2011 (r29180) @@ -11,7 +11,11 @@ then f x else f; - mergeConfig = lhs: rhs: + mergeConfig = lhs_: rhs_: + let + lhs = optCall lhs_ { inherit pkgs; }; + rhs = optCall rhs_ { inherit pkgs; }; + in lhs // rhs // optionalAttrs (lhs ? packageOverrides) { packageOverrides = pkgs: _______________________________________________ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits