git.iko.soy/stackage
on master help sign in
Provide HP info to stable package function
commit969a85ef72adea52e7fe2ac179dff322f753f7ed authorMichael Snoyman <michael@snoyman.com> dateWed 19 Mar 2014, 10:13 (13 years ago) parent622c2b8
3 files changed+9−5
compare with master
unifiedsplit
Stackage/Config.hs+4−2 Stackage/InstallInfo.hs+3−2 Stackage/Types.hs+2−1
Stackage/Config.hs+4−2
@@ -139,8 +139,10 @@ defaultExpectedFailures ghcVer = execWriter $ do
139139-- | List of packages for our stable Hackage. All dependencies will be
140140-- included as well. Please indicate who will be maintaining the package
141141-- via comments.
142−defaultStablePackages :: GhcMajorVersion -> Map PackageName (VersionRange, Maintainer)
143−defaultStablePackages ghcVer = unPackageMap $ execWriter $ do
142+defaultStablePackages :: GhcMajorVersion
143+ -> Bool -- ^ using haskell platform?
144+ -> Map PackageName (VersionRange, Maintainer)
145+defaultStablePackages ghcVer usingHP = unPackageMap $ execWriter $ do
144146 mapM_ (add "michael@snoyman.com") $ words =<<
145147 [ "yesod yesod-newsfeed yesod-sitemap yesod-static yesod-test yesod-bin"
146148 , "markdown filesystem-conduit mime-mail-ses"
Stackage/InstallInfo.hs+3−2
@@ -44,8 +44,9 @@ getInstallInfo settings = do
4444 let allPackages' =
4545 case mhp of
4646 Just hp | requireHaskellPlatform settings ->
47− Map.union (stablePackages settings) $ identsToRanges (hplibs hp)
48− _ -> stablePackages settings
47+ Map.union (stablePackages settings $ requireHaskellPlatform settings)
48+ $ identsToRanges (hplibs hp)
49+ _ -> stablePackages settings $ requireHaskellPlatform settings
4950 allPackages = dropExcluded settings allPackages'
5051 let totalCore
5152 | ignoreUpgradeableCore settings =
Stackage/Types.hs+2−1
@@ -114,7 +114,8 @@ data SelectSettings = SelectSettings
114114 -- ^ Packages which should be dropped from the list of stable packages,
115115 -- even if present via the Haskell Platform or @stablePackages@. If these
116116 -- packages are dependencies of others, they will still be included.
117− , stablePackages :: Map PackageName (VersionRange, Maintainer)
117+ , stablePackages :: Bool -- ^ require Haskell Platform?
118+ -> Map PackageName (VersionRange, Maintainer)
118119 , useGlobalDatabase :: Bool
119120 -- ^ Instead of checking the Haskell Platform file for core packages, query
120121 -- the global database. For this to be reliable, you should only have