From a8b693fef7bd44695a3891deb386a4d09ae8ae1b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 12 Nov 2013 13:50:45 +0100
Subject: Remove backward-compatible implementations of some primops

Nixpkgs requires at least Nix 1.2 anyway, so these are now useless.
---
 lib/attrsets.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/attrsets.nix')

diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index f314c02ff32..da735d71b25 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
       [];
-- 
cgit 1.4.1