From 869c80ae2e7ea116f1f8e87bb9a4f6486134891a Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 10 Jun 2014 13:24:59 +0300 Subject: [PATCH] Fixes for GHC 7.6 --- Stackage/Config.hs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Stackage/Config.hs b/Stackage/Config.hs index 899c2efa..4a8b3aa6 100644 --- a/Stackage/Config.hs +++ b/Stackage/Config.hs @@ -212,8 +212,8 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do addRange "FP Complete " "hxt" "<= 9.3.0.1" addRange "FP Complete " "shelly" "<= 1.0" addRange "FP Complete " "lockfree-queue" "== 0.2" - when (ghcVer == GhcMajorVersion 7 6) $ do -- No GHC 7.8 support - add "FP Complete " "repa-devil" + -- when (ghcVer == GhcMajorVersion 7 6) $ do -- No GHC 7.8 support + -- add "FP Complete " "repa-devil" addRange "FP Complete " "kure" "<= 2.4.10" mapM_ (add "Neil Mitchell") $ words @@ -358,7 +358,8 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do when (ghcVer < GhcMajorVersion 7 8) $ mapM_ (add "John Wiegley") $ words =<< - [ "bindings-DSL github monad-extras numbers these hlibgit2" + -- Removed these: bad semigroups upper bound + [ "bindings-DSL github monad-extras numbers hlibgit2" , "gitlib gitlib-cmdline gitlib-test" , "gitlib-libgit2 gitlib-s3" ] @@ -384,7 +385,8 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do addRange "Michael Snoyman" "biophd" "< 0.0.6 || > 0.0.6" when (ghcVer == GhcMajorVersion 7 6) $ do mapM_ (add "Ketil Malde") $ words =<< - [ "RNAFold hTalos parsestar" + -- RNAFold + [ "hTalos parsestar" ] -- Newest hxt requires network 2.4 or newest @@ -400,8 +402,9 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do addRange "Michael Snoyman" "parsers" "< 0.11" -- https://github.com/fpco/stackage/issues/216 - when (ghcVer == GhcMajorVersion 7 6) $ - addRange "Michael Snoyman" "repa" "< 3.2.5.1" + -- QuickCheck constraint + -- when (ghcVer == GhcMajorVersion 7 6) $ + -- addRange "Michael Snoyman" "repa" "< 3.2.5.1" -- https://github.com/fpco/stackage/issues/217 addRange "Michael Snoyman" "transformers" "< 0.4"