From d1771331ffd495035cb7f1b2dd14cdf86b11d2fa Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sun, 21 Mar 2021 14:23:47 -0700 Subject: [PATCH] Changes to allow building with modern versions of 'time' --- src/Data/Time/CalendarTime/CalendarTime.hs | 2 +- tests/Tests.lhs | 2 +- time-recurrence.cabal | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Data/Time/CalendarTime/CalendarTime.hs b/src/Data/Time/CalendarTime/CalendarTime.hs index 19812b6..a158ad4 100644 --- a/src/Data/Time/CalendarTime/CalendarTime.hs +++ b/src/Data/Time/CalendarTime/CalendarTime.hs @@ -14,7 +14,7 @@ module Data.Time.CalendarTime.CalendarTime ) where -import Data.Time +import Data.Time hiding (calendarYear, calendarMonth, calendarDay) import Data.Time.Calendar.OrdinalDate import Data.Time.Calendar.Month import Data.Time.Calendar.WeekDay diff --git a/tests/Tests.lhs b/tests/Tests.lhs index af68ec2..a7aedde 100644 --- a/tests/Tests.lhs +++ b/tests/Tests.lhs @@ -16,7 +16,7 @@ a local time instance has not been created yet, all the dates are converted into UTC. #if MIN_VERSION_time(1,5,0) -> import Data.Time +> import Data.Time hiding (DayOfWeek(..)) #else > import Data.Time > import System.Locale (TimeLocale, defaultTimeLocale, rfc822DateFormat) diff --git a/time-recurrence.cabal b/time-recurrence.cabal index 69e94a6..b929293 100644 --- a/time-recurrence.cabal +++ b/time-recurrence.cabal @@ -84,7 +84,7 @@ Library -- Packages needed in order to build this package. Build-depends: base >= 4 && < 5, - time >= 1.4 && < 1.6, + time >= 1.4, data-ordlist >= 0.4.5, mtl >= 2.0 && < 2.3 @@ -101,12 +101,12 @@ Test-Suite test-time-recurrence main-is: Tests.lhs ghc-options: -Wall -fno-warn-name-shadowing -fno-warn-orphans build-depends: base >= 4 && < 5, - time >= 1.4 && < 1.6, + time >= 1.4, data-ordlist >= 0.4.5, mtl >= 2.0 && < 2.3, test-framework >= 0.8, test-framework-hunit >= 0.3.0, - HUnit >= 1.2 && < 1.4, + HUnit >= 1.2, old-locale >= 1.0 && < 1.1 other-modules: Data.Time.Recurrence