Merge pull request #670 from NixOS/platform-data-2025-09

distribution-nixpkgs/test: update nixpkgs platform test data

Author: sternenseemann

distribution-nixpkgs/src/Distribution/Nixpkgs/Meta.hs

@@ -127,7 +127,7 @@ nixpkgsPlatformFromCabal (Platform arch os) = "\"" ++ nixArch ++ "-" ++ nixOs ++
 --   using 'nixpkgsPlatformFromString' and rendering them via the 'Pretty'
 --   instance of 'NixpkgsPlatform' should not change the system tuple
 --   for tuples accepted by nixpkgs. This has been tested for all known tuples
---   (from @lib.platforms@ and @lib.systems.examples@) as of 2024-12-01.
+--   (from @lib.platforms@ and @lib.systems.examples@) as of 2025-09-15.
 --   Please open an issue if any newly added ones are not recognized properly.
 --
 --   __Warning__: 'nixpkgsPlatformFromString' consequently tries to preserve all

distribution-nixpkgs/test/data/all-system-tuples.json

@@ -1 +1 @@
-["aarch64-darwin","aarch64-freebsd","aarch64-genode","aarch64-linux","aarch64-netbsd","aarch64-none","aarch64-windows","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-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"]
+["aarch64-darwin","aarch64-freebsd","aarch64-genode","aarch64-linux","aarch64-netbsd","aarch64-none","aarch64-windows","aarch64_be-none","arm-none","armv5tel-linux","armv6l-linux","armv6l-netbsd","armv6l-none","armv7a-linux","armv7a-netbsd","armv7l-linux","armv7l-netbsd","avr-none","i686-cygwin","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-linux","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-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"]

distribution-nixpkgs/test/hspec.hs

@@ -64,14 +64,12 @@ nixpkgsSystemMapping =
   , ("armv6l-linux", Platform (OtherArch "armv6l") Linux)
   , ("armv6l-netbsd", Platform (OtherArch "armv6l") NetBSD)
   , ("armv6l-none", Platform (OtherArch "armv6l") (OtherOS "none"))
-  , ("armv7a-darwin", Platform (OtherArch "armv7a") OSX)
   , ("armv7a-linux", Platform (OtherArch "armv7a") Linux)
   , ("armv7a-netbsd", Platform (OtherArch "armv7a") NetBSD)
   , ("armv7l-linux", Platform (OtherArch "armv7l") Linux)
   , ("armv7l-netbsd", Platform (OtherArch "armv7l") NetBSD)
   , ("avr-none", Platform (OtherArch "avr") (OtherOS "none"))
   , ("i686-cygwin", Platform I386 (OtherOS "cygwin"))
-  , ("i686-darwin", Platform I386 OSX)
   , ("i686-freebsd", Platform I386 FreeBSD)
   , ("i686-genode", Platform I386 (OtherOS "genode"))
   , ("i686-linux", Platform I386 Linux)
@@ -104,6 +102,7 @@ nixpkgsSystemMapping =
   , ("or1k-none", Platform (OtherArch "or1k") (OtherOS "none"))
   , ("powerpc-netbsd", Platform PPC NetBSD)
   , ("powerpc-none", Platform PPC (OtherOS "none"))
+  , ("powerpc-linux", Platform PPC Linux)
   , ("powerpc64-linux", Platform PPC64 Linux)
   , ("powerpc64le-linux", Platform (OtherArch "powerpc64le") Linux)
   , ("powerpcle-none", Platform (OtherArch "powerpcle") (OtherOS "none"))