Merge of #11097

Author: mergify[bot]

Cabal-syntax/src/Distribution/Compiler.hs

@@ -224,6 +224,7 @@ data AbiTag
   deriving (Eq, Generic, Show, Read)
 
 instance Binary AbiTag
+instance NFData AbiTag
 instance Structured AbiTag
 
 instance Pretty AbiTag where

Cabal/src/Distribution/Simple/Compiler.hs

@@ -130,6 +130,7 @@ data Compiler = Compiler
   deriving (Eq, Generic, Show, Read)
 
 instance Binary Compiler
+instance NFData Compiler
 instance Structured Compiler
 
 showCompilerId :: Compiler -> String
@@ -205,6 +206,7 @@ data PackageDBX fp
   deriving (Eq, Generic, Ord, Show, Read, Functor, Foldable, Traversable)
 
 instance Binary fp => Binary (PackageDBX fp)
+instance NFData fp => NFData (PackageDBX fp)
 instance Structured fp => Structured (PackageDBX fp)
 
 -- | Parse a PackageDB stack entry
@@ -305,6 +307,7 @@ data OptimisationLevel
   deriving (Bounded, Enum, Eq, Generic, Read, Show)
 
 instance Binary OptimisationLevel
+instance NFData OptimisationLevel
 instance Structured OptimisationLevel
 
 instance Parsec OptimisationLevel where
@@ -354,6 +357,7 @@ data DebugInfoLevel
   deriving (Bounded, Enum, Eq, Generic, Read, Show)
 
 instance Binary DebugInfoLevel
+instance NFData DebugInfoLevel
 instance Structured DebugInfoLevel
 
 instance Parsec DebugInfoLevel where
@@ -607,6 +611,7 @@ data ProfDetailLevel
   deriving (Eq, Generic, Read, Show)
 
 instance Binary ProfDetailLevel
+instance NFData ProfDetailLevel
 instance Structured ProfDetailLevel
 
 instance Parsec ProfDetailLevel where

Cabal/src/Distribution/Simple/InstallDirs.hs

@@ -109,6 +109,7 @@ data InstallDirs dir = InstallDirs
   deriving (Eq, Read, Show, Functor, Generic)
 
 instance Binary dir => Binary (InstallDirs dir)
+instance NFData dir => NFData (InstallDirs dir)
 instance Structured dir => Structured (InstallDirs dir)
 
 instance (Semigroup dir, Monoid dir) => Monoid (InstallDirs dir) where
@@ -397,6 +398,7 @@ newtype PathTemplate = PathTemplate [PathComponent]
   deriving (Eq, Ord, Generic)
 
 instance Binary PathTemplate
+instance NFData PathTemplate
 instance Structured PathTemplate
 
 type PathTemplateEnv = [(PathTemplateVariable, PathTemplate)]

Cabal/src/Distribution/Simple/InstallDirs/Internal.hs

@@ -14,6 +14,7 @@ data PathComponent
   deriving (Eq, Ord, Generic)
 
 instance Binary PathComponent
+instance NFData PathComponent
 instance Structured PathComponent
 
 data PathTemplateVariable
@@ -67,6 +68,7 @@ data PathTemplateVariable
   deriving (Eq, Ord, Generic)
 
 instance Binary PathTemplateVariable
+instance NFData PathTemplateVariable
 instance Structured PathTemplateVariable
 
 instance Show PathTemplateVariable where

Cabal/src/Distribution/Simple/Setup/Haddock.hs

@@ -75,6 +75,7 @@ import qualified Text.PrettyPrint as Disp
 data HaddockTarget = ForHackage | ForDevelopment deriving (Eq, Show, Generic)
 
 instance Binary HaddockTarget
+instance NFData HaddockTarget
 instance Structured HaddockTarget
 
 instance Pretty HaddockTarget where

Cabal/src/Distribution/Simple/Setup/Test.hs

@@ -60,6 +60,7 @@ data TestShowDetails = Never | Failures | Always | Streaming | Direct
   deriving (Eq, Ord, Enum, Bounded, Generic, Show)
 
 instance Binary TestShowDetails
+instance NFData TestShowDetails
 instance Structured TestShowDetails
 
 knownTestShowDetails :: [TestShowDetails]

Cabal/src/Distribution/Types/DumpBuildInfo.hs

@@ -13,6 +13,7 @@ data DumpBuildInfo
   deriving (Read, Show, Eq, Ord, Enum, Bounded, Generic)
 
 instance Binary DumpBuildInfo
+instance NFData DumpBuildInfo
 instance Structured DumpBuildInfo
 
 instance Parsec DumpBuildInfo where

Cabal/src/Distribution/Types/ParStrat.hs

@@ -1,5 +1,7 @@
 module Distribution.Types.ParStrat where
 
+import Distribution.Compat.Prelude
+
 -- | How to control parallelism, e.g. a fixed number of jobs or by using a system semaphore.
 data ParStratX sem
   = -- | Compile in parallel with the given number of jobs (`-jN` or `-j`).
@@ -10,6 +12,11 @@ data ParStratX sem
     Serial
   deriving (Show)
 
+instance NFData sem => NFData (ParStratX sem) where
+  rnf (NumJobs m) = rnf m
+  rnf (UseSem s) = rnf s
+  rnf Serial = ()
+
 -- | Used by Cabal to indicate that we want to use this specific semaphore (created by cabal-install)
 type ParStrat = ParStratX String
 

Cabal/src/Distribution/Utils/NubList.hs

@@ -75,6 +75,9 @@ instance (Ord a, Binary a) => Binary (NubList a) where
 
 instance Structured a => Structured (NubList a)
 
+instance (Ord a, NFData a) => NFData (NubList a) where
+  rnf (NubList xs) = rnf xs
+
 -- | NubListR : A right-biased version of 'NubList'. That is @toNubListR
 -- ["-XNoFoo", "-XFoo", "-XNoFoo"]@ will result in @["-XFoo", "-XNoFoo"]@,
 -- unlike the normal 'NubList', which is left-biased. Built on top of

Cabal/src/Distribution/Verbosity.hs

@@ -111,6 +111,7 @@ instance Bounded Verbosity where
   maxBound = mkVerbosity maxBound
 
 instance Binary Verbosity
+instance NFData Verbosity
 instance Structured Verbosity
 
 -- | In 'silent' mode, we should not print /anything/ unless an error occurs.