Skip to content

Commit

Permalink
distribution-nixpkgs/test: update nixpkgs platform test data
Browse files Browse the repository at this point in the history
- Nixpkgs stopped using versioned FreeBSD OS parts:
  NixOS/nixpkgs@266cdd7d3795263
  NixOS/nixpkgs#308032
- mipsi*r* tuples were removed:
  NixOS/nixpkgs@94d9a6ce177b3a6
- mips-none and mips64-none were added.
  • Loading branch information
sternenseemann committed May 7, 2024
1 parent 5593df3 commit aef5f46
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion distribution-nixpkgs/test/data/all-system-tuples.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
["aarch64-darwin","aarch64-genode","aarch64-linux","aarch64-netbsd","aarch64-none","aarch64_be-none","arm-none","armv5tel-linux","armv6l-linux","armv6l-netbsd","armv6l-none","armv7a-darwin","armv7a-linux","armv7a-netbsd","armv7l-linux","armv7l-netbsd","avr-none","i686-cygwin","i686-darwin","i686-freebsd13","i686-genode","i686-linux","i686-netbsd","i686-none","i686-openbsd","i686-windows","javascript-ghcjs","m68k-linux","m68k-netbsd","m68k-none","microblaze-linux","microblaze-none","microblazeel-linux","microblazeel-none","mips-linux","mips64-linux","mips64el-linux","mipsel-linux","mipsel-netbsd","mipsisa32r6-linux","mipsisa32r6el-linux","mipsisa64r6-linux","mipsisa64r6el-linux","mmix-mmixware","msp430-none","or1k-none","powerpc-netbsd","powerpc-none","powerpc64-linux","powerpc64le-linux","powerpcle-none","riscv32-linux","riscv32-netbsd","riscv32-none","riscv64-linux","riscv64-netbsd","riscv64-none","rx-none","s390-linux","s390-none","s390x-linux","s390x-none","vc4-none","wasm32-wasi","wasm64-wasi","x86_64-cygwin","x86_64-darwin","x86_64-freebsd13","x86_64-genode","x86_64-linux","x86_64-netbsd","x86_64-none","x86_64-openbsd","x86_64-redox","x86_64-solaris","x86_64-windows"]
["aarch64-darwin","aarch64-genode","aarch64-linux","aarch64-netbsd","aarch64-none","aarch64_be-none","arm-none","armv5tel-linux","armv6l-linux","armv6l-netbsd","armv6l-none","armv7a-darwin","armv7a-linux","armv7a-netbsd","armv7l-linux","armv7l-netbsd","avr-none","i686-cygwin","i686-darwin","i686-freebsd","i686-genode","i686-linux","i686-netbsd","i686-none","i686-openbsd","i686-windows","javascript-ghcjs","loongarch64-linux","m68k-linux","m68k-netbsd","m68k-none","microblaze-linux","microblaze-none","microblazeel-linux","microblazeel-none","mips-linux","mips-none","mips64-linux","mips64-none","mips64el-linux","mipsel-linux","mipsel-netbsd","mmix-mmixware","msp430-none","or1k-none","powerpc-netbsd","powerpc-none","powerpc64-linux","powerpc64le-linux","powerpcle-none","riscv32-linux","riscv32-netbsd","riscv32-none","riscv64-linux","riscv64-netbsd","riscv64-none","rx-none","s390-linux","s390-none","s390x-linux","s390x-none","vc4-none","wasm32-wasi","wasm64-wasi","x86_64-cygwin","x86_64-darwin","x86_64-freebsd","x86_64-genode","x86_64-linux","x86_64-netbsd","x86_64-none","x86_64-openbsd","x86_64-redox","x86_64-solaris","x86_64-windows"]
16 changes: 8 additions & 8 deletions distribution-nixpkgs/test/hspec.hs
Original file line number Diff line number Diff line change
Expand Up @@ -68,21 +68,26 @@ nixpkgsSystemMapping =
, ("avr-none", Platform (OtherArch "avr") (OtherOS "none"))
, ("i686-cygwin", Platform I386 (OtherOS "cygwin"))
, ("i686-darwin", Platform I386 OSX)
, ("i686-freebsd13", Platform I386 (OtherOS "freebsd13"))
, ("i686-freebsd", Platform I386 FreeBSD)
, ("i686-genode", Platform I386 (OtherOS "genode"))
, ("i686-linux", Platform I386 Linux)
, ("i686-netbsd", Platform I386 NetBSD)
, ("i686-none", Platform I386 (OtherOS "none"))
, ("i686-openbsd", Platform I386 OpenBSD)
, ("i686-windows", Platform I386 Windows)
, ("javascript-ghcjs", Platform JavaScript Ghcjs)
, ("loongarch64-linux", Platform (OtherArch "loongarch64") Linux)
, ("m68k-linux", Platform M68k Linux)
, ("m68k-netbsd", Platform M68k NetBSD)
, ("m68k-none", Platform M68k (OtherOS "none"))
, ("microblaze-linux", Platform (OtherArch "microblaze") Linux)
, ("microblazeel-linux", Platform (OtherArch "microblazeel") Linux)
, ("microblaze-none", Platform (OtherArch "microblaze") (OtherOS "none"))
, ("microblazeel-none", Platform (OtherArch "microblazeel") (OtherOS "none"))
, ("mips-linux", Platform Mips Linux)
, ("mips-none", Platform Mips (OtherOS "none"))
, ("mips64-linux", Platform (OtherArch "mips64") Linux)
, ("mips64-none", Platform (OtherArch "mips64") (OtherOS "none"))
, ("mips64el-linux", Platform (OtherArch "mips64el") Linux)
, ("mipsel-linux", Platform (OtherArch "mipsel") Linux)
, ("mipsel-netbsd", Platform (OtherArch "mipsel") NetBSD)
Expand Down Expand Up @@ -120,7 +125,7 @@ nixpkgsSystemMapping =
#endif
, ("x86_64-cygwin", Platform X86_64 (OtherOS "cygwin"))
, ("x86_64-darwin", Platform X86_64 OSX)
, ("x86_64-freebsd13", Platform X86_64 (OtherOS "freebsd13"))
, ("x86_64-freebsd", Platform X86_64 FreeBSD)
, ("x86_64-genode", Platform X86_64 (OtherOS "genode"))
, ("x86_64-linux", Platform X86_64 Linux)
, ("x86_64-netbsd", Platform X86_64 NetBSD)
Expand All @@ -130,12 +135,7 @@ nixpkgsSystemMapping =
, ("x86_64-solaris", Platform X86_64 Solaris)
, ("x86_64-windows", Platform X86_64 Windows)
-- lib.systems.examples
, ("mips-linux", Platform Mips Linux)
, ("mips64-linux", Platform (OtherArch "mips64") Linux)
, ("mipsisa32r6-linux", Platform (OtherArch "mipsisa32r6") Linux)
, ("mipsisa32r6el-linux", Platform (OtherArch "mipsisa32r6el") Linux)
, ("mipsisa64r6-linux", Platform (OtherArch "mipsisa64r6") Linux)
, ("mipsisa64r6el-linux", Platform (OtherArch "mipsisa64r6el") Linux)
-- Currently no tuples are unique to the example list.
]

platformMapping :: [(String, NixpkgsPlatform)]
Expand Down

0 comments on commit aef5f46

Please sign in to comment.