Merge pull request #572 from NixOS/Cabal-3.8

Fix test suites with Cabal >= 3.8

Author: sternenseemann

cabal2nix/test/Main.hs

@@ -1,5 +1,6 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE LambdaCase #-}
+{-# LANGUAGE CPP #-}
 
 module Main ( main ) where
 
@@ -13,8 +14,13 @@ import Control.Monad
 import qualified Data.Set as Set
 import Distribution.Compiler
 import Distribution.Package
+#if MIN_VERSION_Cabal(3,8,1)
+import Distribution.Simple.PackageDescription
+import Distribution.Types.GenericPackageDescription
+#else
 import Distribution.PackageDescription
 import Distribution.PackageDescription.Parsec
+#endif
 import Distribution.System
 import Distribution.Verbosity
 import Distribution.Version

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-freebsd","i686-genode","i686-linux","i686-netbsd","i686-none","i686-openbsd","i686-windows","js-ghcjs","m68k-linux","m68k-netbsd","m68k-none","mips-linux","mips64-linux","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","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"]
+["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","js-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","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

@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 module Main ( main ) where
 
 import Control.DeepSeq
@@ -29,7 +30,7 @@ main = hspec $ do
                   ]
 
   describe "Platform rendering and parsing:" $ do
-    it "Checks cover all systems from all-system-tuples.json" $do
+    it "Checks cover all systems from all-system-tuples.json" $ do
       let allSystemTuplesJson = "test/data/all-system-tuples.json"
       available <- doesFileExist allSystemTuplesJson
       if not available
@@ -78,6 +79,10 @@ nixpkgsSystemMapping =
   , ("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"))
   , ("mips64el-linux", Platform (OtherArch "mips64el") Linux)
   , ("mipsel-linux", Platform (OtherArch "mipsel") Linux)
   , ("mipsel-netbsd", Platform (OtherArch "mipsel") NetBSD)
@@ -95,13 +100,24 @@ nixpkgsSystemMapping =
   , ("riscv64-linux", Platform (OtherArch "riscv64") Linux)
   , ("riscv64-netbsd", Platform (OtherArch "riscv64") NetBSD)
   , ("riscv64-none", Platform (OtherArch "riscv64") (OtherOS "none"))
+  , ("rx-none", Platform (OtherArch "rx") (OtherOS "none"))
   , ("s390-linux", Platform S390 Linux)
   , ("s390-none", Platform S390 (OtherOS "none"))
+#if MIN_VERSION_Cabal(3,8,1)
+  , ("s390x-linux", Platform S390X Linux)
+  , ("s390x-none", Platform S390X (OtherOS "none"))
+#else
   , ("s390x-linux", Platform (OtherArch "s390x") Linux)
   , ("s390x-none", Platform (OtherArch "s390x") (OtherOS "none"))
+#endif
   , ("vc4-none", Platform (OtherArch "vc4") (OtherOS "none"))
+#if MIN_VERSION_Cabal(3,8,1)
+  , ("wasm32-wasi", Platform Wasm32 Wasi)
+  , ("wasm64-wasi", Platform (OtherArch "wasm64") Wasi)
+#else
   , ("wasm32-wasi", Platform (OtherArch "wasm32") (OtherOS "wasi"))
   , ("wasm64-wasi", Platform (OtherArch "wasm64") (OtherOS "wasi"))
+#endif
   , ("x86_64-cygwin", Platform X86_64 (OtherOS "cygwin"))
   , ("x86_64-darwin", Platform X86_64 OSX)
   , ("x86_64-freebsd", Platform X86_64 FreeBSD)

shell.nix

@@ -1,7 +1,12 @@
-{ pkgs ? import <nixpkgs> { } }:
+{ pkgs ? import <nixpkgs> { }
+, ghcVersion ? pkgs.haskellPackages.ghc.version
+, withHls ? true
+}:
 
 let
-  haskellPackages = pkgs.haskellPackages;
+  haskellPackages = pkgs.haskell.packages."ghc${
+    builtins.replaceStrings [ "." ] [ "" ] ghcVersion
+  }";
   ghc = haskellPackages.ghcWithHoogle (hps: [
     hps.ansi-wl-pprint
     hps.hopenssl
@@ -26,7 +31,8 @@ in pkgs.mkShell {
     ghc
     pkgs.cabal-install
     pkgs.haskell-ci
-    haskellPackages.haskell-language-server
     (pkgs.lib.getLib pkgs.openssl)
+  ] ++ pkgs.lib.optionals withHls [
+    haskellPackages.haskell-language-server
   ];
 }