wrath/shaniqua-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support GHC 8

Browse Source
This commit is contained in:
Harendra Kumar
2017-02-20 02:05:05 +05:30
parent 98b1ffa6c6
commit dee0f76486
3 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/System/Plugins/Env.hs
View File

@ -323,7 +323,14 @@ union ls ps' =
grabDefaultPkgConf :: IO PkgEnvs
grabDefaultPkgConf = do
pc <- configureAllKnownPrograms silent defaultProgramConfiguration
#if MIN_VERSION_Cabal(1,24,0)
(compiler, _platform, _programConfiguration)
<- configure silent Nothing Nothing pc
pkgIndex <- getInstalledPackages silent compiler
[GlobalPackageDB, UserPackageDB] pc
#else
pkgIndex <- getInstalledPackages silent [GlobalPackageDB, UserPackageDB] pc
#endif
return $ [] `union` allPackages pkgIndex
--
@ -332,7 +339,13 @@ grabDefaultPkgConf = do
readPackageConf :: FilePath -> IO [PackageConfig]
readPackageConf f = do
pc <- configureAllKnownPrograms silent defaultProgramConfiguration
#if MIN_VERSION_Cabal(1,24,0)
(compiler, _platform, _programConfiguration)
<- configure silent Nothing Nothing pc
pkgIndex <- getInstalledPackages silent compiler [GlobalPackageDB, UserPackageDB, SpecificPackageDB f] pc
#else
pkgIndex <- getInstalledPackages silent [GlobalPackageDB, UserPackageDB, SpecificPackageDB f] pc
#endif
return $ allPackages pkgIndex
-- -----------------------------------------------------------