Fix some 7.6 issues

This commit is contained in:
Michael Snoyman 2014-12-03 13:27:19 +02:00
parent b35a05ac0c
commit 76c81f3f7d
2 changed files with 4 additions and 2 deletions

View File

@ -459,7 +459,9 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
if ghcVer >= GhcMajorVersion 7 8
then add "Ryan Newton <ryan.newton@alum.mit.edu>" "accelerate"
else addRange "Ryan Newton <ryan.newton@alum.mit.edu>" "accelerate" "< 0.15"
else do
addRange "Ryan Newton <ryan.newton@alum.mit.edu>" "accelerate" "< 0.15"
addRange "Michael Snoyman" "linear-accelerate" "< 0.2"
mapM_ (add "Dan Burton <danburton.email@gmail.com>") $ words =<<
[ "basic-prelude composition io-memoize numbers rev-state runmemo"

View File

@ -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