diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-11-19 19:09:10 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-11-19 19:09:10 +0000 |
| commit | e85500987b7df503b37a127a5ea49a07f92e70f0 (patch) | |
| tree | 5f66b5de9aadaf0ff3ba52c394dc0066114e11e2 /pkgs/lib/attrsets.nix | |
| parent | 7ade207f6b75da0fde94cec621ac6d8fa6c3e586 (diff) | |
| parent | 58f543f19f1a2eed8a46202b36a855836cfc9e0f (diff) | |
| download | nixpkgs-e85500987b7df503b37a127a5ea49a07f92e70f0.tar nixpkgs-e85500987b7df503b37a127a5ea49a07f92e70f0.tar.gz nixpkgs-e85500987b7df503b37a127a5ea49a07f92e70f0.tar.bz2 nixpkgs-e85500987b7df503b37a127a5ea49a07f92e70f0.tar.lz nixpkgs-e85500987b7df503b37a127a5ea49a07f92e70f0.tar.xz nixpkgs-e85500987b7df503b37a127a5ea49a07f92e70f0.tar.zst nixpkgs-e85500987b7df503b37a127a5ea49a07f92e70f0.zip | |
Merging from trunk. I had to do two manual merges, quite trivial I think.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18472
Diffstat (limited to 'pkgs/lib/attrsets.nix')
| -rw-r--r-- | pkgs/lib/attrsets.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/lib/attrsets.nix b/pkgs/lib/attrsets.nix index 4b2496c1987..4be944d8494 100644 --- a/pkgs/lib/attrsets.nix +++ b/pkgs/lib/attrsets.nix @@ -15,7 +15,7 @@ rec { /* Return an attribute from nested attribute sets. For instance ["x" "y"] applied to some set e returns e.x.y, if it exists. The - default value is returned otherwise. */ + default value is returned otherwise. */ attrByPath = attrPath: default: e: let attr = head attrPath; in @@ -200,7 +200,7 @@ rec { /* Does the same as the update operator '//' except that attributes are merged until the given pedicate is verified. The predicate should - except 3 arguments which are the path to reach the attribute, a part of + accept 3 arguments which are the path to reach the attribute, a part of the first attribute set and a part of the second attribute set. When the predicate is verified, the value of the first attribute set is replaced by the value of the second attribute set. |