Skip to content

Commit 1981eba

Browse files
ulysses4evermergify[bot]
authored andcommitted
GHC 9.6 compatibility
- -XTypeInType is deprecated - skip failing JS test on Windows Cf. #8754 (comment) - deal with lift2A in Prelude since base-4.18 (GHC 9.6) - disable everfailing Backpack tests (cherry picked from commit 87ac120)
1 parent 7de5460 commit 1981eba

File tree

6 files changed

+8
-4
lines changed

6 files changed

+8
-4
lines changed

Cabal-syntax/src/Distribution/Utils/Structured.hs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
{-# LANGUAGE TypeFamilies #-}
88
{-# LANGUAGE TypeOperators #-}
99
{-# LANGUAGE PatternSynonyms #-}
10-
{-# LANGUAGE TypeInType #-}
1110
-- |
1211
--
1312
-- Copyright: (c) 2019 Oleg Grenrus

cabal-install/src/Distribution/Client/VCS.hs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{-# LANGUAGE CPP #-}
12
{-# LANGUAGE LambdaCase #-}
23
{-# LANGUAGE ScopedTypeVariables #-}
34
{-# LANGUAGE NamedFieldPuns, RecordWildCards, RankNTypes #-}
@@ -53,8 +54,11 @@ import Distribution.Version
5354
( mkVersion )
5455
import qualified Distribution.PackageDescription as PD
5556

57+
#if !MIN_VERSION_base(4,18,0)
5658
import Control.Applicative
5759
( liftA2 )
60+
#endif
61+
5862
import Control.Exception
5963
( throw, try )
6064
import Control.Monad.Trans

cabal-testsuite/PackageTests/Backpack/Includes2/setup-external.test.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Test.Cabal.Prelude
22
main = setupAndCabalTest $ do
33
skipUnlessGhcVersion ">= 8.1"
4-
ghc <- isGhcVersion "== 9.0.2 || == 9.2.* || == 9.4.*"
4+
ghc <- isGhcVersion "== 9.0.2 || == 9.2.* || == 9.4.* || == 9.6.*"
55
expectBrokenIf ghc 7987 $ do
66
withPackageDb $ do
77
withDirectory "mylib" $ setup_install_with_docs ["--ipid", "mylib-0.1.0.0"]

cabal-testsuite/PackageTests/Backpack/Includes2/setup-per-component.test.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import Test.Cabal.Prelude
22
main = setupTest $ do
33
-- No cabal test because per-component is broken with it
44
skipUnlessGhcVersion ">= 8.1"
5-
ghc <- isGhcVersion "== 9.0.2 || == 9.2.* || == 9.4.*"
5+
ghc <- isGhcVersion "== 9.0.2 || == 9.2.* || == 9.4.* || == 9.6.*"
66
expectBrokenIf ghc 7987 $
77
withPackageDb $ do
88
let setup_install' args = setup_install_with_docs (["--cabal-file", "Includes2.cabal"] ++ args)

cabal-testsuite/PackageTests/Backpack/Includes3/setup-external-ok.test.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import Data.List
33
import qualified Data.Char as Char
44
main = setupAndCabalTest $ do
55
skipUnlessGhcVersion ">= 8.1"
6-
ghc <- isGhcVersion "== 9.0.2 || == 9.2.* || == 9.4.*"
6+
ghc <- isGhcVersion "== 9.0.2 || == 9.2.* || == 9.4.* || == 9.6.*"
77
expectBrokenIf ghc 7987 $
88
withPackageDb $ do
99
containers_id <- getIPID "containers"

cabal-testsuite/PackageTests/JS/JsSources/js-arch.test.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import Test.Cabal.Prelude
33
main = setupAndCabalTest $ do
44
skipUnlessGhcVersion ">= 9.6"
55
skipUnlessJavaScript
6+
skipIfWindows
67

78
res <- cabal' "v2-run" ["demo"]
89
assertOutputContains "Hello JS!" res

0 commit comments

Comments
 (0)