fixes

Author: sheaf

cabal-install/src/Distribution/Client/ProjectPlanning.hs

@@ -4120,40 +4120,40 @@ setupHsHaddockFlags
 setupHsHaddockFlags
   (ElaboratedConfiguredPackage{..})
   (ElaboratedSharedConfig{..})
-  (BuildTimeSettings {buildSettingKeepTempFiles = keepTmpFiles})
+  (BuildTimeSettings{buildSettingKeepTempFiles = keepTmpFiles})
   common =
-  Cabal.HaddockFlags
-    { haddockCommonFlags = common
-    , haddockProgramPaths =
-        case lookupProgram haddockProgram pkgConfigCompilerProgs of
-          Nothing -> mempty
-          Just prg ->
-            [
-              ( programName haddockProgram
-              , locationPath (programLocation prg)
-              )
-            ]
-    , haddockProgramArgs = mempty -- unused, set at configure time
-    , haddockHoogle = toFlag elabHaddockHoogle
-    , haddockHtml = toFlag elabHaddockHtml
-    , haddockHtmlLocation = maybeToFlag elabHaddockHtmlLocation
-    , haddockForHackage = toFlag elabHaddockForHackage
-    , haddockForeignLibs = toFlag elabHaddockForeignLibs
-    , haddockExecutables = toFlag elabHaddockExecutables
-    , haddockTestSuites = toFlag elabHaddockTestSuites
-    , haddockBenchmarks = toFlag elabHaddockBenchmarks
-    , haddockInternal = toFlag elabHaddockInternal
-    , haddockCss = maybeToFlag elabHaddockCss
-    , haddockLinkedSource = toFlag elabHaddockLinkedSource
-    , haddockQuickJump = toFlag elabHaddockQuickJump
-    , haddockHscolourCss = maybeToFlag elabHaddockHscolourCss
-    , haddockContents = maybeToFlag elabHaddockContents
-    , haddockKeepTempFiles = toFlag keepTmpFiles
-    , haddockIndex = maybeToFlag elabHaddockIndex
-    , haddockBaseUrl = maybeToFlag elabHaddockBaseUrl
-    , haddockLib = maybeToFlag elabHaddockLib
-    , haddockOutputDir = maybeToFlag elabHaddockOutputDir
-    }
+    Cabal.HaddockFlags
+      { haddockCommonFlags = common
+      , haddockProgramPaths =
+          case lookupProgram haddockProgram pkgConfigCompilerProgs of
+            Nothing -> mempty
+            Just prg ->
+              [
+                ( programName haddockProgram
+                , locationPath (programLocation prg)
+                )
+              ]
+      , haddockProgramArgs = mempty -- unused, set at configure time
+      , haddockHoogle = toFlag elabHaddockHoogle
+      , haddockHtml = toFlag elabHaddockHtml
+      , haddockHtmlLocation = maybeToFlag elabHaddockHtmlLocation
+      , haddockForHackage = toFlag elabHaddockForHackage
+      , haddockForeignLibs = toFlag elabHaddockForeignLibs
+      , haddockExecutables = toFlag elabHaddockExecutables
+      , haddockTestSuites = toFlag elabHaddockTestSuites
+      , haddockBenchmarks = toFlag elabHaddockBenchmarks
+      , haddockInternal = toFlag elabHaddockInternal
+      , haddockCss = maybeToFlag elabHaddockCss
+      , haddockLinkedSource = toFlag elabHaddockLinkedSource
+      , haddockQuickJump = toFlag elabHaddockQuickJump
+      , haddockHscolourCss = maybeToFlag elabHaddockHscolourCss
+      , haddockContents = maybeToFlag elabHaddockContents
+      , haddockKeepTempFiles = toFlag keepTmpFiles
+      , haddockIndex = maybeToFlag elabHaddockIndex
+      , haddockBaseUrl = maybeToFlag elabHaddockBaseUrl
+      , haddockLib = maybeToFlag elabHaddockLib
+      , haddockOutputDir = maybeToFlag elabHaddockOutputDir
+      }
 
 setupHsHaddockArgs :: ElaboratedConfiguredPackage -> [String]
 -- TODO: Does the issue #3335 affects test as well

cabal-install/src/Distribution/Client/SourceFiles.hs

@@ -82,9 +82,8 @@ needComponent pkg_descr comp =
 
 needSetup :: Rebuild ()
 needSetup = do
-  findFirstFileMonitored id ["Setup.hs", "Setup.lhs"]
-  findFirstFileMonitored id ["SetupHooks.hs", "SetupHooks.lhs"]
-  return ()
+  void $ findFirstFileMonitored id ["Setup.hs", "Setup.lhs"]
+  void $ findFirstFileMonitored id ["SetupHooks.hs", "SetupHooks.lhs"]
 
 needLibrary :: PackageDescription -> Library -> Rebuild ()
 needLibrary

cabal-testsuite/PackageTests/BuildToolPaths/cabal.project

@@ -1,3 +1,3 @@
 packages:
   bt,
-  pbts
+  pbts