diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/attrsets.nix | 2 | ||||
| -rw-r--r-- | lib/kernel.nix | 7 | ||||
| -rw-r--r-- | lib/systems/default.nix | 2 | ||||
| -rw-r--r-- | lib/systems/doubles.nix | 3 | ||||
| -rw-r--r-- | lib/systems/examples.nix | 4 | ||||
| -rw-r--r-- | lib/systems/inspect.nix | 9 | ||||
| -rw-r--r-- | lib/systems/parse.nix | 2 | ||||
| -rw-r--r-- | lib/tests/systems.nix | 2 |
8 files changed, 25 insertions, 6 deletions
diff --git a/lib/attrsets.nix b/lib/attrsets.nix index d9a6eab0603e..1f11eaaa823d 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -9,7 +9,7 @@ let in rec { - inherit (builtins) attrNames listToAttrs hasAttr isAttrs getAttr; + inherit (builtins) attrNames listToAttrs hasAttr isAttrs getAttr removeAttrs; /* Return an attribute from nested attribute sets. diff --git a/lib/kernel.nix b/lib/kernel.nix index ffcbc268b76c..33da9663a8ed 100644 --- a/lib/kernel.nix +++ b/lib/kernel.nix @@ -8,9 +8,10 @@ with lib; option = x: x // { optional = true; }; - yes = { tristate = "y"; optional = false; }; - no = { tristate = "n"; optional = false; }; - module = { tristate = "m"; optional = false; }; + yes = { tristate = "y"; optional = false; }; + no = { tristate = "n"; optional = false; }; + module = { tristate = "m"; optional = false; }; + unset = { tristate = null; optional = false; }; freeform = x: { freeform = x; optional = false; }; /* diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 7e6fa5ecfb4b..85e24e08d360 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -136,6 +136,7 @@ rec { else if final.isPower then "powerpc" else if final.isRiscV then "riscv" else if final.isS390 then "s390" + else if final.isLoongArch64 then "loongarch" else final.parsed.cpu.name; qemuArch = @@ -185,6 +186,7 @@ rec { pulseSupport = false; smbdSupport = false; seccompSupport = false; + enableDocs = false; hostCpuTargets = [ "${final.qemuArch}-linux-user" ]; }; wine = (pkgs.winePackagesFor "wine${toString final.parsed.cpu.bits}").minimal; diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 6b19309d11ff..6d2f015674e0 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -26,7 +26,7 @@ let # Linux "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" - "armv7l-linux" "i686-linux" "m68k-linux" "microblaze-linux" + "armv7l-linux" "i686-linux" "loongarch64-linux" "m68k-linux" "microblaze-linux" "microblazeel-linux" "mipsel-linux" "mips64el-linux" "powerpc64-linux" "powerpc64le-linux" "riscv32-linux" "riscv64-linux" "s390-linux" "s390x-linux" "x86_64-linux" @@ -86,6 +86,7 @@ in { m68k = filterDoubles predicates.isM68k; s390 = filterDoubles predicates.isS390; s390x = filterDoubles predicates.isS390x; + loongarch64 = filterDoubles predicates.isLoongArch64; js = filterDoubles predicates.isJavaScript; bigEndian = filterDoubles predicates.isBigEndian; diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 9ea2e3b56e92..3ae5d6ffd47b 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -90,6 +90,10 @@ rec { config = "mipsel-unknown-linux-gnu"; } // platforms.fuloong2f_n32; + loongarch64-linux = { + config = "loongarch64-unknown-linux-gnu"; + }; + # can execute on 32bit chip mips-linux-gnu = { config = "mips-unknown-linux-gnu"; } // platforms.gcc_mips32r2_o32; mipsel-linux-gnu = { config = "mipsel-unknown-linux-gnu"; } // platforms.gcc_mips32r2_o32; diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index b32c8630107b..89e9f4231d97 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -9,6 +9,14 @@ let abis = lib.mapAttrs (_: abi: builtins.removeAttrs abi [ "assertions" ]) abis rec { # these patterns are to be matched against {host,build,target}Platform.parsed patterns = rec { + # The patterns below are lists in sum-of-products form. + # + # Each attribute is list of product conditions; non-list values are treated + # as a singleton list. If *any* product condition in the list matches then + # the predicate matches. Each product condition is tested by + # `lib.attrsets.matchAttrs`, which requires a match on *all* attributes of + # the product. + isi686 = { cpu = cpuTypes.i686; }; isx86_32 = { cpu = { family = "x86"; bits = 32; }; }; isx86_64 = { cpu = { family = "x86"; bits = 64; }; }; @@ -49,6 +57,7 @@ rec { isM68k = { cpu = { family = "m68k"; }; }; isS390 = { cpu = { family = "s390"; }; }; isS390x = { cpu = { family = "s390"; bits = 64; }; }; + isLoongArch64 = { cpu = { family = "loongarch"; bits = 64; }; }; isJavaScript = { cpu = cpuTypes.javascript; }; is32bit = { cpu = { bits = 32; }; }; diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index bd3366e140bf..ea8e1ff8fcf0 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -131,6 +131,8 @@ rec { or1k = { bits = 32; significantByte = bigEndian; family = "or1k"; }; + loongarch64 = { bits = 64; significantByte = littleEndian; family = "loongarch"; }; + javascript = { bits = 32; significantByte = littleEndian; family = "javascript"; }; }; diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix index 88e2e4206d56..792aa94f3356 100644 --- a/lib/tests/systems.nix +++ b/lib/tests/systems.nix @@ -34,7 +34,7 @@ with lib.systems.doubles; lib.runTests { testredox = mseteq redox [ "x86_64-redox" ]; testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */); testillumos = mseteq illumos [ "x86_64-solaris" ]; - testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mips64el-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" "m68k-linux" "s390-linux" "s390x-linux" "microblaze-linux" "microblazeel-linux" ]; + testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mips64el-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" "m68k-linux" "s390-linux" "s390x-linux" "microblaze-linux" "microblazeel-linux" "loongarch64-linux" ]; testnetbsd = mseteq netbsd [ "aarch64-netbsd" "armv6l-netbsd" "armv7a-netbsd" "armv7l-netbsd" "i686-netbsd" "m68k-netbsd" "mipsel-netbsd" "powerpc-netbsd" "riscv32-netbsd" "riscv64-netbsd" "x86_64-netbsd" ]; testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ]; testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ]; |