b83e569 · stackage · git.iko.soy

ChangeLog.md+1

compare with master

unifiedsplit

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

1## 0.6.1

2

3* Switch to V2 upload by default

4+* --skip-hoogle option

4

5

5## 0.6.0

6## 0.6.0

6

7

Stackage/CompleteBuild.hs+2

@@ -42,6 +42,7 @@ data BuildFlags = BuildFlags

42 , bfSkipCheck :: !Bool

43 , bfUploadV1 :: !Bool

44 , bfServer :: !StackageServer

45+ , bfBuildHoogle :: !Bool

45 } deriving (Show)

46 } deriving (Show)

46

47

47data BuildType = Nightly | LTS BumpType

48data BuildType = Nightly | LTS BumpType

@@ -221,6 +222,7 @@ getPerformBuild buildFlags Settings {..} = PerformBuild

221 , pbEnableExecDyn = bfEnableExecDyn buildFlags

222 , pbEnableExecDyn = bfEnableExecDyn buildFlags

222 , pbVerbose = bfVerbose buildFlags

223 , pbVerbose = bfVerbose buildFlags

223 , pbAllowNewer = bfSkipCheck buildFlags

224 , pbAllowNewer = bfSkipCheck buildFlags

225+ , pbBuildHoogle = bfBuildHoogle buildFlags

224 }

226 }

225

227

226-- | Make a complete plan, build, test and upload bundle, docs and

228-- | Make a complete plan, build, test and upload bundle, docs and

Stackage/InstallBuild.hs+2

@@ -33,6 +33,7 @@ data InstallFlags = InstallFlags

33 , ifEnableExecDyn :: !Bool

34 , ifVerbose :: !Bool

35 , ifSkipCheck :: !Bool

36+ , ifBuildHoogle :: !Bool

36 } deriving (Show)

37 } deriving (Show)

37

38

38-- | Source for build plan.

39-- | Source for build plan.

@@ -55,6 +56,7 @@ getPerformBuild plan InstallFlags{..} =

55 , pbEnableExecDyn = ifEnableExecDyn

56 , pbEnableExecDyn = ifEnableExecDyn

56 , pbVerbose = ifVerbose

57 , pbVerbose = ifVerbose

57 , pbAllowNewer = ifSkipCheck

58 , pbAllowNewer = ifSkipCheck

59+ , pbBuildHoogle = ifBuildHoogle

58 }

60 }

59

61

60-- | Install stackage from an existing build plan.

62-- | Install stackage from an existing build plan.

Stackage/PerformBuild.hs+11−5

@@ -69,6 +69,10 @@ data PerformBuild = PerformBuild

69 , pbVerbose :: Bool

70 , pbAllowNewer :: Bool

71 -- ^ Pass --allow-newer to cabal configure

72+ , pbBuildHoogle :: Bool

73+ -- ^ Should we build Hoogle database?

74+ --

75+ -- May be disabled due to: https://ghc.haskell.org/trac/ghc/ticket/9921

72 }

76 }

73

77

74data PackageInfo = PackageInfo

78data PackageInfo = PackageInfo

@@ -422,11 +426,13 @@ singleBuild pb@PerformBuild {..} registeredPackages SingleBuild {..} =

422 , "/,"

426 , "/,"

423 , fpToText hf

427 , fpToText hf

424 ]

428 ]

429+ args = ($ hfsOpts) $ execWriter $ do

430+ let tell' x = tell (x:)

425− args = "haddock"

431+ tell' "haddock"

426− : "--hyperlink-source"

432+ tell' "--hyperlink-source"

427− : "--html"

433+ tell' "--html"

434+ when pbBuildHoogle $ tell' "--hoogle"

428− : "--html-location=../$pkg-$version/"

435+ tell' "--html-location=../$pkg-$version/"

429− : hfsOpts

430

436

431 eres <- tryAny $ run "cabal" args

437 eres <- tryAny $ run "cabal" args

432

438

app/stackage.hs+12−2

@@ -116,7 +116,12 @@ main =

116 (long "server-url" <>

117 metavar "SERVER-URL" <>

118 showDefault <> value (T.unpack $ unStackageServer def) <>

119− help "Server to upload bundle to")))

119+ help "Server to upload bundle to"))) <*>

120+ fmap

121+ not

122+ (switch

123+ (long "skip-hoogle" <>

124+ help "Skip generating Hoogle input files"))

120

125

121 nightlyUploadFlags = fromString <$> strArgument

126 nightlyUploadFlags = fromString <$> strArgument

122 (metavar "DATE" <>

127 (metavar "DATE" <>

@@ -178,7 +183,12 @@ main =

178 help "Output verbose detail about the build steps") <*>

183 help "Output verbose detail about the build steps") <*>

179 switch

184 switch

180 (long "skip-check" <>

185 (long "skip-check" <>

181− help "Skip the check phase, and pass --allow-newer to cabal configure")

186+ help "Skip the check phase, and pass --allow-newer to cabal configure") <*>

187+ fmap

188+ not

189+ (switch

190+ (long "skip-hoogle" <>

191+ help "Skip generating Hoogle input files"))

182

192

183 uploadv2 (path, url) = withManager tlsManagerSettings $ \man -> do

193 uploadv2 (path, url) = withManager tlsManagerSettings $ \man -> do

184 token <- getStackageAuthToken

194 token <- getStackageAuthToken