558ab8b · typeable/stackage2nix

src/Distribution/Nixpkgs/Haskell/Stack.hs+9−11

compare with master

unifiedsplit

@@ -25,15 +25,13 @@ unHackageDb :: HackageDb -> String

25unHackageDb = T.unpack . fromHackageDB

26

27data StackPackagesConfig = StackPackagesConfig

28− { _spcHaskellResolver :: !HaskellResolver

28+ { _spcHaskellResolver :: HaskellResolver

29− , _spcNixpkgsResolver :: !NixpkgsResolver

29+ , _spcNixpkgsResolver :: NixpkgsResolver

30− , _spcTargetPlatform :: !Platform

30+ , _spcTargetPlatform :: Platform

31− , _spcTargetCompiler :: !CompilerInfo

31+ , _spcTargetCompiler :: CompilerInfo

32− , _spcFlagAssignment :: !FlagAssignment

32+ , _spcFlagAssignment :: FlagAssignment

33− , _spcDoCheckPackages :: !Bool

33+ , _spcDoCheckPackages :: Bool

34− , _spcDoHaddockPackages :: !Bool

34+ , _spcDoHaddockPackages :: Bool

35− , _spcDoCheckStackage :: !Bool

36− , _spcDoHaddockStackage :: !Bool

37 }

35 }

38

36

39makeLenses ''StackPackagesConfig

37makeLenses ''StackPackagesConfig

@@ -96,8 +94,8 @@ packageDerivation conf optHackageDb stackPackage = do

96 & subpath %~ flip fromMaybe (stackPackage ^. spDir)

94 & subpath %~ flip fromMaybe (stackPackage ^. spDir)

97 isExtraDep = stackPackage ^. spExtraDep

95 isExtraDep = stackPackage ^. spExtraDep

98 pconf = PackageConfig

96 pconf = PackageConfig

99− { enableCheck = if isExtraDep then conf ^. spcDoCheckStackage else conf ^. spcDoCheckPackages

97+ { enableCheck = isExtraDep || conf ^. spcDoCheckPackages

100− , enableHaddock = if isExtraDep then conf ^. spcDoHaddockStackage else conf ^. spcDoHaddockPackages }

98+ , enableHaddock = isExtraDep || conf ^. spcDoHaddockPackages }

101 return $ finalizePackage pkg pconf drv

99 return $ finalizePackage pkg pconf drv

102

100

103genericPackageDerivation

101genericPackageDerivation

src/Runner.hs+3−5

@@ -55,8 +55,8 @@ run = do

55 else packageLoader packageSetConfig mHash pkgId

56 s2nPackageSetConfig = packageSetConfig { packageLoader = s2nLoader }

57 s2nPackageConfig = PackageConfig

58− { enableCheck = opts ^. optDoCheckStackage

58+ { enableCheck = True

59− , enableHaddock = opts ^. optDoHaddockStackage }

59+ , enableHaddock = True }

60 stackagePackages <- traverse (uncurry (buildNode s2nPackageSetConfig s2nPackageConfig))

61 $ Map.toAscList (bpPackages buildPlan)

62 let

@@ -130,6 +130,4 @@ mkStackPackagesConfig opts = StackPackagesConfig

130 , _spcTargetCompiler = unknownCompilerInfo (opts ^. optCompilerId) NoAbiTag

131 , _spcFlagAssignment = []

132 , _spcDoCheckPackages = opts ^. optDoCheckPackages

133− , _spcDoHaddockPackages = opts ^. optDoHaddockPackages

133+ , _spcDoHaddockPackages = opts ^. optDoHaddockPackages }

134− , _spcDoCheckStackage = opts ^. optDoCheckStackage

135− , _spcDoHaddockStackage = opts ^. optDoHaddockStackage }

src/Runner/Cli.hs+1−15

@@ -34,9 +34,7 @@ data Options = Options

34 , _optOutDerivation :: FilePath

35 , _optDoCheckPackages :: Bool

36 , _optDoHaddockPackages :: Bool

37− , _optDoCheckStackage :: Bool

38− , _optDoHaddockStackage :: Bool

39− , _optHackageDb :: (Maybe HackageDb)

37+ , _optHackageDb :: Maybe HackageDb

40 , _optNixpkgsRepository :: FilePath

38 , _optNixpkgsRepository :: FilePath

41 , _optCompilerId :: CompilerId

39 , _optCompilerId :: CompilerId

42 , _optPlatform :: Platform

40 , _optPlatform :: Platform

@@ -65,8 +63,6 @@ options = Options

65 <*> outDerivation

63 <*> outDerivation

66 <*> doCheckPackages

64 <*> doCheckPackages

67 <*> doHaddockPackages

65 <*> doHaddockPackages

68− <*> doCheckStackage

69− <*> doHaddockStackage

70 <*> optional hackageDb

66 <*> optional hackageDb

71 <*> nixpkgsRepository

67 <*> nixpkgsRepository

72 <*> compilerId

68 <*> compilerId

@@ -140,16 +136,6 @@ doHaddockPackages = flag True False

140 ( long "no-haddock"

136 ( long "no-haddock"

141 <> help "disable haddock for project packages")

137 <> help "disable haddock for project packages")

142

138

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−

153resolver :: Parser StackResolver

139resolver :: Parser StackResolver

154resolver = StackResolver <$> option text

140resolver = StackResolver <$> option text

155 ( long "resolver"

141 ( long "resolver"

stackage2nix.cabal+1−1

@@ -59,7 +59,7 @@ library

59 , RecordWildCards

60 , TemplateHaskell

61 default-language: Haskell2010

62− ghc-options: -Wall -funbox-strict-fields

62+ ghc-options: -Wall

63

64executable stackage2nix

65 hs-source-dirs: stackage2nix