diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-28 01:24:30 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-28 22:45:55 +0100 |
| commit | cfab329437a24811104bc8daa2b83b80614f753c (patch) | |
| tree | 406c75a90d6be8ddbc8e519ef1f8a3aa759f5269 /lib | |
| parent | 4b1a9dd00b508a3ea2273db916a600689d15f7f6 (diff) | |
| download | nixpkgs-cfab329437a24811104bc8daa2b83b80614f753c.tar nixpkgs-cfab329437a24811104bc8daa2b83b80614f753c.tar.gz nixpkgs-cfab329437a24811104bc8daa2b83b80614f753c.tar.bz2 nixpkgs-cfab329437a24811104bc8daa2b83b80614f753c.tar.lz nixpkgs-cfab329437a24811104bc8daa2b83b80614f753c.tar.xz nixpkgs-cfab329437a24811104bc8daa2b83b80614f753c.tar.zst nixpkgs-cfab329437a24811104bc8daa2b83b80614f753c.zip | |
Use isType instead of typeOf
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/systems.nix | 4 | ||||
| -rw-r--r-- | lib/types.nix | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/systems.nix b/lib/systems.nix index 1ef869fb012..afa2002c6e4 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 0545cd6a3c2..aa8a371d953 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 // { |