aboutsummaryrefslogtreecommitdiff
path: root/lib/Distribution
diff options
context:
space:
mode:
authorDaniel Gröber <dxld@darkboxed.org>2019-09-29 02:08:03 +0200
committerDaniel Gröber <dxld@darkboxed.org>2019-09-29 02:16:21 +0200
commitff39baac5b6572916d68d2979079da588a257f52 (patch)
treeb884b8acacffdb812959a6f8a4931e423f24473a /lib/Distribution
parent761952c1afba15b9fdc56e6415beab23f3135945 (diff)
Remove Compat.ProgramDb module
Diffstat (limited to 'lib/Distribution')
-rw-r--r--lib/Distribution/Helper.hs9
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/Distribution/Helper.hs b/lib/Distribution/Helper.hs
index 3d7074e..8a3781c 100644
--- a/lib/Distribution/Helper.hs
+++ b/lib/Distribution/Helper.hs
@@ -157,13 +157,18 @@ import CabalHelper.Shared.Common
import CabalHelper.Runtime.HelperMain (helper_main)
import CabalHelper.Compiletime.Compat.Version
-import qualified CabalHelper.Compiletime.Compat.ProgramDb as ProgDb
- ( defaultProgramDb, programPath, lookupProgram, ghcProgram, ghcPkgProgram )
+
import Distribution.System (buildPlatform)
import Distribution.Text (display)
import Distribution.Verbosity (Verbosity, silent, normal, verbose, deafening)
import Distribution.Simple.GHC as GHC (configure)
+import qualified Distribution.Simple.Program as ProgDb
+ ( lookupProgram, lookupKnownProgram, programPath
+ , configureProgram, userMaybeSpecifyPath
+ , ghcProgram, ghcPkgProgram, haddockProgram )
+import qualified Distribution.Simple.Program.Db as ProgDb
+
-- $type-conventions
-- Throughout the API we use the following conventions for type variables:
--