haskell/stackage
1
0
Fork 0
mirror of https://github.com/commercialhaskell/stackage.git synced 2026-01-23 20:51:57 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Provide HP info to stable package function

Browse Source
This commit is contained in:
Michael Snoyman 2014-03-19 10:13:07 +02:00
parent 622c2b8c63
commit 969a85ef72
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Stackage/Config.hs
View File

@ -139,8 +139,10 @@ defaultExpectedFailures ghcVer = execWriter $ do
-- | List of packages for our stable Hackage. All dependencies will be -- | List of packages for our stable Hackage. All dependencies will be
-- included as well. Please indicate who will be maintaining the package -- included as well. Please indicate who will be maintaining the package
-- via comments. -- via comments.
defaultStablePackages :: GhcMajorVersion -> Map PackageName (VersionRange, Maintainer) defaultStablePackages :: GhcMajorVersion
defaultStablePackages ghcVer = unPackageMap $ execWriter $ do -> Bool -- ^ using haskell platform?
-> Map PackageName (VersionRange, Maintainer)
defaultStablePackages ghcVer usingHP = unPackageMap $ execWriter $ do
mapM_ (add "michael@snoyman.com") $ words =<< mapM_ (add "michael@snoyman.com") $ words =<<
[ "yesod yesod-newsfeed yesod-sitemap yesod-static yesod-test yesod-bin" [ "yesod yesod-newsfeed yesod-sitemap yesod-static yesod-test yesod-bin"
, "markdown filesystem-conduit mime-mail-ses" , "markdown filesystem-conduit mime-mail-ses"

5
Stackage/InstallInfo.hs
View File

@ -44,8 +44,9 @@ getInstallInfo settings = do
let allPackages' = let allPackages' =
case mhp of case mhp of
Just hp | requireHaskellPlatform settings -> Just hp | requireHaskellPlatform settings ->
Map.union (stablePackages settings) $ identsToRanges (hplibs hp) Map.union (stablePackages settings $ requireHaskellPlatform settings)
_ -> stablePackages settings $ identsToRanges (hplibs hp)
_ -> stablePackages settings $ requireHaskellPlatform settings
allPackages = dropExcluded settings allPackages' allPackages = dropExcluded settings allPackages'
let totalCore let totalCore
| ignoreUpgradeableCore settings = | ignoreUpgradeableCore settings =

3
Stackage/Types.hs
View File

@ -114,7 +114,8 @@ data SelectSettings = SelectSettings
-- ^ Packages which should be dropped from the list of stable packages, -- ^ Packages which should be dropped from the list of stable packages,
-- even if present via the Haskell Platform or @stablePackages@. If these -- even if present via the Haskell Platform or @stablePackages@. If these
-- packages are dependencies of others, they will still be included. -- packages are dependencies of others, they will still be included.
, stablePackages :: Map PackageName (VersionRange, Maintainer) , stablePackages :: Bool -- ^ require Haskell Platform?
-> Map PackageName (VersionRange, Maintainer)
, useGlobalDatabase :: Bool , useGlobalDatabase :: Bool
-- ^ Instead of checking the Haskell Platform file for core packages, query -- ^ Instead of checking the Haskell Platform file for core packages, query
-- the global database. For this to be reliable, you should only have -- the global database. For this to be reliable, you should only have