@@ -14,7 +14,6 @@ import Data.Version (showVersion)
14import qualified Distribution.Text
14import qualified Distribution.Text
15import Distribution.Version (simplifyVersionRange, withinRange)
15import Distribution.Version (simplifyVersionRange, withinRange)
16import Stackage.GhcPkg
16import Stackage.GhcPkg
17−import Stackage.HaskellPlatform
18import Stackage.LoadDatabase
17import Stackage.LoadDatabase
19import Stackage.NarrowDatabase
18import Stackage.NarrowDatabase
20import Stackage.ServerFiles
19import Stackage.ServerFiles
@@ -36,25 +35,17 @@ dropExcluded bs m0 =
36getInstallInfo :: SelectSettings -> IO InstallInfo
35getInstallInfo :: SelectSettings -> IO InstallInfo
37getInstallInfo settings = do
36getInstallInfo settings = do
38 putStrLn "Loading Haskell Platform"
37 putStrLn "Loading Haskell Platform"
39− mhp <- loadHaskellPlatform settings
38+
41− core <-
39+ core <- do
43− Just hp | not (useGlobalDatabase settings) -> return $ hpcore hp
45− putStrLn "Loading core packages from global database"
40+ putStrLn "Loading core packages from global database"
46− getGlobalPackages $ selectGhcVersion settings
41+ getGlobalPackages $ selectGhcVersion settings
47 underlay <- getDBPackages (selectUnderlayPackageDirs settings) (selectGhcVersion settings)
42 underlay <- getDBPackages (selectUnderlayPackageDirs settings) (selectGhcVersion settings)
48 let underlaySet = Set.map pkgName underlay
43 let underlaySet = Set.map pkgName underlay
49 coreMap = Map.unions
44 coreMap = Map.unions
50 $ map (\(PackageIdentifier k v) -> Map.singleton k v)
45 $ map (\(PackageIdentifier k v) -> Map.singleton k v)
51 $ Set.toList core
46 $ Set.toList core
52 allPackages' =
47 allPackages' =
54− Just hp | requireHaskellPlatform settings ->
55− Map.union (stablePackages settings $ requireHaskellPlatform settings)
56− $ identsToRanges (hplibs hp)
57− _ -> stablePackages settings $ requireHaskellPlatform settings
48+ stablePackages settings $ requireHaskellPlatform settings
58 allPackages = dropExcluded settings allPackages'
49 allPackages = dropExcluded settings allPackages'
60 | ignoreUpgradeableCore settings =
51 | ignoreUpgradeableCore settings =
@@ -99,10 +90,7 @@ getInstallInfo settings = do
99 let ii = InstallInfo
90 let ii = InstallInfo
100 { iiCore = totalCore
91 { iiCore = totalCore
101 , iiPackages = Map.map biToSPI final
92 , iiPackages = Map.map biToSPI final
102− , iiOptionalCore = maybe
93+ , iiOptionalCore = Map.empty
104− (Map.fromList . map (\(PackageIdentifier p v) -> (p, v)) . Set.toList . hplibs)
106 , iiPackageDB = pdb
94 , iiPackageDB = pdb