stdenv: Rename `isGNU` to `isHurd` as GNU is a userland

Elsewhere, things called GNU indeed includes GNU/Linux or GNU/Hurd, but this
predicate was defined excluding Linux regardless of userland.

+12 -12
+1 -1
lib/systems/inspect.nix
··· 19 19 Linux = { kernel = kernels.linux; }; 20 20 SunOS = { kernel = kernels.solaris; }; 21 21 FreeBSD = { kernel = kernels.freebsd; }; 22 + Hurd = { kernel = kernels.hurd; }; 22 23 NetBSD = { kernel = kernels.netbsd; }; 23 24 OpenBSD = { kernel = kernels.openbsd; }; 24 25 Windows = { kernel = kernels.windows; }; ··· 27 28 28 29 Arm32 = recursiveUpdate patterns.Arm patterns."32bit"; 29 30 Arm64 = recursiveUpdate patterns.Arm patterns."64bit"; 30 - 31 31 }; 32 32 33 33 predicates = mapAttrs'
+4 -1
lib/systems/parse.nix
··· 77 77 { 78 78 darwin = { execFormat = macho; families = { inherit unix; }; }; 79 79 freebsd = { execFormat = elf; families = { inherit unix bsd; }; }; 80 + hurd = { execFormat = elf; families = { inherit unix; }; }; 80 81 linux = { execFormat = elf; families = { inherit unix; }; }; 81 82 netbsd = { execFormat = elf; families = { inherit unix bsd; }; }; 82 83 none = { execFormat = unknown; families = { inherit unix; }; }; ··· 113 114 mkSkeletonFromList = l: { 114 115 "2" = # We only do 2-part hacks for things Nix already supports 115 116 if elemAt l 1 == "cygwin" 116 - then { cpu = elemAt l 0; kernel = "windows"; abi = "cygnus"; } 117 + then { cpu = elemAt l 0; kernel = "windows"; abi = "cygnus"; } 118 + else if elemAt l 1 == "gnu" 119 + then { cpu = elemAt l 0; kernel = "hurd"; abi = "gnu"; } 117 120 else { cpu = elemAt l 0; kernel = elemAt l 1; }; 118 121 "3" = # Awkwards hacks, beware! 119 122 if elemAt l 1 == "apple"
+1 -1
pkgs/development/compilers/gcc/4.8/default.nix
··· 226 226 libc_dev = stdenv.cc.libc_dev; 227 227 228 228 postPatch = 229 - if (stdenv.isGNU 229 + if (stdenv.isHurd 230 230 || (libcCross != null # e.g., building `gcc.crossDrv' 231 231 && libcCross ? crossConfig 232 232 && libcCross.crossConfig == "i586-pc-gnu")
+1 -1
pkgs/development/compilers/gcc/4.9/default.nix
··· 230 230 libc_dev = stdenv.cc.libc_dev; 231 231 232 232 postPatch = 233 - if (stdenv.isGNU 233 + if (stdenv.isHurd 234 234 || (libcCross != null # e.g., building `gcc.crossDrv' 235 235 && libcCross ? crossConfig 236 236 && libcCross.crossConfig == "i586-pc-gnu")
+1 -1
pkgs/development/compilers/gcc/5/default.nix
··· 247 247 ''; 248 248 249 249 postPatch = 250 - if (stdenv.isGNU 250 + if (stdenv.isHurd 251 251 || (libcCross != null # e.g., building `gcc.crossDrv' 252 252 && libcCross ? crossConfig 253 253 && libcCross.crossConfig == "i586-pc-gnu")
+1 -1
pkgs/development/compilers/gcc/6/default.nix
··· 229 229 hardeningDisable = [ "format" ]; 230 230 231 231 postPatch = 232 - if (stdenv.isGNU 232 + if (stdenv.isHurd 233 233 || (libcCross != null # e.g., building `gcc.crossDrv' 234 234 && libcCross ? crossConfig 235 235 && libcCross.crossConfig == "i586-pc-gnu")
+1 -1
pkgs/development/compilers/gcc/snapshot/default.nix
··· 230 230 hardeningDisable = [ "format" ]; 231 231 232 232 postPatch = 233 - if (stdenv.isGNU 233 + if (stdenv.isHurd 234 234 || (libcCross != null # e.g., building `gcc.crossDrv' 235 235 && libcCross ? crossConfig 236 236 && libcCross.crossConfig == "i586-pc-gnu")
+2 -5
pkgs/stdenv/generic/default.nix
··· 402 402 403 403 # Utility flags to test the type of platform. 404 404 inherit (hostPlatform) 405 - isDarwin isLinux isSunOS isCygwin isFreeBSD isOpenBSD isi686 isx86_64 406 - is64bit isMips isBigEndian; 405 + isDarwin isLinux isSunOS isHurd isCygwin isFreeBSD isOpenBSD 406 + isi686 isx86_64 is64bit isMips isBigEndian; 407 407 isArm = hostPlatform.isArm32; 408 408 isAarch64 = hostPlatform.isArm64; 409 - # Other code instead checks for anything using GNU userland, 410 - # e.g. GNU/linux. This refers just to GNU Hurd. 411 - isGNU = system == "i686-gnu"; 412 409 413 410 # Whether we should run paxctl to pax-mark binaries. 414 411 needsPax = isLinux;