Skip to content

Update to work with GHC 8.8.3 #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
analyticd wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update to work with GHC 8.8.3 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
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 (calendarYear, calendarMonth, calendarDay, DayOfWeek ( Monday ), DayOfWeek( Sunday ))
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
View file
Open in desktop
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 (DayOfWeek( Monday ), DayOfWeek( Sunday ))
#else
> import Data.Time
> import System.Locale (TimeLocale, defaultTimeLocale, rfc822DateFormat)
Expand Down
8 changes: 4 additions & 4 deletions time-recurrence.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Name: time-recurrence
-- The package version. See the Haskell package versioning policy
-- (http://www.haskell.org/haskellwiki/Package_versioning_policy) for
-- standards guiding when and how versions should be incremented.
Version: 0.9.3
Version: 0.9.4

-- A short (one-line) description of the package.
Synopsis: Generate recurring dates.
Expand Down Expand Up @@ -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 && < 1.9.4,
data-ordlist >= 0.4.5,
mtl >= 2.0 && < 2.3

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.9.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 && < 1.7,
old-locale >= 1.0 && < 1.1
other-modules:
Data.Time.Recurrence
Expand Down