From 76c81f3f7dc9b759ee4bbe831701eff13fe0f8dc Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 3 Dec 2014 13:27:19 +0200 Subject: [PATCH] Fix some 7.6 issues --- Stackage/Config.hs | 4 +++- Stackage/Select.hs | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Stackage/Config.hs b/Stackage/Config.hs index 826a3b1b..dd29cc13 100644 --- a/Stackage/Config.hs +++ b/Stackage/Config.hs @@ -459,7 +459,9 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do if ghcVer >= GhcMajorVersion 7 8 then add "Ryan Newton " "accelerate" - else addRange "Ryan Newton " "accelerate" "< 0.15" + else do + addRange "Ryan Newton " "accelerate" "< 0.15" + addRange "Michael Snoyman" "linear-accelerate" "< 0.2" mapM_ (add "Dan Burton ") $ words =<< [ "basic-prelude composition io-memoize numbers rev-state runmemo" diff --git a/Stackage/Select.hs b/Stackage/Select.hs index c2f3243d..125f4af9 100644 --- a/Stackage/Select.hs +++ b/Stackage/Select.hs @@ -68,10 +68,10 @@ defaultSelectSettings version requireHP = SelectSettings , useGlobalDatabase = False , skippedTests = Set.insert (PackageName "ReadArgs") $ -- old version of hspec + Set.insert (PackageName "ersatz") $ -- old QuickCheck if version >= GhcMajorVersion 7 8 then Set.fromList [ PackageName "punycode" -- pulls in encoding - , PackageName "ersatz" -- old QuickCheck ] else Set.empty , selectGhcVersion = version