diff --git a/Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs b/Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs index 025440c3598..7daee1b53f8 100644 --- a/Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs +++ b/Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs @@ -34,4 +34,4 @@ md5CheckGenericPackageDescription proxy = md5Check proxy md5CheckLocalBuildInfo :: Proxy LocalBuildInfo -> Assertion md5CheckLocalBuildInfo proxy = md5Check proxy - 0x93b7e8ebb5b9f879fa5fe49b1708b43b + 0x8fa7b2c8cc611407bfdcb734ecb460a2 diff --git a/Cabal/src/Distribution/Simple/Haddock.hs b/Cabal/src/Distribution/Simple/Haddock.hs index ba025a85549..7d20c412512 100644 --- a/Cabal/src/Distribution/Simple/Haddock.hs +++ b/Cabal/src/Distribution/Simple/Haddock.hs @@ -67,12 +67,9 @@ import Distribution.Simple.Program.GHC import qualified Distribution.Simple.Program.HcPkg as HcPkg import Distribution.Simple.Program.ResponseFile import Distribution.Simple.Register -import Distribution.Simple.Setup.Common -import Distribution.Simple.Setup.Haddock -import Distribution.Simple.Setup.Hscolour +import Distribution.Simple.Setup import Distribution.Simple.SetupHooks.Internal ( BuildHooks (..) - , BuildingWhat (..) , noBuildHooks ) import qualified Distribution.Simple.SetupHooks.Internal as SetupHooks @@ -265,6 +262,7 @@ haddock_setupHooks mbWorkDir = flagToMaybe $ haddockWorkingDir flags comp = compiler lbi platform = hostPlatform lbi + config = configFlags lbi quickJmpFlag = haddockQuickJump flags' flags = case haddockTarget of @@ -282,9 +280,7 @@ haddock_setupHooks flag f = fromFlag $ f flags tmpFileOpts = - defaultTempFileOptions - { optKeepTempFiles = flag haddockKeepTempFiles - } + commonSetupTempFileOptions $ configCommonFlags config htmlTemplate = fmap toPathTemplate . flagToMaybe . haddockHtmlLocation $ flags @@ -553,9 +549,11 @@ createHaddockIndex -> IO () createHaddockIndex verbosity programDb comp platform mbWorkDir flags = do let args = fromHaddockProjectFlags flags + tmpFileOpts = + commonSetupTempFileOptions $ haddockProjectCommonFlags $ flags (haddockProg, _version) <- getHaddockProg verbosity programDb comp args (Flag True) - runHaddock verbosity mbWorkDir defaultTempFileOptions comp platform haddockProg False args + runHaddock verbosity mbWorkDir tmpFileOpts comp platform haddockProg False args -- ------------------------------------------------------------------------------ -- Contributions to HaddockArgs (see also Doctest.hs for very similar code). diff --git a/Cabal/src/Distribution/Simple/Setup.hs b/Cabal/src/Distribution/Simple/Setup.hs index dfde4466b30..691a0ba5901 100644 --- a/Cabal/src/Distribution/Simple/Setup.hs +++ b/Cabal/src/Distribution/Simple/Setup.hs @@ -41,6 +41,7 @@ module Distribution.Simple.Setup , globalCommand , CommonSetupFlags (..) , defaultCommonSetupFlags + , commonSetupTempFileOptions , ConfigFlags (..) , emptyConfigFlags , defaultConfigFlags diff --git a/Cabal/src/Distribution/Simple/Setup/Common.hs b/Cabal/src/Distribution/Simple/Setup/Common.hs index 0a1422b327f..9ea4297fad8 100644 --- a/Cabal/src/Distribution/Simple/Setup/Common.hs +++ b/Cabal/src/Distribution/Simple/Setup/Common.hs @@ -23,6 +23,7 @@ module Distribution.Simple.Setup.Common ( CommonSetupFlags (..) , defaultCommonSetupFlags , withCommonSetupOptions + , commonSetupTempFileOptions , CopyDest (..) , configureCCompiler , configureLinker @@ -85,6 +86,13 @@ data CommonSetupFlags = CommonSetupFlags -- -- TODO: this one should not be here, it's just that the silly -- UserHooks stop us from passing extra info in other ways + , setupKeepTempFiles :: Flag Bool + -- ^ When this flag is set, temporary files will be kept after building. + -- + -- Note: Keeping temporary files is important functionality for HLS, which + -- runs @cabal repl@ with a fake GHC to get CLI arguments. It will need the + -- temporary files (including multi unit repl response files) to stay, even + -- after the @cabal repl@ command exits. } deriving (Eq, Show, Read, Generic) @@ -106,6 +114,15 @@ defaultCommonSetupFlags = , setupDistPref = NoFlag , setupCabalFilePath = NoFlag , setupTargets = [] + , setupKeepTempFiles = NoFlag + } + +-- | Get `TempFileOptions` that respect the `setupKeepTempFiles` flag. +commonSetupTempFileOptions :: CommonSetupFlags -> TempFileOptions +commonSetupTempFileOptions options = + TempFileOptions + { optKeepTempFiles = + fromFlagOrDefault False (setupKeepTempFiles options) } commonSetupOptions :: ShowOrParseArgs -> [OptionField CommonSetupFlags] @@ -124,6 +141,14 @@ commonSetupOptions showOrParseArgs = setupCabalFilePath (\v flags -> flags{setupCabalFilePath = v}) (reqSymbolicPathArgFlag "PATH") + , option + "" + ["keep-temp-files"] + ( "Keep temporary files." + ) + setupKeepTempFiles + (\keepTempFiles flags -> flags{setupKeepTempFiles = keepTempFiles}) + trueArg -- NB: no --working-dir flag, as that value is populated using the -- global flag (see Distribution.Simple.Setup.Global.globalCommand). ] diff --git a/Cabal/src/Distribution/Simple/Setup/Haddock.hs b/Cabal/src/Distribution/Simple/Setup/Haddock.hs index 7e8df14cfa1..6f0459b7311 100644 --- a/Cabal/src/Distribution/Simple/Setup/Haddock.hs +++ b/Cabal/src/Distribution/Simple/Setup/Haddock.hs @@ -111,7 +111,6 @@ data HaddockFlags = HaddockFlags , haddockHscolourCss :: Flag FilePath , haddockContents :: Flag PathTemplate , haddockIndex :: Flag PathTemplate - , haddockKeepTempFiles :: Flag Bool , haddockBaseUrl :: Flag String , haddockResourcesDir :: Flag String , haddockOutputDir :: Flag FilePath @@ -166,7 +165,6 @@ defaultHaddockFlags = , haddockQuickJump = Flag False , haddockHscolourCss = NoFlag , haddockContents = NoFlag - , haddockKeepTempFiles = Flag False , haddockIndex = NoFlag , haddockBaseUrl = NoFlag , haddockResourcesDir = NoFlag @@ -219,13 +217,6 @@ haddockOptions showOrParseArgs = (\c f -> f{haddockCommonFlags = c}) showOrParseArgs [ option - "" - ["keep-temp-files"] - "Keep temporary files" - haddockKeepTempFiles - (\b flags -> flags{haddockKeepTempFiles = b}) - trueArg - , option "" ["hoogle"] "Generate a hoogle database" @@ -447,9 +438,7 @@ data HaddockProjectFlags = HaddockProjectFlags , -- haddockContent is not supported, a fixed value is provided -- haddockIndex is not supported, a fixed value is provided -- haddockDistPerf is not supported, note: it changes location of the haddocks - haddockProjectKeepTempFiles :: Flag Bool - , haddockProjectVerbosity :: Flag Verbosity - , -- haddockBaseUrl is not supported, a fixed value is provided + -- haddockBaseUrl is not supported, a fixed value is provided haddockProjectResourcesDir :: Flag String , haddockProjectUseUnicode :: Flag Bool } @@ -473,8 +462,6 @@ defaultHaddockProjectFlags = , haddockProjectInternal = Flag False , haddockProjectCss = NoFlag , haddockProjectHscolourCss = NoFlag - , haddockProjectKeepTempFiles = Flag False - , haddockProjectVerbosity = Flag normal , haddockProjectResourcesDir = NoFlag , haddockProjectInterfaces = NoFlag , haddockProjectUseUnicode = NoFlag @@ -632,13 +619,6 @@ haddockProjectOptions showOrParseArgs = haddockProjectHscolourCss (\v flags -> flags{haddockProjectHscolourCss = v}) (reqArgFlag "PATH") - , option - "" - ["keep-temp-files"] - "Keep temporary files" - haddockProjectKeepTempFiles - (\b flags -> flags{haddockProjectKeepTempFiles = b}) - trueArg , option "" ["resources-dir"] diff --git a/cabal-install/src/Distribution/Client/CmdHaddockProject.hs b/cabal-install/src/Distribution/Client/CmdHaddockProject.hs index ca8330b3b8d..0635a77d68e 100644 --- a/cabal-install/src/Distribution/Client/CmdHaddockProject.hs +++ b/cabal-install/src/Distribution/Client/CmdHaddockProject.hs @@ -391,7 +391,6 @@ haddockProjectAction flags _extraArgs globalFlags = do if localStyle then Flag (toPathTemplate "../doc-index.html") else NoFlag - , haddockKeepTempFiles = haddockProjectKeepTempFiles flags , haddockResourcesDir = haddockProjectResourcesDir flags , haddockUseUnicode = haddockProjectUseUnicode flags -- NOTE: we don't pass `haddockOutputDir`. If we do, we'll need to diff --git a/cabal-install/src/Distribution/Client/CmdRepl.hs b/cabal-install/src/Distribution/Client/CmdRepl.hs index e381b291d7d..f762c3d72bf 100644 --- a/cabal-install/src/Distribution/Client/CmdRepl.hs +++ b/cabal-install/src/Distribution/Client/CmdRepl.hs @@ -103,11 +103,11 @@ import Distribution.Simple.Compiler ) import Distribution.Simple.Setup ( ReplOptions (..) + , commonSetupTempFileOptions , setupVerbosity ) import Distribution.Simple.Utils - ( TempFileOptions (..) - , debugNoWrap + ( debugNoWrap , dieWithException , withTempDirectoryEx , wrapText @@ -411,7 +411,7 @@ replAction flags@NixStyleFlags{extraFlags = r@ReplFlags{..}, ..} targetStrings g -- Multi Repl implemention see: https://well-typed.com/blog/2023/03/cabal-multi-unit/ for -- a high-level overview about how everything fits together. if Set.size (distinctTargetComponents targets) > 1 - then withTempDirectoryEx verbosity (TempFileOptions keepTempFiles) distDir "multi-out" $ \dir' -> do + then withTempDirectoryEx verbosity tempFileOptions distDir "multi-out" $ \dir' -> do -- multi target repl dir <- makeAbsolute dir' -- Modify the replOptions so that the ./Setup repl command will write options @@ -507,7 +507,7 @@ replAction flags@NixStyleFlags{extraFlags = r@ReplFlags{..}, ..} targetStrings g go m _ = m verbosity = fromFlagOrDefault normal (setupVerbosity $ configCommonFlags configFlags) - keepTempFiles = fromFlagOrDefault False replKeepTempFiles + tempFileOptions = commonSetupTempFileOptions $ configCommonFlags configFlags validatedTargets ctx compiler elaboratedPlan targetSelectors = do let multi_repl_enabled = multiReplDecision ctx compiler r diff --git a/cabal-install/src/Distribution/Client/Config.hs b/cabal-install/src/Distribution/Client/Config.hs index 1af7d59fb10..41c2f7fb15d 100644 --- a/cabal-install/src/Distribution/Client/Config.hs +++ b/cabal-install/src/Distribution/Client/Config.hs @@ -469,6 +469,7 @@ instance Semigroup SavedConfig where , setupCabalFilePath = combine setupCabalFilePath , setupVerbosity = combine setupVerbosity , setupTargets = lastNonEmpty setupTargets + , setupKeepTempFiles = combine setupKeepTempFiles } where lastNonEmpty = lastNonEmpty' which @@ -629,7 +630,6 @@ instance Semigroup SavedConfig where , haddockQuickJump = combine haddockQuickJump , haddockHscolourCss = combine haddockHscolourCss , haddockContents = combine haddockContents - , haddockKeepTempFiles = combine haddockKeepTempFiles , haddockIndex = combine haddockIndex , haddockBaseUrl = combine haddockBaseUrl , haddockResourcesDir = combine haddockResourcesDir diff --git a/cabal-install/src/Distribution/Client/ProjectBuilding/UnpackedPackage.hs b/cabal-install/src/Distribution/Client/ProjectBuilding/UnpackedPackage.hs index 9e3b91d1753..1d2a86bea46 100644 --- a/cabal-install/src/Distribution/Client/ProjectBuilding/UnpackedPackage.hs +++ b/cabal-install/src/Distribution/Client/ProjectBuilding/UnpackedPackage.hs @@ -173,7 +173,7 @@ buildAndRegisterUnpackedPackage verbosity distDirLayout@DistDirLayout{distTempDirectory} maybe_semaphore - buildTimeSettings@BuildTimeSettings{buildSettingNumJobs} + buildTimeSettings@BuildTimeSettings{buildSettingNumJobs, buildSettingKeepTempFiles} registerLock cacheLock pkgshared@ElaboratedSharedConfig @@ -276,7 +276,7 @@ buildAndRegisterUnpackedPackage | otherwise = return () mbWorkDir = useWorkingDir scriptOptions - commonFlags = setupHsCommonFlags verbosity mbWorkDir builddir + commonFlags = setupHsCommonFlags verbosity mbWorkDir builddir buildSettingKeepTempFiles configureCommand = Cabal.configureCommand defaultProgramDb configureFlags v = diff --git a/cabal-install/src/Distribution/Client/ProjectConfig/Legacy.hs b/cabal-install/src/Distribution/Client/ProjectConfig/Legacy.hs index 1a2e202be5e..7354e5e9cb3 100644 --- a/cabal-install/src/Distribution/Client/ProjectConfig/Legacy.hs +++ b/cabal-install/src/Distribution/Client/ProjectConfig/Legacy.hs @@ -861,9 +861,9 @@ convertLegacyBuildOnlyFlags configFlags installFlags clientInstallFlags - haddockFlags - _ - _ = + _haddockFlags + _testFlags + _benchmarkFlags = ProjectConfigBuildOnly{..} where projectConfigClientInstallFlags = clientInstallFlags @@ -880,6 +880,7 @@ convertLegacyBuildOnlyFlags CommonSetupFlags { setupVerbosity = projectConfigVerbosity + , setupKeepTempFiles = projectConfigKeepTempFiles } = commonFlags InstallFlags @@ -899,10 +900,6 @@ convertLegacyBuildOnlyFlags , installOfflineMode = projectConfigOfflineMode } = installFlags - HaddockFlags - { haddockKeepTempFiles = projectConfigKeepTempFiles -- TODO: this ought to live elsewhere - } = haddockFlags - convertToLegacyProjectConfig :: ProjectConfig -> LegacyProjectConfig convertToLegacyProjectConfig projectConfig@ProjectConfig @@ -975,6 +972,7 @@ convertToLegacySharedConfig mempty { setupVerbosity = projectConfigVerbosity , setupDistPref = fmap makeSymbolicPath $ projectConfigDistDir + , setupKeepTempFiles = projectConfigKeepTempFiles } configFlags = @@ -1047,8 +1045,7 @@ convertToLegacySharedConfig convertToLegacyAllPackageConfig :: ProjectConfig -> LegacyPackageConfig convertToLegacyAllPackageConfig ProjectConfig - { projectConfigBuildOnly = ProjectConfigBuildOnly{..} - , projectConfigShared = ProjectConfigShared{..} + { projectConfigShared = ProjectConfigShared{..} } = LegacyPackageConfig { legacyConfigureFlags = configFlags @@ -1124,8 +1121,6 @@ convertToLegacyAllPackageConfig haddockFlags = mempty - { haddockKeepTempFiles = projectConfigKeepTempFiles - } convertToLegacyPerPackageConfig :: PackageConfig -> LegacyPackageConfig convertToLegacyPerPackageConfig PackageConfig{..} = @@ -1225,7 +1220,6 @@ convertToLegacyPerPackageConfig PackageConfig{..} = , haddockQuickJump = packageConfigHaddockQuickJump , haddockHscolourCss = packageConfigHaddockHscolourCss , haddockContents = packageConfigHaddockContents - , haddockKeepTempFiles = mempty , haddockIndex = packageConfigHaddockIndex , haddockBaseUrl = packageConfigHaddockBaseUrl , haddockResourcesDir = packageConfigHaddockResourcesDir @@ -1408,7 +1402,8 @@ legacySharedConfigFieldDescrs constraintSrc = configPackageDBs (\v conf -> conf{configPackageDBs = v}) ] - . filterFields (["verbose", "builddir"] ++ map optionName installDirsOptions) + . aliasField "keep-temp-files" "haddock-keep-temp-files" + . filterFields (["verbose", "builddir", "keep-temp-files"] ++ map optionName installDirsOptions) . commandOptionsToFields $ configureOptions ParseArgs , liftFields @@ -1630,7 +1625,6 @@ legacyPackageConfigFieldDescrs = , "hscolour-css" , "contents-location" , "index-location" - , "keep-temp-files" , "base-url" , "resources-dir" , "output-dir" diff --git a/cabal-install/src/Distribution/Client/ProjectOrchestration.hs b/cabal-install/src/Distribution/Client/ProjectOrchestration.hs index 77573944a19..fef9f6efde4 100644 --- a/cabal-install/src/Distribution/Client/ProjectOrchestration.hs +++ b/cabal-install/src/Distribution/Client/ProjectOrchestration.hs @@ -946,7 +946,7 @@ printPlan printPlan verbosity ProjectBaseContext - { buildSettings = BuildTimeSettings{buildSettingDryRun} + { buildSettings = BuildTimeSettings{buildSettingDryRun, buildSettingKeepTempFiles} , projectConfig = ProjectConfig { projectConfigAllPackages = @@ -1048,6 +1048,7 @@ printPlan verbosity Nothing -- omit working directory (makeSymbolicPath "$builddir") + buildSettingKeepTempFiles fullConfigureFlags = runIdentity $ ( setupHsConfigureFlags diff --git a/cabal-install/src/Distribution/Client/ProjectPlanning.hs b/cabal-install/src/Distribution/Client/ProjectPlanning.hs index 50423b2d1df..9cfde415502 100644 --- a/cabal-install/src/Distribution/Client/ProjectPlanning.hs +++ b/cabal-install/src/Distribution/Client/ProjectPlanning.hs @@ -4090,14 +4090,16 @@ setupHsCommonFlags :: Verbosity -> Maybe (SymbolicPath CWD (Dir Pkg)) -> SymbolicPath Pkg (Dir Dist) + -> Bool -> Cabal.CommonSetupFlags -setupHsCommonFlags verbosity mbWorkDir builddir = +setupHsCommonFlags verbosity mbWorkDir builddir keepTempFiles = Cabal.CommonSetupFlags { setupDistPref = toFlag builddir , setupVerbosity = toFlag verbosity , setupCabalFilePath = mempty , setupWorkingDir = maybeToFlag mbWorkDir , setupTargets = [] + , setupKeepTempFiles = toFlag keepTempFiles } setupHsBuildFlags @@ -4226,7 +4228,7 @@ setupHsHaddockFlags setupHsHaddockFlags (ElaboratedConfiguredPackage{..}) (ElaboratedSharedConfig{..}) - (BuildTimeSettings{buildSettingKeepTempFiles = keepTmpFiles}) + _buildTimeSettings common = Cabal.HaddockFlags { haddockCommonFlags = common @@ -4254,7 +4256,6 @@ setupHsHaddockFlags , haddockQuickJump = toFlag elabHaddockQuickJump , haddockHscolourCss = maybe mempty toFlag elabHaddockHscolourCss , haddockContents = maybe mempty toFlag elabHaddockContents - , haddockKeepTempFiles = toFlag keepTmpFiles , haddockIndex = maybe mempty toFlag elabHaddockIndex , haddockBaseUrl = maybe mempty toFlag elabHaddockBaseUrl , haddockResourcesDir = maybe mempty toFlag elabHaddockResourcesDir diff --git a/cabal-install/src/Distribution/Client/ReplFlags.hs b/cabal-install/src/Distribution/Client/ReplFlags.hs index a7136aa572d..0d587b1d501 100644 --- a/cabal-install/src/Distribution/Client/ReplFlags.hs +++ b/cabal-install/src/Distribution/Client/ReplFlags.hs @@ -27,7 +27,6 @@ import Distribution.Simple.Setup , falseArg , replOptions , toFlag - , trueArg ) import Distribution.Types.Dependency ( Dependency (..) @@ -55,11 +54,10 @@ data ReplFlags = ReplFlags { configureReplOptions :: ReplOptions , replEnvFlags :: EnvFlags , replUseMulti :: Flag Bool - , replKeepTempFiles :: Flag Bool } instance Semigroup ReplFlags where - (ReplFlags a1 a2 a3 a4) <> (ReplFlags b1 b2 b3 b4) = ReplFlags (a1 <> b1) (a2 <> b2) (a3 <> b3) (a4 <> b4) + (ReplFlags a1 a2 a3) <> (ReplFlags b1 b2 b3) = ReplFlags (a1 <> b1) (a2 <> b2) (a3 <> b3) instance Monoid ReplFlags where mempty = defaultReplFlags @@ -70,7 +68,6 @@ defaultReplFlags = { configureReplOptions = mempty , replEnvFlags = defaultEnvFlags , replUseMulti = NoFlag - , replKeepTempFiles = NoFlag } topReplOptions :: ShowOrParseArgs -> [OptionField ReplFlags] @@ -78,18 +75,6 @@ topReplOptions showOrParseArgs = liftOptions configureReplOptions set1 (replOptions showOrParseArgs) ++ liftOptions replEnvFlags set2 (envOptions showOrParseArgs) ++ [ liftOption replUseMulti set3 multiReplOption - , -- keeping temporary files is important functionality for HLS, - -- which runs @cabal repl@ with fake GHC to get cli arguments. - -- It will need the temporary files (incl. multi unit repl response files) - -- to stay, even after the @cabal repl@ command exits. - -- - option - [] - ["keep-temp-files"] - "Keep temporary files" - replKeepTempFiles - (\b flags -> flags{replKeepTempFiles = b}) - trueArg ] where set1 a x = x{configureReplOptions = a} diff --git a/cabal-install/src/Distribution/Client/Setup.hs b/cabal-install/src/Distribution/Client/Setup.hs index aebba9462c0..913c88bba91 100644 --- a/cabal-install/src/Distribution/Client/Setup.hs +++ b/cabal-install/src/Distribution/Client/Setup.hs @@ -652,9 +652,11 @@ filterCommonFlags flags cabalLibVersion flags_latest = flags flags_3_13_0 = flags_latest - { setupWorkingDir = NoFlag + { -- Cabal < 3.13 does not support the --working-dir flag. + setupWorkingDir = NoFlag + , -- Or the --keep-temp-files flag. + setupKeepTempFiles = NoFlag } - -- Cabal < 3.13 does not support the --working-dir flag. flags_2_1_0 = flags_3_13_0 { -- Cabal < 2.1 doesn't know about -v +timestamp modifier @@ -1269,6 +1271,9 @@ filterReplFlags flags cabalLibVersion = flags { replCommonFlags = filterCommonFlags (replCommonFlags flags) cabalLibVersion + { -- `cabal repl` knew about `--keep-temp-files` before other commands did. + setupKeepTempFiles = setupKeepTempFiles (replCommonFlags flags) + } } -- ------------------------------------------------------------ @@ -2472,6 +2477,9 @@ filterHaddockFlags flags cabalLibVersion flags { haddockCommonFlags = filterCommonFlags (haddockCommonFlags flags) cabalLibVersion + { -- `cabal haddock` knew about `--keep-temp-files` before other commands did. + setupKeepTempFiles = setupKeepTempFiles (haddockCommonFlags flags) + } } flags_2_3_0 = diff --git a/cabal-install/tests/IntegrationTests2.hs b/cabal-install/tests/IntegrationTests2.hs index e554f68999d..2577346069c 100644 --- a/cabal-install/tests/IntegrationTests2.hs +++ b/cabal-install/tests/IntegrationTests2.hs @@ -2002,6 +2002,7 @@ testConfigOptionComments = do "-- verbose" @=? findLineWith True "verbose" defaultConfigFile "-- compiler" @=? findLineWith True "compiler" defaultConfigFile "-- cabal-file" @=? findLineWith True "cabal-file" defaultConfigFile + "-- keep-temp-files" @=? findLineWith True "keep-temp-files" defaultConfigFile "-- with-compiler" @=? findLineWith True "with-compiler" defaultConfigFile "-- with-hc-pkg" @=? findLineWith True "with-hc-pkg" defaultConfigFile "-- program-prefix" @=? findLineWith True "program-prefix" defaultConfigFile @@ -2095,7 +2096,6 @@ testConfigOptionComments = do "-- password-command" @=? findLineWith True "password-command" defaultConfigFile "-- builddir" @=? findLineWith True "builddir" defaultConfigFile - " -- keep-temp-files" @=? findLineWith True "keep-temp-files" defaultConfigFile " -- hoogle" @=? findLineWith True "hoogle" defaultConfigFile " -- html" @=? findLineWith True "html" defaultConfigFile " -- html-location" @=? findLineWith True "html-location" defaultConfigFile