Skip to content

Commit 3792794

Browse files
authored
CI: add GHC 9.12 (haskell#10667)
* GHC 9.12 compat: deriving Typeable has to go 9.12 turned it into a warning * GHC 9.12 compat: ErrorCallWithLocation got deprecated * CI: add 9.12
1 parent 731f699 commit 3792794

File tree

132 files changed

+173
-259
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+173
-259
lines changed

.github/workflows/validate.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,9 @@ jobs:
8080
# support, so the PR *must* have a changelog entry.
8181
ghc:
8282
[
83+
"9.12.1",
8384
"9.10.1",
84-
"9.8.2",
85+
"9.8.4",
8586
"9.6.6",
8687
"9.4.8",
8788
"9.2.8",

Cabal-syntax/src/Distribution/Backpack.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ data OpenUnitId
8989
-- MUST NOT be for an indefinite component; an 'OpenUnitId'
9090
-- is guaranteed not to have any holes.
9191
DefiniteUnitId DefUnitId
92-
deriving (Generic, Read, Show, Eq, Ord, Typeable, Data)
92+
deriving (Generic, Read, Show, Eq, Ord, Data)
9393

9494
-- TODO: cache holes?
9595

@@ -163,7 +163,7 @@ mkDefUnitId cid insts =
163163
data OpenModule
164164
= OpenModule OpenUnitId ModuleName
165165
| OpenModuleVar ModuleName
166-
deriving (Generic, Read, Show, Eq, Ord, Typeable, Data)
166+
deriving (Generic, Read, Show, Eq, Ord, Data)
167167

168168
instance Binary OpenModule
169169
instance Structured OpenModule

Cabal-syntax/src/Distribution/CabalSpecVersion.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ data CabalSpecVersion
3535
| -- 3.10: no changes
3636
CabalSpecV3_12
3737
| CabalSpecV3_14
38-
deriving (Eq, Ord, Show, Read, Enum, Bounded, Typeable, Data, Generic)
38+
deriving (Eq, Ord, Show, Read, Enum, Bounded, Data, Generic)
3939

4040
instance Binary CabalSpecVersion
4141
instance Structured CabalSpecVersion

Cabal-syntax/src/Distribution/Compat/Graph.hs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{-# LANGUAGE BangPatterns #-}
22
{-# LANGUAGE CPP #-}
3-
{-# LANGUAGE DeriveDataTypeable #-}
43
{-# LANGUAGE FlexibleContexts #-}
54
{-# LANGUAGE ScopedTypeVariables #-}
65
{-# LANGUAGE TypeFamilies #-}
@@ -122,7 +121,6 @@ data Graph a = Graph
122121
, graphKeyToVertex :: Key a -> Maybe G.Vertex
123122
, graphBroken :: [(a, [Key a])]
124123
}
125-
deriving (Typeable)
126124

127125
-- NB: Not a Functor! (or Traversable), because you need
128126
-- to restrict Key a ~ Key b. We provide our own mapping

Cabal-syntax/src/Distribution/Compat/NonEmptySet.hs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import Control.DeepSeq (NFData (..))
3333
import Data.Data (Data)
3434
import Data.List.NonEmpty (NonEmpty (..))
3535
import Data.Semigroup (Semigroup (..))
36-
import Data.Typeable (Typeable)
3736

3837
import qualified Data.Foldable as F
3938
import qualified Data.Set as Set
@@ -49,7 +48,7 @@ import Control.Monad (fail)
4948

5049
-- | @since 3.4.0.0
5150
newtype NonEmptySet a = NES (Set.Set a)
52-
deriving (Eq, Ord, Typeable, Data, Read)
51+
deriving (Eq, Ord, Data, Read)
5352

5453
-------------------------------------------------------------------------------
5554
-- Instances

Cabal-syntax/src/Distribution/Compat/Semigroup.hs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{-# LANGUAGE CPP #-}
2-
{-# LANGUAGE DeriveDataTypeable #-}
32
{-# LANGUAGE DeriveGeneric #-}
43
{-# LANGUAGE FlexibleContexts #-}
54
{-# LANGUAGE GeneralizedNewtypeDeriving #-}
@@ -18,7 +17,6 @@ module Distribution.Compat.Semigroup
1817
, gmempty
1918
) where
2019

21-
import Data.Typeable (Typeable)
2220
import Distribution.Compat.Binary (Binary)
2321
import Distribution.Utils.Structured (Structured)
2422

@@ -39,7 +37,7 @@ instance Semigroup (First' a) where
3937

4038
-- | A copy of 'Data.Semigroup.Last'.
4139
newtype Last' a = Last' {getLast' :: a}
42-
deriving (Eq, Ord, Read, Show, Generic, Binary, Typeable)
40+
deriving (Eq, Ord, Read, Show, Generic, Binary)
4341

4442
instance Structured a => Structured (Last' a)
4543

@@ -52,7 +50,7 @@ instance Functor Last' where
5250
-- | A wrapper around 'Maybe', providing the 'Semigroup' and 'Monoid' instances
5351
-- implemented for 'Maybe' since @base-4.11@.
5452
newtype Option' a = Option' {getOption' :: Maybe a}
55-
deriving (Eq, Ord, Read, Show, Binary, Generic, Functor, Typeable)
53+
deriving (Eq, Ord, Read, Show, Binary, Generic, Functor)
5654

5755
instance Structured a => Structured (Option' a)
5856

Cabal-syntax/src/Distribution/Compiler.hs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ data CompilerFlavor
7676
| MHS -- MicroHS, see https://github.com/augustss/MicroHs
7777
| HaskellSuite String -- string is the id of the actual compiler
7878
| OtherCompiler String
79-
deriving (Generic, Show, Read, Eq, Ord, Typeable, Data)
79+
deriving (Generic, Show, Read, Eq, Ord, Data)
8080

8181
instance Binary CompilerFlavor
8282
instance Structured CompilerFlavor
@@ -141,7 +141,6 @@ data PerCompilerFlavor v = PerCompilerFlavor v v
141141
, Read
142142
, Eq
143143
, Ord
144-
, Typeable
145144
, Data
146145
, Functor
147146
, Foldable
@@ -172,7 +171,7 @@ instance (Semigroup a, Monoid a) => Monoid (PerCompilerFlavor a) where
172171
-- ------------------------------------------------------------
173172

174173
data CompilerId = CompilerId CompilerFlavor Version
175-
deriving (Eq, Generic, Ord, Read, Show, Typeable)
174+
deriving (Eq, Generic, Ord, Read, Show)
176175

177176
instance Binary CompilerId
178177
instance Structured CompilerId
@@ -222,7 +221,7 @@ instance Binary CompilerInfo
222221
data AbiTag
223222
= NoAbiTag
224223
| AbiTag String
225-
deriving (Eq, Generic, Show, Read, Typeable)
224+
deriving (Eq, Generic, Show, Read)
226225

227226
instance Binary AbiTag
228227
instance Structured AbiTag

Cabal-syntax/src/Distribution/License.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ data License
111111
OtherLicense
112112
| -- | Indicates an erroneous license name.
113113
UnknownLicense String
114-
deriving (Generic, Read, Show, Eq, Ord, Typeable, Data)
114+
deriving (Generic, Read, Show, Eq, Ord, Data)
115115

116116
instance Binary License
117117
instance Structured License

Cabal-syntax/src/Distribution/ModuleName.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import qualified Text.PrettyPrint as Disp
4040

4141
-- | A valid Haskell module name.
4242
newtype ModuleName = ModuleName ShortText
43-
deriving (Eq, Generic, Ord, Read, Show, Typeable, Data)
43+
deriving (Eq, Generic, Ord, Read, Show, Data)
4444

4545
unModuleName :: ModuleName -> String
4646
unModuleName (ModuleName s) = fromShortText s

Cabal-syntax/src/Distribution/SPDX/License.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ data License
4141
NONE
4242
| -- | A valid SPDX License Expression as defined in Appendix IV.
4343
License LicenseExpression
44-
deriving (Show, Read, Eq, Ord, Typeable, Data, Generic)
44+
deriving (Show, Read, Eq, Ord, Data, Generic)
4545

4646
instance Binary License
4747
instance Structured License

0 commit comments

Comments
 (0)