0b92a5e · typeable/cabal2nix

git.iko.soy/typeable/cabal2nix

distribution-nixpkgs: Use Control.DeepSeq, not Control.DeepSeq.Generics

commit0b92a5e7309492c8aba7b2c757030cea1c9f2f00 authorMichael Alan Dorman <mdorman@ironicdesign.com> dateSat 28 May 2016, 15:55 (10 years ago) parent259cdff

9 files changed+56−57

compare with master

unifiedsplit

distribution-nixpkgs/distribution-nixpkgs.cabal+2−3

@@ -29,7 +29,7 @@ library

2929 , bytestring

3030 , Cabal >= 1.22.2

3131 , containers

32− , deepseq-generics

32+ , deepseq >= 1.4

3333 , directory

3434 , filepath

3535 , hackage-db

@@ -82,7 +82,7 @@ test-suite spec

8282 , bytestring

8383 , Cabal >= 1.22.2

8484 , containers

85− , deepseq-generics

85+ , deepseq >= 1.4

8686 , directory

8787 , filepath

8888 , hackage-db

@@ -98,7 +98,6 @@ test-suite spec

9898 , unordered-containers

9999 , utf8-string

100100 , yaml

101− , deepseq

102101 , distribution-nixpkgs

103102 , doctest

104103 , hspec

distribution-nixpkgs/package.yaml+2−2

@@ -15,7 +15,7 @@ dependencies:

1515 - bytestring

1616 - Cabal >= 1.22.2

1717 - containers

18− - deepseq-generics

18+ - deepseq >= 1.4

1919 - directory

2020 - filepath

2121 - hackage-db

@@ -61,7 +61,7 @@ tests:

6161 source-dirs:

6262 - test

6363 dependencies:

64− - deepseq

64+ - deepseq >= 1.4

6565 - distribution-nixpkgs

6666 - doctest

6767 - hspec

distribution-nixpkgs/src/Distribution/Nixpkgs/Fetch.hs+4−4

@@ -11,7 +11,7 @@ module Distribution.Nixpkgs.Fetch

1111 ) where

1212

1313import Control.Applicative

14−import Control.DeepSeq.Generics

14+import Control.DeepSeq

1515import Control.Monad

1616import Control.Monad.IO.Class

1717import Control.Monad.Trans.Maybe

@@ -32,12 +32,12 @@ data Source = Source

3232 , sourceHash :: Hash -- ^ The expected hash of the source, if available.

3333 } deriving (Show, Eq, Ord, Generic)

3434

35−instance NFData Source where rnf = genericRnf

35+instance NFData Source

3636

3737data Hash = Certain String | Guess String | UnknownHash

3838 deriving (Show, Eq, Ord, Generic)

3939

40−instance NFData Hash where rnf = genericRnf

40+instance NFData Hash

4141

4242isUnknown :: Hash -> Bool

4343isUnknown UnknownHash = True

@@ -57,7 +57,7 @@ data DerivationSource = DerivationSource

5757 }

5858 deriving (Show, Eq, Ord, Generic)

5959

60−instance NFData DerivationSource where rnf = genericRnf

60+instance NFData DerivationSource

6161

6262instance FromJSON DerivationSource where

6363 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

99 )

1010 where

1111

12−import Control.DeepSeq.Generics

12+import Control.DeepSeq

1313import Data.Set ( Set )

1414import Data.Set.Lens

1515import GHC.Generics ( Generic )

@@ -35,7 +35,7 @@ instance Monoid BuildInfo where

3535 mempty = BuildInfo mempty mempty mempty mempty

3636 BuildInfo w1 x1 y1 z1 `mappend` BuildInfo w2 x2 y2 z2 = BuildInfo (w1 `mappend` w2) (x1 `mappend` x2) (y1 `mappend` y2) (z1 `mappend` z2)

3737

38−instance NFData BuildInfo where rnf = genericRnf

38+instance NFData BuildInfo

3939

4040pPrintBuildInfo :: String -> BuildInfo -> Doc

4141pPrintBuildInfo prefix bi = vcat

distribution-nixpkgs/src/Distribution/Nixpkgs/Haskell/Derivation.hs+2−2

@@ -12,7 +12,7 @@ module Distribution.Nixpkgs.Haskell.Derivation

1212 )

1313 where

1414

15−import Control.DeepSeq.Generics

15+import Control.DeepSeq

1616import Data.List

1717import Data.Set ( Set )

1818import qualified Data.Set as Set

