Merge pull request #232 from hargettp/master

Explicitly removed support for courier in 7.4

Stackage/Config.hs

@@ -336,8 +336,9 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
         , "haskell-names haskell-packages hse-cpp"
         ]
 
-    mapM_ (add "Phil Hargett <phil@haphazardhouse.net>") $ words
-        "courier"
+    when (ghcVer >= GhcMajorVersion 7 6) $ do -- No GHC 7.4 support
+        mapM_ (add "Phil Hargett <phil@haphazardhouse.net>") $ words
+            "courier"
         
 #if !defined(mingw32_HOST_OS) && !defined(__MINGW32__)
     mapM_ (add "Aycan iRiCAN <iricanaycan@gmail.com>") $ words

patching/patches/courier-0.1.0.12.patch

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