From 77afb51613df5777582627e8c505fde57b0be188 Mon Sep 17 00:00:00 2001
From: Daniel Gröber <dxld@darkboxed.org>
Date: Mon, 25 Sep 2017 11:10:25 +0200
Subject: 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.
---
 CabalHelper/Compiletime/Types.hs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'CabalHelper/Compiletime/Types.hs')

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
-- 
cgit v1.2.3