@@ -92,7 +92,7 @@ makeLensesFor [("_libraryDepends", "dependencies"), ("_executableDepends", "depe

9292instance Package Derivation where

9393 packageId = view pkgid

9494

95−instance NFData Derivation where rnf = genericRnf

95+instance NFData Derivation

9696

9797instance Pretty Derivation where

9898 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 @@

88module Distribution.Nixpkgs.Haskell.FromCabal.Configuration ( Configuration(..), readConfiguration, assertConsistency ) where

10−import Control.DeepSeq.Generics

10+import Control.DeepSeq

1111import Control.Lens

1212import Control.Monad

1313import Data.Map as Map

@@ -49,7 +49,7 @@ data Configuration = Configuration

4949 }

5050 deriving (Show, Generic)

5151

52−instance NFData Configuration where rnf = genericRnf

52+instance NFData Configuration

5353

5454instance FromJSON Configuration where

5555 parseJSON (Object o) = Configuration

distribution-nixpkgs/src/Distribution/Nixpkgs/Haskell/OrphanInstances.hs+38−38

@@ -6,7 +6,7 @@

77module Distribution.Nixpkgs.Haskell.OrphanInstances ( ) where

9−import Control.DeepSeq.Generics

9+import Control.DeepSeq

1010import Data.Maybe

1111import Data.String

1212import qualified Data.Text as T

@@ -29,45 +29,45 @@ deriving instance Generic ConfVar

2929deriving instance Generic Flag

3030deriving instance Generic GenericPackageDescription

3131#else

32−instance NFData SetupBuildInfo where rnf = genericRnf

32+instance NFData SetupBuildInfo

3333#endif

3434

35−instance (NFData v, NFData c, NFData a) => NFData (CondTree v c a) where rnf = genericRnf

36−instance NFData Arch where rnf = genericRnf

37−instance NFData Benchmark where rnf = genericRnf

38−instance NFData BenchmarkInterface where rnf = genericRnf

39−instance NFData BenchmarkType where rnf = genericRnf

40−instance NFData BuildInfo where rnf = genericRnf

41−instance NFData BuildType where rnf = genericRnf

42−instance NFData CompilerFlavor where rnf = genericRnf

43−instance NFData ConfVar where rnf = genericRnf

44−instance NFData Dependency where rnf = genericRnf

45−instance NFData Executable where rnf = genericRnf

46−instance NFData Extension where rnf = genericRnf

47−instance NFData Flag where rnf = genericRnf

48−instance NFData FlagName where rnf = genericRnf

49−instance NFData GenericPackageDescription where rnf = genericRnf

50−instance NFData KnownExtension where rnf = genericRnf

51−instance NFData Language where rnf = genericRnf

52−instance NFData Library where rnf = genericRnf

53−instance NFData License where rnf = genericRnf

54−instance NFData ModuleName where rnf = genericRnf

55−instance NFData ModuleReexport where rnf = genericRnf

56−instance NFData ModuleRenaming where rnf = genericRnf

57−instance NFData OS where rnf = genericRnf

58−instance NFData PackageDescription where rnf = genericRnf

59−instance NFData RepoKind where rnf = genericRnf

60−instance NFData RepoType where rnf = genericRnf

61−instance NFData SourceRepo where rnf = genericRnf

62−instance NFData TestSuite where rnf = genericRnf

63−instance NFData TestSuiteInterface where rnf = genericRnf

64−instance NFData TestType where rnf = genericRnf

65−instance NFData VersionRange where rnf = genericRnf

66−instance NFData a => NFData (Condition a) where rnf = genericRnf

67−instance NFData Platform where rnf = genericRnf

68−instance NFData CompilerInfo where rnf = genericRnf

69−instance NFData CompilerId where rnf = genericRnf

70−instance NFData AbiTag where rnf = genericRnf

35+instance (NFData v, NFData c, NFData a) => NFData (CondTree v c a)

36+instance NFData Arch

37+instance NFData Benchmark

38+instance NFData BenchmarkInterface

39+instance NFData BenchmarkType

40+instance NFData BuildInfo

41+instance NFData BuildType

42+instance NFData CompilerFlavor

43+instance NFData ConfVar

44+instance NFData Dependency

45+instance NFData Executable

46+instance NFData Extension

47+instance NFData Flag

48+instance NFData FlagName

49+instance NFData GenericPackageDescription

50+instance NFData KnownExtension

51+instance NFData Language

52+instance NFData Library

53+instance NFData License

54+instance NFData ModuleName

55+instance NFData ModuleReexport

56+instance NFData ModuleRenaming

57+instance NFData OS

58+instance NFData PackageDescription

59+instance NFData RepoKind

60+instance NFData RepoType

61+instance NFData SourceRepo

62+instance NFData TestSuite

63+instance NFData TestSuiteInterface

64+instance NFData TestType

65+instance NFData VersionRange

66+instance NFData a => NFData (Condition a)

67+instance NFData Platform

68+instance NFData CompilerInfo

69+instance NFData CompilerId

70+instance NFData AbiTag

7171

7272instance IsString PackageName where

7373 fromString = text2isString "PackageName"

distribution-nixpkgs/src/Distribution/Nixpkgs/License.hs+2−2

@@ -7,7 +7,7 @@

88module Distribution.Nixpkgs.License ( License(..) ) where

10−import Control.DeepSeq.Generics

10+import Control.DeepSeq

1111import Data.Maybe

1212import GHC.Generics ( Generic )

1313import Internal.PrettyPrinting

@@ -44,4 +44,4 @@ instance Pretty License where

4444 pPrint (Known x) = text x

4545 pPrint (Unknown x) = string (fromMaybe "unknown" x)

4646

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

1414 , allKnownPlatforms

1515 ) where

1616

17−import Control.DeepSeq.Generics

17+import Control.DeepSeq

1818import Control.Lens

1919import Data.Set ( Set )

2020import qualified Data.Set as Set

@@ -57,7 +57,7 @@ data Meta = Meta

5757

5858makeLenses ''Meta

5959

60−instance NFData Meta where rnf = genericRnf

60+instance NFData Meta

6161

6262instance Pretty Meta where

6363 pPrint Meta {..} = vcat