git.iko.soy/typeable/cabal2nix
on master help sign in
Provide NFData instance for Configuration type.
commitaeb6c7c980a360ed4cfc17d17a4cda15f030e23d authorPeter Simons <simons@cryp.to> dateTue 1 Sep 2015, 17:51 (11 years ago) parent234191b
2 files changed+10−1
distribution-nixpkgs/src/Distribution/Nixpkgs/Haskell/FromCabal/Configuration.hs+7−1 distribution-nixpkgs/src/Distribution/Nixpkgs/Haskell/OrphanInstances.hs+3
distribution-nixpkgs/src/Distribution/Nixpkgs/Haskell/FromCabal/Configuration.hs+7−1
@@ -1,3 +1,5 @@
1+{-# LANGUAGE DeriveGeneric #-}
2+
13module Distribution.Nixpkgs.Haskell.FromCabal.Configuration
24 ( Configuration(..), allPlatforms, linux, darwin, arch32, arch64
35 , module Distribution.Compiler
@@ -8,6 +10,7 @@ module Distribution.Nixpkgs.Haskell.FromCabal.Configuration
810 , module Language.Nix.Identifier
911 ) where
1012
13+import Control.DeepSeq.Generics
1114import Data.Map as Map
1215import Data.Set as Set
1316import Distribution.Compiler
@@ -15,6 +18,7 @@ import Distribution.Nixpkgs.Haskell.Constraint
1518import Distribution.Package
1619import Distribution.System
1720import Distribution.Version
21+import GHC.Generics ( Generic )
1822import Language.Nix.Identifier
1923
2024data Configuration = Configuration
@@ -50,7 +54,9 @@ data Configuration = Configuration
5054 -- 'maintainers' for a given Haskell package.
5155 , packageMaintainers :: Map PackageName (Set Identifier)
5256 }
53− deriving (Show)
57+ deriving (Show, Generic)
58+
59+instance NFData Configuration where rnf = genericRnf
5460
5561allPlatforms :: Set Platform
5662allPlatforms = Set.fromList [ Platform I386 Linux, Platform X86_64 Linux
distribution-nixpkgs/src/Distribution/Nixpkgs/Haskell/OrphanInstances.hs+3
@@ -57,6 +57,9 @@ instance NFData TestType where rnf = genericRnf
5757instance NFData VersionRange where rnf = genericRnf
5858instance NFData a => NFData (Condition a) where rnf = genericRnf
5959instance NFData Platform where rnf = genericRnf
60+instance NFData CompilerInfo where rnf = genericRnf
61+instance NFData CompilerId where rnf = genericRnf
62+instance NFData AbiTag where rnf = genericRnf
6063
6164instance IsString PackageName where
6265 fromString = text2isString "PackageName"