Merge pull request #619 from NixOS/distribution-nixpkgs-cleanup

distribution-nixpkgs: update test data + small cleanup

Author: sternenseemann

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

@@ -168,7 +168,7 @@ nixpkgsPlatformFromString s = platformGroup <|> singlePlatform
 --   Just (Platform PPC OSX)
 --   >>> cabalPlatformFromSystem "powerpc64le-linux"
 --   Just (Platform (OtherArch "powerpc64le") Linux)
---   >>> cabalPlatformFromSystem "js-ghcjs"
+--   >>> cabalPlatformFromSystem "javascript-ghcjs"
 --   Just (Platform JavaScript Ghcjs)
 cabalPlatformFromSystem :: String -> Maybe Platform
 cabalPlatformFromSystem s =
@@ -200,7 +200,6 @@ cabalPlatformFromSystem s =
         parseArch as =
           case classifyArch Strict as of
             OtherArch "i686" -> I386
-            OtherArch "js" -> JavaScript
             OtherArch "powerpc" -> PPC
             OtherArch "powerpc64" -> PPC64
             a -> a

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

@@ -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"]

distribution-nixpkgs/test/hspec.hs

@@ -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)
@@ -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)
@@ -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)]