git.iko.soy/stackage
on master help sign in
Merge pull request #232 from hargettp/master

Explicitly removed support for courier in 7.4

commit9c459763dad573c18991b877e2df7c1167abb96a authorMichael Snoyman <michael@snoyman.com> dateSun 25 May 2014, 17:50 (12 years ago) parent4c9d1a3479d4c4
2 files changed+3−32
compare with master
unifiedsplit
Stackage/Config.hs+3−2 patching/patches/courier-0.1.0.12.patch−30
Stackage/Config.hs+3−2
@@ -336,8 +336,9 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
336336 , "haskell-names haskell-packages hse-cpp"
337337 ]
338338
339− mapM_ (add "Phil Hargett <phil@haphazardhouse.net>") $ words
340− "courier"
339+ when (ghcVer >= GhcMajorVersion 7 6) $ do -- No GHC 7.4 support
340+ mapM_ (add "Phil Hargett <phil@haphazardhouse.net>") $ words
341+ "courier"
341342
342343#if !defined(mingw32_HOST_OS) && !defined(__MINGW32__)
343344 mapM_ (add "Aycan iRiCAN <iricanaycan@gmail.com>") $ words
patching/patches/courier-0.1.0.12.patchdeleted−30
@@ -1,30 +0,0 @@
1−diff -ru orig/courier.cabal new/courier.cabal
2−--- orig/courier.cabal 2014-05-25 12:50:48.058497069 +0300
3−+++ new/courier.cabal 2014-05-25 12:50:47.000000000 +0300
4−@@ -64,6 +64,7 @@
5− hslogger,
6− network,
7− stm,
8−+ ghc-prim,
9− text,
10− uuid
11−
12−@@ -87,6 +88,7 @@
13− directory,
14− hslogger,
15− stm,
16−+ ghc-prim,
17− -- this project's modules
18− courier
19−
20−diff -ru orig/src/Network/Transport/Internal.hs new/src/Network/Transport/Internal.hs
21−--- orig/src/Network/Transport/Internal.hs 2014-05-25 12:50:48.054497068 +0300
22−+++ new/src/Network/Transport/Internal.hs 2014-05-25 12:50:47.000000000 +0300
23−@@ -21,6 +21,7 @@
24− -- external imports
25−
26− import Control.Exception
27−+import Prelude hiding (catch)
28−
29− --------------------------------------------------------------------------------
30− --------------------------------------------------------------------------------