git.iko.soy/typeable/cabal2nix
on master help sign in
distribution-nixpkgs: Use Control.DeepSeq, not Control.DeepSeq.Generics
0b92a5eMichael Alan Dorman
distribution-nixpkgs/distribution-nixpkgs.cabal+2−3
compare with master
unifiedsplit
@@ -29,7 +29,7 @@ library
29 , bytestring
29 , bytestring
30 , Cabal >= 1.22.2
30 , Cabal >= 1.22.2
31 , containers
31 , containers
32− , deepseq-generics
32+ , deepseq >= 1.4
33 , directory
33 , directory
34 , filepath
34 , filepath
35 , hackage-db
35 , hackage-db
@@ -82,7 +82,7 @@ test-suite spec
82 , bytestring
82 , bytestring
83 , Cabal >= 1.22.2
83 , Cabal >= 1.22.2
84 , containers
84 , containers
85− , deepseq-generics
85+ , deepseq >= 1.4
86 , directory
86 , directory
87 , filepath
87 , filepath
88 , hackage-db
88 , hackage-db
@@ -98,7 +98,6 @@ test-suite spec
98 , unordered-containers
98 , unordered-containers
99 , utf8-string
99 , utf8-string
100 , yaml
100 , yaml
101− , deepseq
102 , distribution-nixpkgs
101 , distribution-nixpkgs
103 , doctest
102 , doctest
104 , hspec
103 , hspec
distribution-nixpkgs/package.yaml+2−2
@@ -15,7 +15,7 @@ dependencies:
15 - bytestring
15 - bytestring
16 - Cabal >= 1.22.2
16 - Cabal >= 1.22.2
17 - containers
17 - containers
18− - deepseq-generics
18+ - deepseq >= 1.4
19 - directory
19 - directory
20 - filepath
20 - filepath
21 - hackage-db
21 - hackage-db
@@ -61,7 +61,7 @@ tests:
61 source-dirs:
61 source-dirs:
62 - test
62 - test
63 dependencies:
63 dependencies:
64− - deepseq
64+ - deepseq >= 1.4
65 - distribution-nixpkgs
65 - distribution-nixpkgs
66 - doctest
66 - doctest
67 - hspec
67 - hspec
distribution-nixpkgs/src/Distribution/Nixpkgs/Fetch.hs+4−4
@@ -11,7 +11,7 @@ module Distribution.Nixpkgs.Fetch
11 ) where
11 ) where
12
12
13import Control.Applicative
13import Control.Applicative
14−import Control.DeepSeq.Generics
14+import Control.DeepSeq
15import Control.Monad
15import Control.Monad
16import Control.Monad.IO.Class
16import Control.Monad.IO.Class
17import Control.Monad.Trans.Maybe
17import Control.Monad.Trans.Maybe
@@ -32,12 +32,12 @@ data Source = Source
32 , sourceHash :: Hash -- ^ The expected hash of the source, if available.
32 , sourceHash :: Hash -- ^ The expected hash of the source, if available.
33 } deriving (Show, Eq, Ord, Generic)
33 } deriving (Show, Eq, Ord, Generic)
34
34
35−instance NFData Source where rnf = genericRnf
35+instance NFData Source
36
36
37data Hash = Certain String | Guess String | UnknownHash
37data Hash = Certain String | Guess String | UnknownHash
38 deriving (Show, Eq, Ord, Generic)
38 deriving (Show, Eq, Ord, Generic)
39
39
40−instance NFData Hash where rnf = genericRnf
40+instance NFData Hash
41
41
42isUnknown :: Hash -> Bool
42isUnknown :: Hash -> Bool
43isUnknown UnknownHash = True
43isUnknown UnknownHash = True
@@ -57,7 +57,7 @@ data DerivationSource = DerivationSource
57 }
57 }
58 deriving (Show, Eq, Ord, Generic)
58 deriving (Show, Eq, Ord, Generic)
59
59
60−instance NFData DerivationSource where rnf = genericRnf
60+instance NFData DerivationSource
61
61
62instance FromJSON DerivationSource where
62instance FromJSON DerivationSource where
63 parseJSON (Object o) = DerivationSource (error "undefined DerivationSource.kind")
63 parseJSON (Object o) = DerivationSource (error "undefined DerivationSource.kind")
distribution-nixpkgs/src/Distribution/Nixpkgs/Haskell/BuildInfo.hs+2−2
@@ -9,7 +9,7 @@ module Distribution.Nixpkgs.Haskell.BuildInfo
9 )
9 )
10 where
10 where
11
11
12−import Control.DeepSeq.Generics
12+import Control.DeepSeq
13import Data.Set ( Set )
13import Data.Set ( Set )
14import Data.Set.Lens
14import Data.Set.Lens
15import GHC.Generics ( Generic )
15import GHC.Generics ( Generic )
@@ -35,7 +35,7 @@ instance Monoid BuildInfo where
35 mempty = BuildInfo mempty mempty mempty mempty
35 mempty = BuildInfo mempty mempty mempty mempty
36 BuildInfo w1 x1 y1 z1 `mappend` BuildInfo w2 x2 y2 z2 = BuildInfo (w1 `mappend` w2) (x1 `mappend` x2) (y1 `mappend` y2) (z1 `mappend` z2)
36 BuildInfo w1 x1 y1 z1 `mappend` BuildInfo w2 x2 y2 z2 = BuildInfo (w1 `mappend` w2) (x1 `mappend` x2) (y1 `mappend` y2) (z1 `mappend` z2)
37
37
38−instance NFData BuildInfo where rnf = genericRnf
38+instance NFData BuildInfo
39
39
40pPrintBuildInfo :: String -> BuildInfo -> Doc
40pPrintBuildInfo :: String -> BuildInfo -> Doc
41pPrintBuildInfo prefix bi = vcat
41pPrintBuildInfo prefix bi = vcat
distribution-nixpkgs/src/Distribution/Nixpkgs/Haskell/Derivation.hs+2−2
@@ -12,7 +12,7 @@ module Distribution.Nixpkgs.Haskell.Derivation
12 )
12 )
13 where
13 where
14
14
15−import Control.DeepSeq.Generics
15+import Control.DeepSeq
16import Data.List
16import Data.List
17import Data.Set ( Set )
17import Data.Set ( Set )
18import qualified Data.Set as Set
18import qualified Data.Set as Set
@@ -92,7 +92,7 @@ makeLensesFor [("_libraryDepends", "dependencies"), ("_executableDepends", "depe
92instance Package Derivation where
92instance Package Derivation where
93 packageId = view pkgid
93 packageId = view pkgid
94
94
95−instance NFData Derivation where rnf = genericRnf
95+instance NFData Derivation
96
96
97instance Pretty Derivation where
97instance Pretty Derivation where
98 pPrint drv@(MkDerivation {..}) = funargs (map text ("mkDerivation" : toAscList inputs)) $$ vcat
98 pPrint drv@(MkDerivation {..}) = funargs (map text ("mkDerivation" : toAscList inputs)) $$ vcat
distribution-nixpkgs/src/Distribution/Nixpkgs/Haskell/FromCabal/Configuration.hs+2−2
@@ -7,7 +7,7 @@
7
7
8module Distribution.Nixpkgs.Haskell.FromCabal.Configuration ( Configuration(..), readConfiguration, assertConsistency ) where
8module Distribution.Nixpkgs.Haskell.FromCabal.Configuration ( Configuration(..), readConfiguration, assertConsistency ) where
9
9
10−import Control.DeepSeq.Generics
10+import Control.DeepSeq
11import Control.Lens
11import Control.Lens
12import Control.Monad
12import Control.Monad
13import Data.Map as Map
13import Data.Map as Map
@@ -49,7 +49,7 @@ data Configuration = Configuration
49 }
49 }
50 deriving (Show, Generic)
50 deriving (Show, Generic)
51
51
52−instance NFData Configuration where rnf = genericRnf
52+instance NFData Configuration
53
53
54instance FromJSON Configuration where
54instance FromJSON Configuration where
55 parseJSON (Object o) = Configuration
55 parseJSON (Object o) = Configuration
distribution-nixpkgs/src/Distribution/Nixpkgs/Haskell/OrphanInstances.hs+38−38
@@ -6,7 +6,7 @@
6
6
7module Distribution.Nixpkgs.Haskell.OrphanInstances ( ) where
7module Distribution.Nixpkgs.Haskell.OrphanInstances ( ) where
8
8
9−import Control.DeepSeq.Generics
9+import Control.DeepSeq
10import Data.Maybe
10import Data.Maybe
11import Data.String
11import Data.String
12import qualified Data.Text as T
12import qualified Data.Text as T
@@ -29,45 +29,45 @@ deriving instance Generic ConfVar
29deriving instance Generic Flag
29deriving instance Generic Flag
30deriving instance Generic GenericPackageDescription
30deriving instance Generic GenericPackageDescription
31#else
31#else
32−instance NFData SetupBuildInfo where rnf = genericRnf
32+instance NFData SetupBuildInfo
33#endif
33#endif
34
34
35−instance (NFData v, NFData c, NFData a) => NFData (CondTree v c a) where rnf = genericRnf
35+instance (NFData v, NFData c, NFData a) => NFData (CondTree v c a)
36−instance NFData Arch where rnf = genericRnf
36+instance NFData Arch
37−instance NFData Benchmark where rnf = genericRnf
37+instance NFData Benchmark
38−instance NFData BenchmarkInterface where rnf = genericRnf
38+instance NFData BenchmarkInterface
39−instance NFData BenchmarkType where rnf = genericRnf
39+instance NFData BenchmarkType
40−instance NFData BuildInfo where rnf = genericRnf
40+instance NFData BuildInfo
41−instance NFData BuildType where rnf = genericRnf
41+instance NFData BuildType
42−instance NFData CompilerFlavor where rnf = genericRnf
42+instance NFData CompilerFlavor
43−instance NFData ConfVar where rnf = genericRnf
43+instance NFData ConfVar
44−instance NFData Dependency where rnf = genericRnf
44+instance NFData Dependency
45−instance NFData Executable where rnf = genericRnf
45+instance NFData Executable
46−instance NFData Extension where rnf = genericRnf
46+instance NFData Extension
47−instance NFData Flag where rnf = genericRnf
47+instance NFData Flag
48−instance NFData FlagName where rnf = genericRnf
48+instance NFData FlagName
49−instance NFData GenericPackageDescription where rnf = genericRnf
49+instance NFData GenericPackageDescription
50−instance NFData KnownExtension where rnf = genericRnf
50+instance NFData KnownExtension
51−instance NFData Language where rnf = genericRnf
51+instance NFData Language
52−instance NFData Library where rnf = genericRnf
52+instance NFData Library
53−instance NFData License where rnf = genericRnf
53+instance NFData License
54−instance NFData ModuleName where rnf = genericRnf
54+instance NFData ModuleName
55−instance NFData ModuleReexport where rnf = genericRnf
55+instance NFData ModuleReexport
56−instance NFData ModuleRenaming where rnf = genericRnf
56+instance NFData ModuleRenaming
57−instance NFData OS where rnf = genericRnf
57+instance NFData OS
58−instance NFData PackageDescription where rnf = genericRnf
58+instance NFData PackageDescription
59−instance NFData RepoKind where rnf = genericRnf
59+instance NFData RepoKind
60−instance NFData RepoType where rnf = genericRnf
60+instance NFData RepoType
61−instance NFData SourceRepo where rnf = genericRnf
61+instance NFData SourceRepo
62−instance NFData TestSuite where rnf = genericRnf
62+instance NFData TestSuite
63−instance NFData TestSuiteInterface where rnf = genericRnf
63+instance NFData TestSuiteInterface
64−instance NFData TestType where rnf = genericRnf
64+instance NFData TestType
65−instance NFData VersionRange where rnf = genericRnf
65+instance NFData VersionRange
66−instance NFData a => NFData (Condition a) where rnf = genericRnf
66+instance NFData a => NFData (Condition a)
67−instance NFData Platform where rnf = genericRnf
67+instance NFData Platform
68−instance NFData CompilerInfo where rnf = genericRnf
68+instance NFData CompilerInfo
69−instance NFData CompilerId where rnf = genericRnf
69+instance NFData CompilerId
70−instance NFData AbiTag where rnf = genericRnf
70+instance NFData AbiTag
71
71
72instance IsString PackageName where
72instance IsString PackageName where
73 fromString = text2isString "PackageName"
73 fromString = text2isString "PackageName"
distribution-nixpkgs/src/Distribution/Nixpkgs/License.hs+2−2
@@ -7,7 +7,7 @@
7
7
8module Distribution.Nixpkgs.License ( License(..) ) where
8module Distribution.Nixpkgs.License ( License(..) ) where
9
9
10−import Control.DeepSeq.Generics
10+import Control.DeepSeq
11import Data.Maybe
11import Data.Maybe
12import GHC.Generics ( Generic )
12import GHC.Generics ( Generic )
13import Internal.PrettyPrinting
13import Internal.PrettyPrinting
@@ -44,4 +44,4 @@ instance Pretty License where
44 pPrint (Known x) = text x
44 pPrint (Known x) = text x
45 pPrint (Unknown x) = string (fromMaybe "unknown" x)
45 pPrint (Unknown x) = string (fromMaybe "unknown" x)
46
46
47−instance NFData License where rnf = genericRnf
47+instance NFData License
distribution-nixpkgs/src/Distribution/Nixpkgs/Meta.hs+2−2
@@ -14,7 +14,7 @@ module Distribution.Nixpkgs.Meta
14 , allKnownPlatforms
14 , allKnownPlatforms
15 ) where
15 ) where
16
16
17−import Control.DeepSeq.Generics
17+import Control.DeepSeq
18import Control.Lens
18import Control.Lens
19import Data.Set ( Set )
19import Data.Set ( Set )
20import qualified Data.Set as Set
20import qualified Data.Set as Set
@@ -57,7 +57,7 @@ data Meta = Meta
57
57
58makeLenses ''Meta
58makeLenses ''Meta
59
59
60−instance NFData Meta where rnf = genericRnf
60+instance NFData Meta
61
61
62instance Pretty Meta where
62instance Pretty Meta where
63 pPrint Meta {..} = vcat
63 pPrint Meta {..} = vcat