public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implementing a fix allowing deepOverride without changing dependency-tree-leaf packages 

svn path=/nixpkgs/trunk/; revision=22533
This commit is contained in:
Michael Raskin 2010-07-08 15:31:59 +00:00
parent e89dbf1184
commit aadb898a0b
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/zlib/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, static ? false, ...}: {stdenv, fetchurl, static ? false}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "zlib-1.2.3"; name = "zlib-1.2.3";

5
pkgs/lib/attrsets.nix
View File

@ -270,4 +270,9 @@ rec {
else eqStrict pat val else eqStrict pat val
) [pattern attrs])); ) [pattern attrs]));
# override only the attributes that are already present in the old set
# useful for deep-overriding
overrideExisting = old: new:
old // listToAttrs (map (attr: nameValuePair attr (attrByPath [attr] (getAttr attr old) new)) (attrNames old));
} }

3
pkgs/lib/customisation.nix
View File

@ -53,11 +53,10 @@ rec {
{ override = newArgs: { override = newArgs:
makeOverridable f (origArgs // (if builtins.isFunction newArgs then newArgs origArgs else newArgs)); makeOverridable f (origArgs // (if builtins.isFunction newArgs then newArgs origArgs else newArgs));
deepOverride = newArgs: deepOverride = newArgs:
makeOverridable f ((lib.mapAttrs (deepOverrider newArgs) origArgs) // newArgs); makeOverridable f (lib.overrideExisting (lib.mapAttrs (deepOverrider newArgs) origArgs) newArgs);
origArgs = origArgs; origArgs = origArgs;
}; };
deepOverrider = newArgs: name: x: if builtins.isAttrs x then ( deepOverrider = newArgs: name: x: if builtins.isAttrs x then (
if x ? deepOverride then (x.deepOverride newArgs) else if x ? deepOverride then (x.deepOverride newArgs) else
if x ? override then (x.override newArgs) else if x ? override then (x.override newArgs) else