More refactoring of package handling

- 'GhcPkg' now parses 'ghc-pkg -v list' output directly to also get the
  package-id

- Remove unused field 'cradlePackages' in Cradle

- Remove 'getPackageDbPackages' and use 'ghcPkgListEx' instead
This commit is contained in:
Daniel Gröber
2014-04-17 23:40:11 +02:00
parent 68f64639dc
commit 2381f6e1ab
6 changed files with 104 additions and 52 deletions

View File

@@ -34,7 +34,6 @@ cabalCradle wdir = do
, cradleRootDir = rdir
, cradleCabalFile = Just cfile
, cradlePkgDbStack = pkgDbStack
, cradlePackages = []
}
sandboxCradle :: FilePath -> IO Cradle
@@ -46,7 +45,6 @@ sandboxCradle wdir = do
, cradleRootDir = rdir
, cradleCabalFile = Nothing
, cradlePkgDbStack = pkgDbStack
, cradlePackages = []
}
plainCradle :: FilePath -> IO Cradle
@@ -55,14 +53,13 @@ plainCradle wdir = return Cradle {
, cradleRootDir = wdir
, cradleCabalFile = Nothing
, cradlePkgDbStack = [GlobalDb]
, cradlePackages = []
}
-- Just for testing
findCradleWithoutSandbox :: IO Cradle
findCradleWithoutSandbox = do
cradle <- findCradle
return cradle { cradlePkgDbStack = [GlobalDb], cradlePackages = [] }
return cradle { cradlePkgDbStack = [GlobalDb]}
----------------------------------------------------------------