git.iko.soy/typeable/stackage2nix
on master help sign in
Upd: strict fields
commitf4e8eecc8b718bbb4161743579f86dd4bbc4f59d authorDmitry Bushev <bushevdv@gmail.com> dateFri 2 Jun 2017, 00:33 (9 years ago) parent34abc9e
6 files changed+28−28
compare with master
unifiedsplit
src/Distribution/Nixpkgs/Haskell/Stack.hs+5−5 src/Distribution/Nixpkgs/Haskell/Stack/PrettyPrinting.hs+3−3 src/Runner/Cli.hs+6−6 src/Stack/Config.hs+6−6 src/Stack/Config/Yaml.hs+7−7 stack2nix.cabal+1−1
src/Distribution/Nixpkgs/Haskell/Stack.hs+5−5
@@ -28,11 +28,11 @@ unHackageDb :: HackageDb -> String
2828unHackageDb = T.unpack . fromHackageDB
2929
3030data PackageConfig = PackageConfig
31− { _pcHaskellResolver :: HaskellResolver
32− , _pcNixpkgsResolver :: NixpkgsResolver
33− , _pcTargetPlatform :: Platform
34− , _pcTargetCompiler :: CompilerInfo
35− , _pcFlagAssignment :: FlagAssignment
31+ { _pcHaskellResolver :: !HaskellResolver
32+ , _pcNixpkgsResolver :: !NixpkgsResolver
33+ , _pcTargetPlatform :: !Platform
34+ , _pcTargetCompiler :: !CompilerInfo
35+ , _pcFlagAssignment :: !FlagAssignment
3636 }
3737
3838makeLenses ''PackageConfig
src/Distribution/Nixpkgs/Haskell/Stack/PrettyPrinting.hs+3−3
@@ -15,9 +15,9 @@ import qualified Language.Nix.FilePath as Nix
1515import Language.Nix.PrettyPrinting as PP
1616
1717data OverrideConfig = OverrideConfig
18− { _ocGhc :: String
19− , _ocStackagePackages :: Maybe FilePath
20− , _ocStackageConfig :: Maybe FilePath }
18+ { _ocGhc :: !String
19+ , _ocStackagePackages :: !(Maybe FilePath)
20+ , _ocStackageConfig :: !(Maybe FilePath) }
2121
2222makeLenses ''OverrideConfig
2323
src/Runner/Cli.hs+6−6
@@ -26,12 +26,12 @@ newtype StackageConfig = StackageConfig { unStackageConfig :: FilePath }
2626makePrisms ''StackageConfig
2727
2828data Options = Options
29− { _optHackageDb :: Maybe HackageDb
30− , _optStackagePackages :: Maybe StackagePackages
31− , _optStackageConfig :: Maybe StackageConfig
32− , _optCompilerId :: CompilerId
33− , _optPlatform :: Platform
34− , _optStackYaml :: FilePath
29+ { _optHackageDb :: !(Maybe HackageDb)
30+ , _optStackagePackages :: !(Maybe StackagePackages)
31+ , _optStackageConfig :: !(Maybe StackageConfig)
32+ , _optCompilerId :: !CompilerId
33+ , _optPlatform :: !Platform
34+ , _optStackYaml :: !FilePath
3535 } deriving (Show)
3636
3737makeLenses ''Options
src/Stack/Config.hs+6−6
@@ -24,8 +24,8 @@ unStackResolver :: StackResolver -> String
2424unStackResolver = T.unpack . fromStackResolver
2525
2626data RepoGit = RepoGit
27− { _rgUri :: Text
28− , _rgCommit :: Text
27+ { _rgUri :: !Text
28+ , _rgCommit :: !Text
2929 } deriving (Eq, Ord, Show)
3030
3131makeLenses ''RepoGit
@@ -40,15 +40,15 @@ data PackageLocation
4040makePrisms ''PackageLocation
4141
4242data StackPackage = StackPackage
43− { _spLocation :: PackageLocation
44− , _spExtraDep :: Bool
43+ { _spLocation :: !PackageLocation
44+ , _spExtraDep :: !Bool
4545 } deriving (Eq, Ord, Show)
4646
4747makeLenses ''StackPackage
4848
4949data StackConfig = StackConfig
50− { _scResolver :: StackResolver
51− , _scPackages :: [StackPackage]
50+ { _scResolver :: !StackResolver
51+ , _scPackages :: ![StackPackage]
5252 } deriving (Eq, Ord, Show)
5353
5454makeLenses ''StackConfig
src/Stack/Config/Yaml.hs+7−7
@@ -12,8 +12,8 @@ import Data.Text as T
1212import Stack.Config.TH
1313
1414data Location a = Location
15− { _lLocation :: a
16− , _lExtraDep :: Maybe Bool
15+ { _lLocation :: !a
16+ , _lExtraDep :: !(Maybe Bool)
1717 } deriving (Eq, Show)
1818
1919makeLenses ''Location
@@ -21,8 +21,8 @@ makeLenses ''Location
2121deriveJSON jsonOpts ''Location
2222
2323data Git = Git
24− { _gGit :: Text
25− , _gCommit :: Text
24+ { _gGit :: !Text
25+ , _gCommit :: !Text
2626 } deriving (Eq, Show)
2727
2828makeLenses ''Git
@@ -50,9 +50,9 @@ instance ToJSON Package where
5050 LocationGit t -> toJSON t
5151
5252data Config = Config
53− { _cResolver :: Text
54− , _cPackages :: Maybe [Package]
55− , _cExtraDeps :: Maybe [Text]
53+ { _cResolver :: !Text
54+ , _cPackages :: !(Maybe [Package])
55+ , _cExtraDeps :: !(Maybe [Text])
5656 } deriving (Eq, Show)
5757
5858makeLenses ''Config
stack2nix.cabal+1−1
@@ -41,7 +41,7 @@ library
4141 , text
4242 , yaml
4343 default-language: Haskell2010
44− ghc-options: -Wall
44+ ghc-options: -Wall -funbox-strict-fields
4545
4646executable stack2nix
4747 hs-source-dirs: app