diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2017-05-22 19:02:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-22 19:02:49 -0400 |
| commit | c3b2c5bf77f9d437b4656f0244bcdf2ab8d0102c (patch) | |
| tree | 7a6466bbc15f480be2a0793b2a934c60bbb7fe06 /lib | |
| parent | 02bb7c2ec04bb99c239711c961d21571121dff03 (diff) | |
| parent | fedcda6cdaafc91a03c3aafac087aedf03ae8ae0 (diff) | |
| download | nixpkgs-c3b2c5bf77f9d437b4656f0244bcdf2ab8d0102c.tar nixpkgs-c3b2c5bf77f9d437b4656f0244bcdf2ab8d0102c.tar.gz nixpkgs-c3b2c5bf77f9d437b4656f0244bcdf2ab8d0102c.tar.bz2 nixpkgs-c3b2c5bf77f9d437b4656f0244bcdf2ab8d0102c.tar.lz nixpkgs-c3b2c5bf77f9d437b4656f0244bcdf2ab8d0102c.tar.xz nixpkgs-c3b2c5bf77f9d437b4656f0244bcdf2ab8d0102c.tar.zst nixpkgs-c3b2c5bf77f9d437b4656f0244bcdf2ab8d0102c.zip | |
Merge pull request #25997 from obsidiansystems/isHurd
stdenv: Rename `isGNU` to `isHurd` as GNU is a userland
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/systems/inspect.nix | 3 | ||||
| -rw-r--r-- | lib/systems/parse.nix | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index 1dcb4af35e6..241c9365f2e 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -7,6 +7,7 @@ rec { "64bit" = { cpu = { bits = 64; }; }; i686 = { cpu = cpuTypes.i686; }; x86_64 = { cpu = cpuTypes.x86_64; }; + x86 = { cpu = { family = "x86"; }; }; Arm = { cpu = { family = "arm"; }; }; Mips = { cpu = { family = "mips"; }; }; BigEndian = { cpu = { significantByte = significantBytes.bigEndian; }; }; @@ -19,6 +20,7 @@ rec { Linux = { kernel = kernels.linux; }; SunOS = { kernel = kernels.solaris; }; FreeBSD = { kernel = kernels.freebsd; }; + Hurd = { kernel = kernels.hurd; }; NetBSD = { kernel = kernels.netbsd; }; OpenBSD = { kernel = kernels.openbsd; }; Windows = { kernel = kernels.windows; }; @@ -27,7 +29,6 @@ rec { Arm32 = recursiveUpdate patterns.Arm patterns."32bit"; Arm64 = recursiveUpdate patterns.Arm patterns."64bit"; - }; predicates = mapAttrs' diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index b94caeb5758..34272b45b8b 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -77,6 +77,7 @@ rec { { darwin = { execFormat = macho; families = { inherit unix; }; }; freebsd = { execFormat = elf; families = { inherit unix bsd; }; }; + hurd = { execFormat = elf; families = { inherit unix; }; }; linux = { execFormat = elf; families = { inherit unix; }; }; netbsd = { execFormat = elf; families = { inherit unix bsd; }; }; none = { execFormat = unknown; families = { inherit unix; }; }; @@ -113,7 +114,9 @@ rec { mkSkeletonFromList = l: { "2" = # We only do 2-part hacks for things Nix already supports if elemAt l 1 == "cygwin" - then { cpu = elemAt l 0; kernel = "windows"; abi = "cygnus"; } + then { cpu = elemAt l 0; kernel = "windows"; abi = "cygnus"; } + else if elemAt l 1 == "gnu" + then { cpu = elemAt l 0; kernel = "hurd"; abi = "gnu"; } else { cpu = elemAt l 0; kernel = elemAt l 1; }; "3" = # Awkwards hacks, beware! if elemAt l 1 == "apple" |