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