summaryrefslogtreecommitdiffstats
path: root/lib/attrsets.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2013-11-12 13:50:45 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2013-11-12 13:50:45 +0100
commita8b693fef7bd44695a3891deb386a4d09ae8ae1b (patch)
treefce66b811cafe81ede9b31d05a233598e6073196 /lib/attrsets.nix
parent785eaf2cea3c57daef96bb209f44589e3f48a7ff (diff)
Remove backward-compatible implementations of some primops
Nixpkgs requires at least Nix 1.2 anyway, so these are now useless.
Diffstat (limited to 'lib/attrsets.nix')
-rw-r--r--lib/attrsets.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index f314c02ff32b..da735d71b255 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -20,7 +20,7 @@ rec {
let attr = head attrPath;
in
if attrPath == [] then e
- else if builtins ? hasAttr && hasAttr attr e
+ else if hasAttr attr e
then attrByPath (tail attrPath) default (getAttr attr e)
else default;
@@ -110,7 +110,7 @@ rec {
collect = pred: attrs:
if pred attrs then
[ attrs ]
- else if builtins.isAttrs attrs then
+ else if isAttrs attrs then
concatMap (collect pred) (attrValues attrs)
else
[];