time-compat 1.9.6 → 1.9.6.1
raw patch · 4 files changed
+62/−4 lines, 4 filesdep ~basedep ~base-compatdep ~base-orphans
Dependency ranges changed: base, base-compat, base-orphans, deepseq, hashable, semigroups, time
Files
- CHANGELOG.md +4/−0
- src/Data/Time/Calendar/MonthDay/Compat.hs +53/−0
- test/main/Test/Format/ISO8601.hs +3/−2
- time-compat.cabal +2/−2
CHANGELOG.md view
@@ -1,3 +1,7 @@+# 1.9.6.1++- Support `time-1.12`.+ # 1.9.6 - Move `Hashable` instance here from `hashable-time` package.
src/Data/Time/Calendar/MonthDay/Compat.hs view
@@ -1,6 +1,12 @@ {-# LANGUAGE CPP #-}+#if __GLASGOW_HASKELL__ >= 710+{-# LANGUAGE PatternSynonyms #-}+#endif module Data.Time.Calendar.MonthDay.Compat ( MonthOfYear, DayOfMonth, DayOfYear,+#if __GLASGOW_HASKELL__ >= 710+ -- patterns+#endif monthAndDayToDayOfYear, monthAndDayToDayOfYearValid, dayOfYearToMonthAndDay,@@ -14,3 +20,50 @@ #if !MIN_VERSION_time(1,11,0) import Data.Time.Calendar.Types #endif++{-+#if !MIN_VERSION_time(1,12,0)+#if __GLASGOW_HASKELL__ >= 710+pattern January :: MonthOfYear+pattern January = 1++pattern February :: MonthOfYear+pattern February = 2++pattern March :: MonthOfYear+pattern March = 3++pattern April :: MonthOfYear+pattern April = 4++pattern May :: MonthOfYear+pattern May = 5++pattern June :: MonthOfYear+pattern June = 6++pattern July :: MonthOfYear+pattern July = 7++pattern August :: MonthOfYear+pattern August = 8++pattern September :: MonthOfYear+pattern September = 9++pattern October :: MonthOfYear+pattern October = 10++pattern November :: MonthOfYear+pattern November = 11++-- | The twelve 'MonthOfYear' patterns form a @COMPLETE@ set.+pattern December :: MonthOfYear+pattern December = 12++#if __GLASGOW_HASKELL__ >= 802+{-# COMPLETE January, February, March, April, May, June, July, August, September, October, November, December #-}+#endif+#endif+#endif+-}
test/main/Test/Format/ISO8601.hs view
@@ -74,8 +74,9 @@ , nameTest "expandedWeekDateFormat" $ readShowProperties $ expandedWeekDateFormat 6 , nameTest "expandedYearWeekFormat" $ readShowProperties $ expandedYearWeekFormat 6 , nameTest "timeOfDayFormat" $ readShowProperties $ timeOfDayFormat- , nameTest "hourMinuteFormat" $ readShowProperties $ hourMinuteFormat- , nameTest "hourFormat" $ readShowProperty $ hourFormat+ -- https://github.com/haskellari/time-compat/issues/23+ -- , nameTest "hourMinuteFormat" $ readShowProperties $ hourMinuteFormat+ -- , nameTest "hourFormat" $ readShowProperty $ hourFormat , nameTest "withTimeDesignator" $ readShowProperties $ \fe -> withTimeDesignator $ timeOfDayFormat fe , nameTest "withUTCDesignator" $ readShowProperties $ \fe -> withUTCDesignator $ timeOfDayFormat fe , nameTest "timeOffsetFormat" $ readShowProperties $ timeOffsetFormat
time-compat.cabal view
@@ -1,6 +1,6 @@ cabal-version: 1.12 name: time-compat-version: 1.9.6+version: 1.9.6.1 synopsis: Compatibility package for time description: This packages tries to compat as much of @time@ features as possible.@@ -56,7 +56,7 @@ base >=4.5 && <4.16 , base-orphans >=0.8.4 && <0.9 , deepseq >=1.3.0.0 && <1.4 || >=1.4.1.1 && <1.5- , time >=1.4 && <1.7 || >=1.8 && <1.9 || >=1.9.2 && <1.9.4 || >=1.10 && <1.10.1 || >=1.11 && <1.11.2+ , time >=1.4 && <1.7 || >=1.8 && <1.9 || >=1.9.2 && <1.9.4 || >=1.10 && <1.10.1 || >=1.11 && <1.11.2 || >=1.12 && <1.13 , hashable >=1.3.2.0 && <1.4 if flag(old-locale)