Provide HP info to stable package function

Stackage/Config.hs

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

Stackage/InstallInfo.hs

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

Stackage/Types.hs

@@ -114,7 +114,8 @@ data SelectSettings = SelectSettings
     -- ^ Packages which should be dropped from the list of stable packages,
     -- even if present via the Haskell Platform or @stablePackages@. If these
     -- 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
     -- ^ Instead of checking the Haskell Platform file for core packages, query
     -- the global database. For this to be reliable, you should only have