aboutsummaryrefslogtreecommitdiff
path: root/CabalHelper/Compiletime/Types.hs
diff options
context:
space:
mode:
authorDaniel Gröber <dxld@darkboxed.org>2017-09-25 11:10:25 +0200
committerDaniel Gröber <dxld@darkboxed.org>2017-09-25 13:11:28 +0200
commit77afb51613df5777582627e8c505fde57b0be188 (patch)
tree4fa0da681316b42286ef888ed6ab1a781867933c /CabalHelper/Compiletime/Types.hs
parentb42f9095993f5862d4450a84f6cf535b7a252d48 (diff)
Add support for running Cabal's Setup.hs directly
cabal-install 1.24 broke installing older Cabal versions which use build-type:custom. See https://github.com/haskell/cabal/pull/4787. This still breaks with HEAD on GHC<8. See https://github.com/haskell/cabal/pull/4786.
Diffstat (limited to 'CabalHelper/Compiletime/Types.hs')
-rw-r--r--CabalHelper/Compiletime/Types.hs4
1 files changed, 3 insertions, 1 deletions
diff --git a/CabalHelper/Compiletime/Types.hs b/CabalHelper/Compiletime/Types.hs
index 138baa7..da6eb4d 100644
--- a/CabalHelper/Compiletime/Types.hs
+++ b/CabalHelper/Compiletime/Types.hs
@@ -25,8 +25,10 @@ data Options = Options {
, ghcPkgProgram :: FilePath
, cabalProgram :: FilePath
, cabalVersion :: Maybe Version
- , cabalPkgDb :: Maybe FilePath
+ , cabalPkgDb :: Maybe PackageDbDir
}
+newtype PackageDbDir = PackageDbDir { packageDbDir :: FilePath }
+
defaultOptions :: Options
defaultOptions = Options False "ghc" "ghc-pkg" "cabal" Nothing Nothing