diff options
| author | Adam Joseph <adam@westernsemico.com> | 2023-11-01 00:46:53 -0700 |
|---|---|---|
| committer | Adam Joseph <adam@westernsemico.com> | 2023-11-01 00:52:20 -0700 |
| commit | 6bc656bda3fa07b98247f019dede8db04baa2eb5 (patch) | |
| tree | 87d15e222c14fe11af1385ca1355a671ef508a7c | |
| parent | lanzaboote-uefi-stub: init at 0.3.0 (diff) | |
| download | nixpkgs-6bc656bda3fa07b98247f019dede8db04baa2eb5.tar.gz | |
lib.systems: fix CI failures at https://gist.github.com/GrahamcOfBorg/5495945c851a7bc9770eda5a3ed63c25
This commit fixes the CI failures with PR 231951:
- https://gist.github.com/GrahamcOfBorg/5495945c851a7bc9770eda5a3ed63c25
| -rw-r--r-- | lib/systems/doubles.nix | 1 | ||||
| -rw-r--r-- | lib/tests/systems.nix | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 78dd4fc08667..ff45aa6a39e1 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -115,6 +115,7 @@ in { redox = filterDoubles predicates.isRedox; windows = filterDoubles predicates.isWindows; genode = filterDoubles predicates.isGenode; + uefi = filterDoubles predicates.isEfiEnvironment; embedded = filterDoubles predicates.isNone; diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix index e142ff307fbd..e1df8c7f0737 100644 --- a/lib/tests/systems.nix +++ b/lib/tests/systems.nix @@ -36,11 +36,11 @@ lib.runTests ( # sanity check before committing :). (with lib.systems.doubles; { - testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ wasi ++ windows ++ embedded ++ mmix ++ js ++ genode ++ redox); + testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ wasi ++ windows ++ embedded ++ mmix ++ js ++ genode ++ redox ++ uefi); testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv6l-netbsd" "armv6l-none" "armv7a-linux" "armv7a-netbsd" "armv7l-linux" "armv7l-netbsd" "arm-none" "armv7a-darwin" ]; testarmv7 = mseteq armv7 [ "armv7a-darwin" "armv7a-linux" "armv7l-linux" "armv7a-netbsd" "armv7l-netbsd" ]; - testi686 = mseteq i686 [ "i686-linux" "i686-freebsd13" "i686-genode" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" "i686-none" "i686-darwin" ]; + testi686 = mseteq i686 [ "i686-linux" "i686-freebsd13" "i686-genode" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" "i686-none" "i686-darwin" "i686-uefi" ]; testmips = mseteq mips [ "mips-none" "mips64-none" "mips-linux" "mips64-linux" "mips64el-linux" "mipsel-linux" "mipsel-netbsd" ]; testmmix = mseteq mmix [ "mmix-mmixware" ]; testpower = mseteq power [ "powerpc-netbsd" "powerpc-none" "powerpc64-linux" "powerpc64le-linux" "powerpcle-none" ]; @@ -48,7 +48,7 @@ lib.runTests ( testriscv32 = mseteq riscv32 [ "riscv32-linux" "riscv32-netbsd" "riscv32-none" ]; testriscv64 = mseteq riscv64 [ "riscv64-linux" "riscv64-netbsd" "riscv64-none" ]; tests390x = mseteq s390x [ "s390x-linux" "s390x-none" ]; - testx86_64 = mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd13" "x86_64-genode" "x86_64-redox" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" "x86_64-windows" "x86_64-none" ]; + testx86_64 = mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd13" "x86_64-genode" "x86_64-redox" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" "x86_64-windows" "x86_64-none" "x86_64-uefi" ]; testcygwin = mseteq cygwin [ "i686-cygwin" "x86_64-cygwin" ]; testdarwin = mseteq darwin [ "x86_64-darwin" "i686-darwin" "aarch64-darwin" "armv7a-darwin" ]; |