Get cabal-install building again

Author: lukel97

cabal-install/Distribution/Client/CmdShowBuildInfo.hs

@@ -18,7 +18,7 @@ import Distribution.Client.Setup
          )
 import qualified Distribution.Client.Setup as Client
 import Distribution.Simple.Setup
-         ( HaddockFlags, TestFlags
+         ( HaddockFlags, TestFlags, BenchmarkFlags
          , fromFlagOrDefault
          )
 import Distribution.Simple.Command
@@ -91,14 +91,14 @@ showBuildInfoCommand = CmdInstall.installCommand {
    }
 
 data ShowBuildInfoFlags = ShowBuildInfoFlags
-    { buildInfoInstallCommandFlags :: (ConfigFlags, ConfigExFlags, InstallFlags, HaddockFlags, TestFlags, ClientInstallFlags)
+    { buildInfoInstallCommandFlags :: (ConfigFlags, ConfigExFlags, InstallFlags, HaddockFlags, TestFlags, BenchmarkFlags, ClientInstallFlags)
     , buildInfoOutputFile :: Maybe FilePath
     , buildInfoUnitIds :: Maybe [String]
     }
 
 defaultShowBuildInfoFlags :: ShowBuildInfoFlags
 defaultShowBuildInfoFlags = ShowBuildInfoFlags
-    { buildInfoInstallCommandFlags = (mempty, mempty, mempty, mempty, mempty, mempty)
+    { buildInfoInstallCommandFlags = (mempty, mempty, mempty, mempty, mempty, mempty, mempty)
     , buildInfoOutputFile = Nothing
     , buildInfoUnitIds = Nothing
     }
@@ -111,7 +111,7 @@ defaultShowBuildInfoFlags = ShowBuildInfoFlags
 -- "Distribution.Client.ProjectOrchestration"
 --
 showBuildInfoAction :: ShowBuildInfoFlags -> [String] -> GlobalFlags -> IO ()
-showBuildInfoAction (ShowBuildInfoFlags (configFlags, configExFlags, installFlags, haddockFlags, testFlags, clientInstallFlags) fileOutput unitIds)
+showBuildInfoAction (ShowBuildInfoFlags (configFlags, configExFlags, installFlags, haddockFlags, testFlags, benchmarkFlags, clientInstallFlags) fileOutput unitIds)
   targetStrings globalFlags = do
   baseCtx <- establishProjectBaseContext verbosity cliConfig OtherCommand
   let baseCtx' = baseCtx
@@ -147,6 +147,7 @@ showBuildInfoAction (ShowBuildInfoFlags (configFlags, configExFlags, installFlag
                   installFlags clientInstallFlags
                   haddockFlags
                   testFlags
+                  benchmarkFlags
 
 -- Pretty nasty piecemeal out of json, but I can't see a way to retrieve output of the setupWrapper'd tasks
 showTargets :: Maybe FilePath -> Maybe [String] -> Verbosity -> ProjectBaseContext -> ProjectBuildContext -> Lock -> IO ()

cabal-install/main/Main.hs

@@ -1204,22 +1204,3 @@ manpageAction commands flags extraArgs _ = do
                  else pname
   manpageCmd cabalCmd commands flags
 
---Further commands to support ghc-mod usage
-writeAutogenFilesAction :: WriteAutogenFilesFlags -> [String] -> Action
-writeAutogenFilesAction flags _ globalFlags = do
-  let verbosity = fromFlag (wafVerbosity flags)
-  load <- try (loadConfigOrSandboxConfig verbosity globalFlags)
-  let config = either (\(SomeException _) -> mempty) snd load
-  distPref <- findSavedDistPref config (wafDistPref flags)
-  pkg <- fmap LBI.localPkgDescr (getPersistBuildConfig distPref)
-  eLBI <- tryGetPersistBuildConfig distPref
-  case eLBI of
-    Left err -> case err of
-      -- Note: the build config could have been generated by a custom setup
-      -- script built against a different Cabal version, so it's crucial that
-      -- we ignore the bad version error here.
-      ConfigStateFileBadVersion _ _ _ -> pure ()
-      _                               -> die' verbosity (show err)
-    Right lbi -> do
-      initialBuildSteps distPref pkg lbi verbosity
-      pure ()