From a03133c375218850d94f15bb25a0df9e068973d2 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 19 May 2014 21:06:35 +0300 Subject: [PATCH] scientific and bytestring --- Stackage/Config.hs | 3 +++ Stackage/Select.hs | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Stackage/Config.hs b/Stackage/Config.hs index a5913fe0..24229f40 100644 --- a/Stackage/Config.hs +++ b/Stackage/Config.hs @@ -152,6 +152,9 @@ defaultExpectedFailures ghcVer = execWriter $ do -- https://github.com/fpco/stackage/issues/226 add "options" + -- Requires too high a bytestring + when (ghcVer <= GhcMajorVersion 7 4) $ add "scientific" + where add = tell . singleton . PackageName diff --git a/Stackage/Select.hs b/Stackage/Select.hs index dcc53cd5..bf9e1d5d 100644 --- a/Stackage/Select.hs +++ b/Stackage/Select.hs @@ -40,7 +40,11 @@ defaultSelectSettings version = SelectSettings Just v | Just range <- simpleParse "< 0.5", v `withinRange` range -> Set.singleton "containers-old" _ -> Set.empty) - , disabledFlags = Set.fromList $ words "bytestring-in-base test-hlint" + , disabledFlags = Set.fromList (words "bytestring-in-base test-hlint") + `Set.union` + (if version <= GhcMajorVersion 7 4 + then Set.singleton "bytestring-builder" + else Set.empty) , allowedPackage = const $ Right () , useGlobalDatabase = False , skippedTests =