Deprecate lib.zip in favor of lib.zipAttrsWith.

Add deprecation trace message.
Nixos has been ported away from lib.zip in d705c0c3a4b84768907ade90b3f420d62db422a2.
This commit is contained in:
Evgeny Egorochkin 2013-08-22 10:06:43 +03:00
parent a3f148ce96
commit fcbc4fe9ff
2 changed files with 2 additions and 2 deletions

View file

@ -246,7 +246,7 @@ rec {
/* backward compatibility */
zipWithNames = zipAttrsWithNames;
zip = zipAttrsWith;
zip = builtins.trace "lib.zip is deprecated, use lib.zipAttrsWith instead" zipAttrsWith;
/* Does the same as the update operator '//' except that attributes are

View file

@ -117,7 +117,7 @@ rec {
name = "attribute set of ${elemType.name}s";
check = x: lib.traceValIfNot isAttrs x
&& fold (e: v: v && elemType.check e) true (lib.attrValues x);
merge = lib.zip (name: elemType.merge);
merge = lib.zipAttrsWith (name: elemType.merge);
iter = f: path: set: lib.mapAttrs (name: elemType.iter f (path + "." + name)) set;
fold = op: nul: set: fold (e: l: elemType.fold op l e) nul (lib.attrValues set);
docPath = path: elemType.docPath (path + ".<name>");