diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 00:18:51 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 00:18:51 -0400 |
| commit | b3ef3227704080b6058ae10ed2fcb739ec31ff78 (patch) | |
| tree | 2f6e8ca0339800a9a3831a2759828bb466e9f346 /lib/systems/inspect.nix | |
| parent | a31984ecdaf7b011163c3c71679eb285d951d735 (diff) | |
| parent | 70963b382f3f820ba6d3bc3b3aaf50a2957ec1ff (diff) | |
| download | nixpkgs-b3ef3227704080b6058ae10ed2fcb739ec31ff78.tar nixpkgs-b3ef3227704080b6058ae10ed2fcb739ec31ff78.tar.gz nixpkgs-b3ef3227704080b6058ae10ed2fcb739ec31ff78.tar.bz2 nixpkgs-b3ef3227704080b6058ae10ed2fcb739ec31ff78.tar.lz nixpkgs-b3ef3227704080b6058ae10ed2fcb739ec31ff78.tar.xz nixpkgs-b3ef3227704080b6058ae10ed2fcb739ec31ff78.tar.zst nixpkgs-b3ef3227704080b6058ae10ed2fcb739ec31ff78.zip | |
Merge commit '70963b382f3f820ba6d3bc3b3aaf50a2957ec1ff' into uclibc
Diffstat (limited to 'lib/systems/inspect.nix')
| -rw-r--r-- | lib/systems/inspect.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index 6738ae3d441..9960954e464 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -21,9 +21,11 @@ rec { isLittleEndian = { cpu = { significantByte = significantBytes.littleEndian; }; }; isBSD = { kernel = { families = { inherit (kernelFamilies) bsd; }; }; }; + isDarwin = { kernel = { families = { inherit (kernelFamilies) darwin; }; }; }; isUnix = [ isBSD isDarwin isLinux isSunOS isHurd isCygwin ]; - isDarwin = { kernel = kernels.darwin; }; + isMacOS = { kernel = kernels.macos; }; + isiOS = { kernel = kernels.ios; }; isLinux = { kernel = kernels.linux; }; isSunOS = { kernel = kernels.solaris; }; isFreeBSD = { kernel = kernels.freebsd; }; @@ -38,12 +40,8 @@ rec { isMusl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ]; isUClibc = with abis; map (a: { abi = a; }) [ uclibc uclibceabi uclibceabihf ]; - isKexecable = map (family: { kernel = kernels.linux; cpu.family = family; }) - [ "x86" "arm" "aarch64" "mips" ]; isEfi = map (family: { cpu.family = family; }) [ "x86" "arm" "aarch64" ]; - isSeccomputable = map (family: { kernel = kernels.linux; cpu.family = family; }) - [ "x86" "arm" "aarch64" "mips" ]; # Deprecated after 18.03 isArm = isAarch32; |