movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-14 05:29:20 +03:00
Code Issues Projects Releases Packages Wiki Activity

Use isType instead of typeOf

Browse source
This commit is contained in:
Eelco Dolstra 2013-10-28 01:24:30 +01:00
parent 4b1a9dd00b
commit cfab329437
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/systems.nix
View file

@ -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] && elem x.bits [8 16 32 64 128]
&& (builtins.lessThan 8 x.bits -> isSignificantByte x.significantByte); && (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 && isCpuType x.cpu
&& isArchitecture x.arch && isArchitecture x.arch
&& isKernel x.kernel; && isKernel x.kernel;

1
lib/types.nix
View file

@ -12,7 +12,6 @@ with lib.modules;
rec { rec {
isType = type: x: (x._type or "") == type; isType = type: x: (x._type or "") == type;
hasType = x: isAttrs x && x ? _type;
typeOf = x: x._type or ""; typeOf = x: x._type or "";
setType = typeName: value: value // { setType = typeName: value: value // {