3e92805 · stackage · git.iko.soy

git.iko.soy/stackage

Better HP control

commit3e92805a50af985630a7fa78a14ab923de60252b authorMichael Snoyman <michael@snoyman.com> dateThu 29 Nov 2012, 18:42 (14 years ago) parent236c490

4 files changed+10−4

compare with master

unifiedsplit

Stackage/Build.hs+2 Stackage/HaskellPlatform.hs+2−2 Stackage/InstallInfo.hs+4−2 Stackage/Types.hs+2

Stackage/Build.hs+2

@@ -28,6 +28,8 @@ defaultBuildSettings = BuildSettings

2828 , expectedFailures = defaultExpectedFailures

2929 , stablePackages = defaultStablePackages

3030 , extraArgs = ["-fnetwork23"]

31+ , haskellPlatformCabal = "haskell-platform/haskell-platform.cabal"

32+ , requireHaskellPlatform = True

3133 }

3234

3335build :: BuildSettings -> IO ()

Stackage/HaskellPlatform.hs+2−2

@@ -11,8 +11,8 @@ import Data.Set (singleton)

1111import Distribution.Text (simpleParse)

1212import Stackage.Types

1313

14−loadHaskellPlatform :: IO HaskellPlatform

15−loadHaskellPlatform = fmap parseHP $ readFile "haskell-platform/haskell-platform.cabal"

14+loadHaskellPlatform :: BuildSettings -> IO HaskellPlatform

15+loadHaskellPlatform = fmap parseHP . readFile . haskellPlatformCabal

1616

1717data HPLine = HPLPackage PackageIdentifier

1818 | HPLBeginCore

Stackage/InstallInfo.hs+4−2

@@ -15,8 +15,10 @@ import Data.Version (showVersion)

1515

1616getInstallInfo :: BuildSettings -> IO InstallInfo

1717getInstallInfo settings = do

18− hp <- loadHaskellPlatform

19− let allPackages = Map.union (stablePackages settings) $ identsToRanges (hplibs hp)

18+ hp <- loadHaskellPlatform settings

19+ let allPackages

20+ | requireHaskellPlatform settings = Map.union (stablePackages settings) $ identsToRanges (hplibs hp)

21+ | otherwise = stablePackages settings

2022 let totalCore = extraCore settings `Set.union` Set.map (\(PackageIdentifier p _) -> p) (hpcore hp)

2123 pdb <- loadPackageDB totalCore allPackages

2224 final <- narrowPackageDB pdb $ Set.fromList $ Map.toList $ Map.map snd $ allPackages

Stackage/Types.hs+2

@@ -61,4 +61,6 @@ data BuildSettings = BuildSettings

6161 , expectedFailures :: Set PackageName

6262 , stablePackages :: Map PackageName (VersionRange, Maintainer)

6363 , extraArgs :: [String]

64+ , haskellPlatformCabal :: FilePath

65+ , requireHaskellPlatform :: Bool

6466 }