From 479d4c4756f1c2dc5162dba5c5c8d50fdb0b1a4a Mon Sep 17 00:00:00 2001 From: Phil Hargett Date: Sun, 25 May 2014 07:43:31 -0400 Subject: [PATCH] Explicitly removed support for courier in 7.4 Courier only available for 7.6 and above. --- Stackage/Config.hs | 5 +++-- patching/patches/courier-0.1.0.12.patch | 30 ------------------------- 2 files changed, 3 insertions(+), 32 deletions(-) delete mode 100644 patching/patches/courier-0.1.0.12.patch diff --git a/Stackage/Config.hs b/Stackage/Config.hs index 0b4ccd94..b3633664 100644 --- a/Stackage/Config.hs +++ b/Stackage/Config.hs @@ -336,8 +336,9 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do , "haskell-names haskell-packages hse-cpp" ] - mapM_ (add "Phil Hargett ") $ words - "courier" + when (ghcVer >= GhcMajorVersion 7 6) $ do -- No GHC 7.4 support + mapM_ (add "Phil Hargett ") $ words + "courier" #if !defined(mingw32_HOST_OS) && !defined(__MINGW32__) mapM_ (add "Aycan iRiCAN ") $ words diff --git a/patching/patches/courier-0.1.0.12.patch b/patching/patches/courier-0.1.0.12.patch deleted file mode 100644 index 7fe4a88b..00000000 --- a/patching/patches/courier-0.1.0.12.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -ru orig/courier.cabal new/courier.cabal ---- orig/courier.cabal 2014-05-25 12:50:48.058497069 +0300 -+++ new/courier.cabal 2014-05-25 12:50:47.000000000 +0300 -@@ -64,6 +64,7 @@ - hslogger, - network, - stm, -+ ghc-prim, - text, - uuid - -@@ -87,6 +88,7 @@ - directory, - hslogger, - stm, -+ ghc-prim, - -- this project's modules - courier - -diff -ru orig/src/Network/Transport/Internal.hs new/src/Network/Transport/Internal.hs ---- orig/src/Network/Transport/Internal.hs 2014-05-25 12:50:48.054497068 +0300 -+++ new/src/Network/Transport/Internal.hs 2014-05-25 12:50:47.000000000 +0300 -@@ -21,6 +21,7 @@ - -- external imports - - import Control.Exception -+import Prelude hiding (catch) - - -------------------------------------------------------------------------------- - --------------------------------------------------------------------------------