From cfab329437a24811104bc8daa2b83b80614f753c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 28 Oct 2013 01:24:30 +0100
Subject: [PATCH] Use isType instead of typeOf

---
 lib/systems.nix | 4 ++--
 lib/types.nix   | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/systems.nix b/lib/systems.nix
index 1ef869fb0120..afa2002c6e4e 100644
--- a/lib/systems.nix
+++ b/lib/systems.nix
@@ -22,7 +22,7 @@ rec {
   };
 
 
-  isCpuType = x: typeOf x == "cpu-type"
+  isCpuType = x: isType "cpu-type" x
     && elem x.bits [8 16 32 64 128]
     && (builtins.lessThan 8 x.bits -> isSignificantByte x.significantByte);
 
@@ -69,7 +69,7 @@ rec {
   };
 
 
-  isSystem = x: typeOf x == "system"
+  isSystem = x: isType "system" x
     && isCpuType x.cpu
     && isArchitecture x.arch
     && isKernel x.kernel;
diff --git a/lib/types.nix b/lib/types.nix
index 0545cd6a3c27..aa8a371d9530 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -12,7 +12,6 @@ with lib.modules;
 rec {
 
   isType = type: x: (x._type or "") == type;
-  hasType = x: isAttrs x && x ? _type;
   typeOf = x: x._type or "";
 
   setType = typeName: value: value // {