hasufell/ghc-mod
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Copy ComponentLocalBuildInfo from Cabal-1.18

Browse Source 
This way `configDependencies` works even when the Cabal version used by
cabal-install is later than the one used by ghc-mod.
This commit is contained in:
Daniel Gröber 2014-05-10 02:04:09 +02:00
parent 13930a9d7d
commit f949e4be7a
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Language/Haskell/GhcMod/Cabal18.hs
View File

@ -4,4 +4,23 @@ module Language.Haskell.GhcMod.Cabal18 (
, componentPackageDeps
) where
import Distribution.Simple.LocalBuildInfo (ComponentLocalBuildInfo(..))
import Distribution.Package (InstalledPackageId, PackageId)
data LibraryName = LibraryName String
deriving (Read, Show)
data ComponentLocalBuildInfo
= LibComponentLocalBuildInfo {
componentPackageDeps :: [(InstalledPackageId, PackageId)],
componentLibraries :: [LibraryName]
}
| ExeComponentLocalBuildInfo {
componentPackageDeps :: [(InstalledPackageId, PackageId)]
}
| TestComponentLocalBuildInfo {
componentPackageDeps :: [(InstalledPackageId, PackageId)]
}
| BenchComponentLocalBuildInfo {
componentPackageDeps :: [(InstalledPackageId, PackageId)]
}
deriving (Read, Show)

3
test/Main.hs
View File

@ -1,4 +1,4 @@
{-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE CPP, ScopedTypeVariables #-}
import Spec
import Dir
@ -22,6 +22,7 @@ main = do
genGhcPkgCache `mapM_` pkgDirs
system "find test -name setup-config -exec rm {} \\;"
system "cabal --version"
putStrLn $ "ghc-mod was built with Cabal version " ++ VERSION_Cabal
system "ghc --version"
(putStrLn =<< debugInfo defaultOptions =<< findCradle)