diff options
author | Jörg Thalheim <joerg@thalheim.io> | 2018-08-28 22:17:54 +0100 |
---|---|---|
committer | Jörg Thalheim <joerg@thalheim.io> | 2018-08-28 22:18:02 +0100 |
commit | 9efffe0135c1ff7fcefbcd5ba0e521b41e56bb56 (patch) | |
tree | 7bd7683d78448502d64cddf30e5d2b2cd32393d1 /lib | |
parent | c4e8f4b442e2500273040a17d61996ee99c3956b (diff) | |
download | nixlib-9efffe0135c1ff7fcefbcd5ba0e521b41e56bb56.tar nixlib-9efffe0135c1ff7fcefbcd5ba0e521b41e56bb56.tar.gz nixlib-9efffe0135c1ff7fcefbcd5ba0e521b41e56bb56.tar.bz2 nixlib-9efffe0135c1ff7fcefbcd5ba0e521b41e56bb56.tar.lz nixlib-9efffe0135c1ff7fcefbcd5ba0e521b41e56bb56.tar.xz nixlib-9efffe0135c1ff7fcefbcd5ba0e521b41e56bb56.tar.zst nixlib-9efffe0135c1ff7fcefbcd5ba0e521b41e56bb56.zip |
hurd: cleanup unmaintained target
This has been not touched in 6 years. Let's remove it to cause less problems when adding new cross-compiling infrastructure. This also simplify gcc significantly.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/systems/doubles.nix | 2 | ||||
-rw-r--r-- | lib/systems/for-meta.nix | 2 | ||||
-rw-r--r-- | lib/systems/inspect.nix | 3 | ||||
-rw-r--r-- | lib/systems/parse.nix | 3 | ||||
-rw-r--r-- | lib/tests/systems.nix | 2 |
5 files changed, 4 insertions, 8 deletions
diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index adc454406b85..a00165db1716 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -36,7 +36,7 @@ in rec { cygwin = filterDoubles predicates.isCygwin; darwin = filterDoubles predicates.isDarwin; freebsd = filterDoubles predicates.isFreeBSD; - # Should be better, but MinGW is unclear, and HURD is bit-rotted. + # Should be better, but MinGW is unclear. gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; }); illumos = filterDoubles predicates.isSunOS; linux = filterDoubles predicates.isLinux; diff --git a/lib/systems/for-meta.nix b/lib/systems/for-meta.nix index 96e8b6f86eb0..51fb6ae760d1 100644 --- a/lib/systems/for-meta.nix +++ b/lib/systems/for-meta.nix @@ -20,7 +20,7 @@ in rec { cygwin = [ patterns.isCygwin ]; darwin = [ patterns.isDarwin ]; freebsd = [ patterns.isFreeBSD ]; - # Should be better, but MinGW is unclear, and HURD is bit-rotted. + # Should be better, but MinGW is unclear. gnu = [ { kernel = parse.kernels.linux; abi = abis.gnu; } { kernel = parse.kernels.linux; abi = abis.gnueabi; } diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index ac34ed45695c..65f560328af5 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -27,14 +27,13 @@ rec { isBSD = { kernel = { families = { inherit (kernelFamilies) bsd; }; }; }; isDarwin = { kernel = { families = { inherit (kernelFamilies) darwin; }; }; }; - isUnix = [ isBSD isDarwin isLinux isSunOS isHurd isCygwin ]; + isUnix = [ isBSD isDarwin isLinux isSunOS isCygwin ]; isMacOS = { kernel = kernels.macos; }; isiOS = { kernel = kernels.ios; }; isLinux = { kernel = kernels.linux; }; isSunOS = { kernel = kernels.solaris; }; isFreeBSD = { kernel = kernels.freebsd; }; - isHurd = { kernel = kernels.hurd; }; isNetBSD = { kernel = kernels.netbsd; }; isOpenBSD = { kernel = kernels.openbsd; }; isWindows = { kernel = kernels.windows; }; diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index 7ee3479c333d..bb26c93f3d7a 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -172,7 +172,6 @@ rec { macos = { execFormat = macho; families = { inherit darwin; }; name = "darwin"; }; ios = { execFormat = macho; families = { inherit darwin; }; }; freebsd = { execFormat = elf; families = { inherit bsd; }; }; - hurd = { execFormat = elf; families = { }; }; linux = { execFormat = elf; families = { }; }; netbsd = { execFormat = elf; families = { inherit bsd; }; }; none = { execFormat = unknown; families = { }; }; @@ -259,8 +258,6 @@ rec { "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"; } - 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" diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix index ffdd8ae929c8..91604280e4e7 100644 --- a/lib/tests/systems.nix +++ b/lib/tests/systems.nix @@ -22,7 +22,7 @@ in with lib.systems.doubles; lib.runTests { cygwin = assertTrue (mseteq cygwin [ "i686-cygwin" "x86_64-cygwin" ]); darwin = assertTrue (mseteq darwin [ "x86_64-darwin" ]); freebsd = assertTrue (mseteq freebsd [ "i686-freebsd" "x86_64-freebsd" ]); - gnu = assertTrue (mseteq gnu (linux /* ++ hurd ++ kfreebsd ++ ... */)); + gnu = assertTrue (mseteq gnu (linux /* ++ kfreebsd ++ ... */)); illumos = assertTrue (mseteq illumos [ "x86_64-solaris" ]); linux = assertTrue (mseteq linux [ "i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "mipsel-linux" ]); netbsd = assertTrue (mseteq netbsd [ "i686-netbsd" "x86_64-netbsd" ]); |