git.iko.soy/typeable/stackage2nix
on master help sign in
Rm flags to check/haddock stackage
commit558ab8b2e7c751329f4b814d559a6c530c2d6833 authorDmitry Bushev <bushevdv@gmail.com> dateMon 1 Jan 2018, 23:32 (9 years ago) parent2aa69ef
4 files changed+14−32
compare with master
unifiedsplit
src/Distribution/Nixpkgs/Haskell/Stack.hs+9−11 src/Runner.hs+3−5 src/Runner/Cli.hs+1−15 stackage2nix.cabal+1−1
src/Distribution/Nixpkgs/Haskell/Stack.hs+9−11
@@ -25,15 +25,13 @@ unHackageDb :: HackageDb -> String
2525unHackageDb = T.unpack . fromHackageDB
2626
2727data StackPackagesConfig = StackPackagesConfig
28− { _spcHaskellResolver :: !HaskellResolver
29− , _spcNixpkgsResolver :: !NixpkgsResolver
30− , _spcTargetPlatform :: !Platform
31− , _spcTargetCompiler :: !CompilerInfo
32− , _spcFlagAssignment :: !FlagAssignment
33− , _spcDoCheckPackages :: !Bool
34− , _spcDoHaddockPackages :: !Bool
35− , _spcDoCheckStackage :: !Bool
36− , _spcDoHaddockStackage :: !Bool
28+ { _spcHaskellResolver :: HaskellResolver
29+ , _spcNixpkgsResolver :: NixpkgsResolver
30+ , _spcTargetPlatform :: Platform
31+ , _spcTargetCompiler :: CompilerInfo
32+ , _spcFlagAssignment :: FlagAssignment
33+ , _spcDoCheckPackages :: Bool
34+ , _spcDoHaddockPackages :: Bool
3735 }
3836
3937makeLenses ''StackPackagesConfig
@@ -96,8 +94,8 @@ packageDerivation conf optHackageDb stackPackage = do
9694 & subpath %~ flip fromMaybe (stackPackage ^. spDir)
9795 isExtraDep = stackPackage ^. spExtraDep
9896 pconf = PackageConfig
99− { enableCheck = if isExtraDep then conf ^. spcDoCheckStackage else conf ^. spcDoCheckPackages
100− , enableHaddock = if isExtraDep then conf ^. spcDoHaddockStackage else conf ^. spcDoHaddockPackages }
97+ { enableCheck = isExtraDep || conf ^. spcDoCheckPackages
98+ , enableHaddock = isExtraDep || conf ^. spcDoHaddockPackages }
10199 return $ finalizePackage pkg pconf drv
102100
103101genericPackageDerivation
src/Runner.hs+3−5
@@ -55,8 +55,8 @@ run = do
5555 else packageLoader packageSetConfig mHash pkgId
5656 s2nPackageSetConfig = packageSetConfig { packageLoader = s2nLoader }
5757 s2nPackageConfig = PackageConfig
58− { enableCheck = opts ^. optDoCheckStackage
59− , enableHaddock = opts ^. optDoHaddockStackage }
58+ { enableCheck = True
59+ , enableHaddock = True }
6060 stackagePackages <- traverse (uncurry (buildNode s2nPackageSetConfig s2nPackageConfig))
6161 $ Map.toAscList (bpPackages buildPlan)
6262 let
@@ -130,6 +130,4 @@ mkStackPackagesConfig opts = StackPackagesConfig
130130 , _spcTargetCompiler = unknownCompilerInfo (opts ^. optCompilerId) NoAbiTag
131131 , _spcFlagAssignment = []
132132 , _spcDoCheckPackages = opts ^. optDoCheckPackages
133− , _spcDoHaddockPackages = opts ^. optDoHaddockPackages
134− , _spcDoCheckStackage = opts ^. optDoCheckStackage
135− , _spcDoHaddockStackage = opts ^. optDoHaddockStackage }
133+ , _spcDoHaddockPackages = opts ^. optDoHaddockPackages }
src/Runner/Cli.hs+1−15
@@ -34,9 +34,7 @@ data Options = Options
3434 , _optOutDerivation :: FilePath
3535 , _optDoCheckPackages :: Bool
3636 , _optDoHaddockPackages :: Bool
37− , _optDoCheckStackage :: Bool
38− , _optDoHaddockStackage :: Bool
39− , _optHackageDb :: (Maybe HackageDb)
37+ , _optHackageDb :: Maybe HackageDb
4038 , _optNixpkgsRepository :: FilePath
4139 , _optCompilerId :: CompilerId
4240 , _optPlatform :: Platform
@@ -65,8 +63,6 @@ options = Options
6563 <*> outDerivation
6664 <*> doCheckPackages
6765 <*> doHaddockPackages
68− <*> doCheckStackage
69− <*> doHaddockStackage
7066 <*> optional hackageDb
7167 <*> nixpkgsRepository
7268 <*> compilerId
@@ -140,16 +136,6 @@ doHaddockPackages = flag True False
140136 ( long "no-haddock"
141137 <> help "disable haddock for project packages")
142138
143−doCheckStackage :: Parser Bool
144−doCheckStackage = switch
145− ( long "do-check-stackage"
146− <> help "enable tests for Stackage packages" )
147−
148−doHaddockStackage :: Parser Bool
149−doHaddockStackage = switch
150− ( long "do-haddock-stackage"
151− <> help "enable haddock for Stackage packages" )
152−
153139resolver :: Parser StackResolver
154140resolver = StackResolver <$> option text
155141 ( long "resolver"
stackage2nix.cabal+1−1
@@ -59,7 +59,7 @@ library
5959 , RecordWildCards
6060 , TemplateHaskell
6161 default-language: Haskell2010
62− ghc-options: -Wall -funbox-strict-fields
62+ ghc-options: -Wall
6363
6464executable stackage2nix
6565 hs-source-dirs: stackage2nix