Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Data/Time/CalendarTime/CalendarTime.hs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ module Data.Time.CalendarTime.CalendarTime
)
where

import Data.Time
import Data.Time hiding (calendarDay, calendarMonth, calendarYear)
import Data.Time.Calendar.OrdinalDate
import Data.Time.Calendar.Month
import Data.Time.Calendar.WeekDay
Expand Down
2 changes: 1 addition & 1 deletion tests/Tests.lhs
Original file line number Diff line number Diff line change
Expand Up @@ -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 (Monday, Sunday, January, September, October)
#else
> import Data.Time
> import System.Locale (TimeLocale, defaultTimeLocale, rfc822DateFormat)
Expand Down
10 changes: 5 additions & 5 deletions time-recurrence.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ Library

-- Packages needed in order to build this package.
Build-depends: base >= 4 && < 5,
time >= 1.4 && < 1.6,
time >= 1.4 && < 1.13,
data-ordlist >= 0.4.5,
mtl >= 2.0 && < 2.3
mtl >= 2.0 && < 2.4

Default-Language: Haskell98
-- Modules not exported by this package.
Expand All @@ -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 && < 1.13,
data-ordlist >= 0.4.5,
mtl >= 2.0 && < 2.3,
mtl >= 2.0 && < 2.4,
test-framework >= 0.8,
test-framework-hunit >= 0.3.0,
HUnit >= 1.2 && < 1.4,
HUnit >= 1.2 && < 1.7,
old-locale >= 1.0 && < 1.1
other-modules:
Data.Time.Recurrence
Expand Down