git.iko.soy/stackage
on master help sign in
Initial ignoreUpgradeableCore
commitd95f3d0661845ded6478f1dceeed7137f223e7d3 authorMichael Snoyman <michael@snoyman.com> dateThu 13 Mar 2014, 08:13 (13 years ago) parentf534e42
5 files changed+20−1
compare with master
unifiedsplit
Stackage/Config.hs+8 Stackage/InstallInfo.hs+5−1 Stackage/Select.hs+1 Stackage/Types.hs+2 app/stackage.hs+4
Stackage/Config.hs+8
@@ -125,6 +125,9 @@ defaultExpectedFailures ghcVer = execWriter $ do
125125 -- Test suite is currently failing regularly, needs to be worked out still.
126126 add "lens"
127127
128+ -- Requires too old a version of test-framework
129+ add "time"
130+
128131 -- No code included any more, therefore Haddock fails
129132 mapM_ add $ words =<<
130133 [ "comonad-transformers comonads-fd groupoids"
@@ -342,6 +345,11 @@ defaultStablePackages ghcVer = unPackageMap $ execWriter $ do
342345
343346 -- Version 0.15.3 requires a newer template-haskell
344347 addRange "FP Complete <michael@fpcomplete.com>" "language-ecmascript" "< 0.15.3"
348+
349+ -- Temporary upper bounds while getting things sorted with upstream...
350+ addRange "Michael Snoyman" "dlist" "< 0.6"
351+ addRange "Michael Snoyman" "unix" "< 2.7"
352+ addRange "Michael Snoyman" "array" "< 0.5"
345353 where
346354 add maintainer package = addRange maintainer package "-any"
347355 addRange maintainer package range =
Stackage/InstallInfo.hs+5−1
@@ -47,7 +47,11 @@ getInstallInfo settings = do
4747 Map.union (stablePackages settings) $ identsToRanges (hplibs hp)
4848 _ -> stablePackages settings
4949 allPackages = dropExcluded settings allPackages'
50− let totalCore = extraCore settings `Set.union` Set.map (\(PackageIdentifier p _) -> p) core
50+ let totalCore
51+ | ignoreUpgradeableCore settings =
52+ Set.fromList $ map PackageName $ words "base containers template-haskell"
53+ | otherwise =
54+ extraCore settings `Set.union` Set.map (\(PackageIdentifier p _) -> p) core
5155
5256 putStrLn "Loading package database"
5357 pdb <- loadPackageDB settings coreMap totalCore allPackages
Stackage/Select.hs+1
@@ -25,6 +25,7 @@ defaultSelectSettings version = SelectSettings
2525 , stablePackages = defaultStablePackages version
2626 , haskellPlatformDir = "hp"
2727 , requireHaskellPlatform = True
28+ , ignoreUpgradeableCore = False
2829 , excludedPackages = empty
2930 , flags = \coreMap ->
3031 Set.fromList (words "blaze_html_0_5 small_base") `Set.union`
Stackage/Types.hs+2
@@ -98,6 +98,8 @@ data SelectSettings = SelectSettings
9898 , disabledFlags :: Set String
9999 -- ^ Compile flags which should always be disabled.
100100 , extraCore :: Set PackageName
101+ , ignoreUpgradeableCore :: Bool
102+ -- ^ Do not pin down the versions of upgradeable core packages.
101103 , requireHaskellPlatform :: Bool
102104 , allowedPackage :: GenericPackageDescription -> Either String ()
103105 -- ^ Checks if a package is allowed into the distribution. By default, we
app/stackage.hs+4
@@ -16,6 +16,7 @@ import System.IO (hFlush, stdout)
1616data SelectArgs = SelectArgs
1717 { excluded :: [String]
1818 , noPlatform :: Bool
19+ , ignoreUpgradeable :: Bool
1920 , onlyPermissive :: Bool
2021 , allowed :: [String]
2122 , buildPlanDest :: FilePath
@@ -27,6 +28,7 @@ parseSelectArgs =
2728 loop SelectArgs
2829 { excluded = []
2930 , noPlatform = False
31+ , ignoreUpgradeable = False
3032 , onlyPermissive = False
3133 , allowed = []
3234 , buildPlanDest = defaultBuildPlan
@@ -36,6 +38,7 @@ parseSelectArgs =
3638 loop x [] = return x
3739 loop x ("--exclude":y:rest) = loop x { excluded = y : excluded x } rest
3840 loop x ("--no-platform":rest) = loop x { noPlatform = True } rest
41+ loop x ("--ignore-upgradeable":rest) = loop x { ignoreUpgradeable = True } rest
3942 loop x ("--only-permissive":rest) = loop x { onlyPermissive = True } rest
4043 loop x ("--allow":y:rest) = loop x { allowed = y : allowed x } rest
4144 loop x ("--build-plan":y:rest) = loop x { buildPlanDest = y } rest
@@ -95,6 +98,7 @@ main = do
9598 (defaultSelectSettings ghcVersion)
9699 { excludedPackages = fromList $ map PackageName excluded
97100 , requireHaskellPlatform = not noPlatform
101+ , ignoreUpgradeableCore = ignoreUpgradeable
98102 , allowedPackage =
99103 if onlyPermissive
100104 then allowPermissive allowed