From 0c284ed48bd1a531807f5e524894766de8d179bd Mon Sep 17 00:00:00 2001 From: Daniel Gröber Date: Sat, 28 Dec 2019 23:46:41 +0100 Subject: Fix Cabal HEAD --- src/CabalHelper/Runtime/HelperMain.hs | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'src/CabalHelper/Runtime/HelperMain.hs') diff --git a/src/CabalHelper/Runtime/HelperMain.hs b/src/CabalHelper/Runtime/HelperMain.hs index 9c4d557..95168ec 100644 --- a/src/CabalHelper/Runtime/HelperMain.hs +++ b/src/CabalHelper/Runtime/HelperMain.hs @@ -193,12 +193,6 @@ import Distribution.Version import qualified Distribution.InstalledPackageInfo as Installed #endif -#if CH_MIN_VERSION_Cabal(2,2,0) -import Distribution.Types.GenericPackageDescription - ( unFlagAssignment - ) -#endif - import Control.Applicative ((<$>), (<*>), ZipList(..)) import Control.Arrow (first, second, (&&&)) import Control.Monad @@ -301,11 +295,8 @@ helper_main args = do "config-flags":[] -> do return $ Just $ ChResponseFlags $ sort $ map (first unFlagName) -#if CH_MIN_VERSION_Cabal(2,2,0) - $ unFlagAssignment $ configConfigurationsFlags -#else + $ unFlagAssignment $ configConfigurationsFlags -#endif $ configFlags lbi "non-default-config-flags":[] -> do -- cgit v1.2.3