From 0eb73ae20cc2dc6b67b2835361ed7e9a1b63a94d Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sun, 7 Dec 2014 16:19:16 +0200
Subject: [PATCH] Fix some broken benchmarks/test suites

---
 Stackage/Select.hs              | 2 +-
 Stackage2/PackageConstraints.hs | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Stackage/Select.hs b/Stackage/Select.hs
index 125f4af9..2eda5f2b 100644
--- a/Stackage/Select.hs
+++ b/Stackage/Select.hs
@@ -30,7 +30,7 @@ defaultSelectSettings version requireHP = SelectSettings
     , ignoreUpgradeableCore = False
     , excludedPackages = empty
     , flags = \coreMap ->
-        Set.fromList (words "blaze_html_0_5 small_base https splitbase old-locale") `Set.union`
+        Set.fromList (words "blaze_html_0_5 small_base https splitbase old-locale new-base") `Set.union`
 
 #if defined(mingw32_HOST_OS) || defined(__MINGW32__)
         -- Needed on Windows to get unix-compat to compile
diff --git a/Stackage2/PackageConstraints.hs b/Stackage2/PackageConstraints.hs
index aa4bccee..2ced78f7 100644
--- a/Stackage2/PackageConstraints.hs
+++ b/Stackage2/PackageConstraints.hs
@@ -54,6 +54,7 @@ defaultGlobalFlags = mapFromList $
     map (, False) (map FlagName $ setToList $ Old.disabledFlags oldSettings)
 
 packageFlags :: PackageName -> Map FlagName Bool
+packageFlags (PackageName "mersenne-random-pure64") = singletonMap (FlagName "small_base") False
 packageFlags _ = mempty
 
 tryBuildTest :: PackageName -> Bool
@@ -64,12 +65,12 @@ tryBuildBenchmark (PackageName name) = pack name `notMember` skippedBenchs
 
 skippedTests :: HashSet Text
 skippedTests = (old ++ ) $ setFromList $ words =<<
-    [ "HTTP"
+    [ "HTTP Octree options"
     ]
   where
     old = setFromList $ map unPackageName $ setToList $ Old.skippedTests oldSettings
 
 skippedBenchs :: HashSet Text
 skippedBenchs = setFromList $ words =<<
-    [ "machines"
+    [ "machines criterion-plus graphviz lifted-base pandoc stm-containers uuid"
     ]