From 79c903ddb030d1f276fd8c1768af8c66237ee34b Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 30 Nov 2014 09:43:04 +0200 Subject: [PATCH] Tweaks to @chrisdone's list for GHC 7.6 and platform --- Stackage/Config.hs | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Stackage/Config.hs b/Stackage/Config.hs index 125a722c..7669f35d 100644 --- a/Stackage/Config.hs +++ b/Stackage/Config.hs @@ -341,18 +341,23 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do mapM_ (add "Chris Done") $ words =<< [ "ace check-email freenect frisby gd" , "hostname-validate ini lucid osdkeys pdfinfo" - , "pure-io scrobble sourcemap shell-conduit" + , "pure-io scrobble sourcemap" + -- https://github.com/nominolo/atto-lisp/issues/15 + -- , "present" ] - -- https://github.com/nominolo/atto-lisp/issues/15 - -- present - -- Requires older haddock currently - when (ghcVer /= GhcMajorVersion 7 8 || requireHP) $ + when (ghcVer == GhcMajorVersion 7 8 && requireHP) $ mapM_ (add "Chris Done") $ words =<< [ "haskell-docs" ] + -- Requires too new a process for GHC 7.6 + when (ghcVer >= GhcMajorVersion 7 8) $ + mapM_ (add "Chris Done") $ words =<< + [ "shell-conduit" + ] + -- TODO: Add hindent and structured-haskell-mode once they've been ported to HSE 1.16. #if !defined(mingw32_HOST_OS) && !defined(__MINGW32__)