diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-04-25 02:50:48 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-04-25 02:50:48 +0200 |
| commit | 0f1c4558d362a34cddea207acafff4596058af0b (patch) | |
| tree | 1d6d8c4f8a53de539d6d2f284fdbe6cea053f8fe /lib | |
| parent | 8fce6f76254543f8faf7900590a998d95cbc917f (diff) | |
| parent | 9839cda8dc0eae5fd2af4ffc970c95ebaa59b92c (diff) | |
| download | nixpkgs-0f1c4558d362a34cddea207acafff4596058af0b.tar nixpkgs-0f1c4558d362a34cddea207acafff4596058af0b.tar.gz nixpkgs-0f1c4558d362a34cddea207acafff4596058af0b.tar.bz2 nixpkgs-0f1c4558d362a34cddea207acafff4596058af0b.tar.lz nixpkgs-0f1c4558d362a34cddea207acafff4596058af0b.tar.xz nixpkgs-0f1c4558d362a34cddea207acafff4596058af0b.tar.zst nixpkgs-0f1c4558d362a34cddea207acafff4596058af0b.zip | |
Merge branch 'master' into staging-next
Choose binwalk 2.3.1, 27 is legacy version for Python 2.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/systems/doubles.nix | 4 | ||||
| -rw-r--r-- | lib/tests/systems.nix | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 7ad40c8c62c..6f638be585b 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -33,7 +33,9 @@ let "mmix-mmixware" # NetBSD - "i686-netbsd" "x86_64-netbsd" + "aarch64-netbsd" "armv6l-netbsd" "armv7a-netbsd" "armv7l-netbsd" + "i686-netbsd" "mipsel-netbsd" "powerpc-netbsd" "riscv32-netbsd" + "riscv64-netbsd" "x86_64-netbsd" # none "aarch64-none" "arm-none" "armv6l-none" "avr-none" "i686-none" "msp430-none" diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix index c0800df25ed..36f82b783b4 100644 --- a/lib/tests/systems.nix +++ b/lib/tests/systems.nix @@ -15,9 +15,9 @@ in with lib.systems.doubles; lib.runTests { testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ wasi ++ windows ++ embedded ++ mmix ++ js ++ genode ++ redox); - testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv6l-none" "armv7a-linux" "armv7l-linux" "arm-none" "armv7a-darwin" ]; + testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv6l-netbsd" "armv6l-none" "armv7a-linux" "armv7a-netbsd" "armv7l-linux" "armv7l-netbsd" "arm-none" "armv7a-darwin" ]; testi686 = mseteq i686 [ "i686-linux" "i686-freebsd" "i686-genode" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" "i686-none" "i686-darwin" ]; - testmips = mseteq mips [ "mipsel-linux" ]; + testmips = mseteq mips [ "mipsel-linux" "mipsel-netbsd" ]; testmmix = mseteq mmix [ "mmix-mmixware" ]; testx86_64 = mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-genode" "x86_64-redox" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" "x86_64-windows" "x86_64-none" ]; @@ -29,7 +29,7 @@ with lib.systems.doubles; lib.runTests { 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" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" ]; - testnetbsd = mseteq netbsd [ "i686-netbsd" "x86_64-netbsd" ]; + testnetbsd = mseteq netbsd [ "aarch64-netbsd" "armv6l-netbsd" "armv7a-netbsd" "armv7l-netbsd" "i686-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" ]; testunix = mseteq unix (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ cygwin ++ redox); |