[commit: packages/time] master, wip/travis: Restore compat for GHC 7.8 (5cd5490)
git at git.haskell.org
git at git.haskell.org
Sat May 7 06:50:56 UTC 2016
Repository : ssh://git@git.haskell.org/time
On branches: master,wip/travis
Link : http://git.haskell.org/packages/time.git/commitdiff/5cd5490e271b1e137d46cb9ec2e75624c154be8d
>---------------------------------------------------------------
commit 5cd5490e271b1e137d46cb9ec2e75624c154be8d
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date: Sun Dec 20 15:37:45 2015 +0100
Restore compat for GHC 7.8
Restoring support for GHC 7.6 would require more work due to MkFixed
This renders #41 obsolete
>---------------------------------------------------------------
5cd5490e271b1e137d46cb9ec2e75624c154be8d
lib/Data/Time/Format/Parse.hs | 3 +++
time.cabal | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/lib/Data/Time/Format/Parse.hs b/lib/Data/Time/Format/Parse.hs
index 3918719..30b4705 100644
--- a/lib/Data/Time/Format/Parse.hs
+++ b/lib/Data/Time/Format/Parse.hs
@@ -27,6 +27,9 @@ import Data.Time.LocalTime.TimeZone
import Data.Time.LocalTime.TimeOfDay
import Data.Time.LocalTime.LocalTime
+#if !MIN_VERSION_base(4,8,0)
+import Control.Applicative ((<$>),(<*>))
+#endif
#if LANGUAGE_Rank2Types
import Control.Monad
#endif
diff --git a/time.cabal b/time.cabal
index 8eea72e..bf74606 100644
--- a/time.cabal
+++ b/time.cabal
@@ -49,7 +49,7 @@ library
cpp-options: -DLANGUAGE_Rank2Types
ghc-options: -Wall -fwarn-tabs
build-depends:
- base >= 4.3 && < 5,
+ base >= 4.7 && < 5,
deepseq >= 1.1
if os(windows)
build-depends: Win32
More information about the ghc-commits
mailing list