Merge pull request #41 from haskellari/noble

GHC-8.6.5...9.10.1

Author: phadej

.github/workflows/haskell-ci.yml

@@ -1,3 +1,7 @@
+# 1.9.7
+
+- Drop support for GHCs prior 8.6.5
+
 # 1.9.6.1
 
 - Support `time-1.12`.

CHANGELOG.md

@@ -1,4 +1,4 @@
-distribution: bionic
+distribution: jammy
 branches: master
 head-hackage: False
 
@@ -29,15 +29,3 @@ constraint-set time-1.9.2
 constraint-set time-1.8
   ghc: >= 7.8 && <8.7
   constraints: time ==1.8.*
-
-constraint-set time-1.6
-  ghc: >= 7.8 && <8.7
-  constraints: time ==1.6.*
-
-constraint-set time-1.5
-  ghc: >= 7.4 && <7.9
-  constraints: time ==1.5.*
-
-constraint-set time-1.4
-  ghc: >= 7.4 && <7.9
-  constraints: time ==1.4.*

cabal.haskell-ci

@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 module Data.Format
     ( Productish(..)
     , Summish(..)
@@ -23,24 +22,12 @@ module Data.Format
     , decimalFormat
     ) where
 
-#if MIN_VERSION_base(4,9,0)
 import Control.Monad.Fail
 import Prelude hiding (fail)
-#endif
-#if MIN_VERSION_base(4,8,0)
 import Data.Void
-#endif
 import Data.Char
 import Text.ParserCombinators.ReadP
 
-
-#if MIN_VERSION_base(4,8,0)
-#else
-data Void
-absurd :: Void -> a
-absurd v = seq v $ error "absurd"
-#endif
-
 class IsoVariant f where
     isoMap :: (a -> b) -> (b -> a) -> f a -> f b
 
@@ -63,11 +50,7 @@ class IsoVariant f => Summish f where
 
 
 parseReader :: (
-#if MIN_VERSION_base(4,9,0)
     MonadFail m
-#else
-    Monad m
-#endif
     ) => ReadP t -> String -> m t
 parseReader readp s = case [ t | (t,"") <- readP_to_S readp s] of
     [t] -> return t
@@ -90,11 +73,7 @@ formatShow fmt t = case formatShowM fmt t of
 
 -- | Parse a value in the format
 formatParseM :: (
-#if MIN_VERSION_base(4,9,0)
     MonadFail m
-#else
-    Monad m
-#endif
     ) => Format t -> String -> m t
 formatParseM format = parseReader $ formatReadP format
 

src/Data/Format.hs

@@ -1,9 +1,7 @@
 {-# LANGUAGE CPP                #-}
 {-# LANGUAGE DeriveDataTypeable #-}
-#if __GLASGOW_HASKELL__ >= 710
 {-# LANGUAGE PatternSynonyms    #-}
 {-# LANGUAGE ViewPatterns       #-}
-#endif
 module Data.Time.Calendar.Compat (
     -- * Days
     Day(..),addDays,diffDays,
@@ -31,9 +29,7 @@ module Data.Time.Calendar.Compat (
 
     -- * Type aliases
     DayOfMonth, MonthOfYear, Year,
-#if __GLASGOW_HASKELL__ >= 710
     pattern YearMonthDay,
-#endif
     ) where
 
 import Data.Time.Calendar
@@ -48,10 +44,6 @@ import Data.Time.Calendar.Types
 import Data.Time.Calendar.WeekDate.Compat
 #endif
 
-#if !MIN_VERSION_time(1,5,0)
-import System.Locale (TimeLocale (..))
-#endif
-
 import Control.DeepSeq (NFData (..))
 import Data.Data       (Data, Typeable)
 import Data.Monoid     (Monoid (..))
@@ -71,14 +63,7 @@ deriving instance Data CalendarDiffDays
 data CalendarDiffDays = CalendarDiffDays
     { cdMonths :: Integer
     , cdDays :: Integer
-    } deriving (Eq,
-    Data
-#if __GLASGOW_HASKELL__ >= 802
-#endif
-    ,Typeable
-#if __GLASGOW_HASKELL__ >= 802
-#endif
-    )
+    } deriving (Eq, Data, Typeable)
 
 -- | Additive
 instance Semigroup CalendarDiffDays where
@@ -161,18 +146,14 @@ diffGregorianDurationRollOver day2 day1 = let
 #endif
 
 #if !MIN_VERSION_time(1,11,0)
-#if __GLASGOW_HASKELL__ >= 710
 -- | Bidirectional abstract constructor for the proleptic Gregorian calendar.
 -- Invalid values will be clipped to the correct range, month first, then day.
 pattern YearMonthDay :: Year -> MonthOfYear -> DayOfMonth -> Day
 pattern YearMonthDay y m d <- (toGregorian -> (y,m,d)) where
     YearMonthDay y m d = fromGregorian y m d
 
-#if __GLASGOW_HASKELL__ >= 802
 {-# COMPLETE YearMonthDay #-}
 #endif
-#endif
-#endif
 
 -------------------------------------------------------------------------------
 -- DayOfWeek

src/Data/Time/Calendar/Compat.hs

@@ -1,8 +1,6 @@
 {-# LANGUAGE CPP #-}
-#if __GLASGOW_HASKELL__ >= 710
 {-# LANGUAGE PatternSynonyms #-}
 {-# LANGUAGE ViewPatterns    #-}
-#endif
 module Data.Time.Calendar.Julian.Compat (
     Year, MonthOfYear, DayOfMonth, DayOfYear,
 
@@ -14,9 +12,7 @@ module Data.Time.Calendar.Julian.Compat (
     isJulianLeapYear,
 
     toJulian,fromJulian,
-#if __GLASGOW_HASKELL__ >= 710
     pattern JulianYearMonthDay,
-#endif
     fromJulianValid,showJulian,julianMonthLength,
 
     -- calendrical arithmetic
@@ -80,15 +76,11 @@ diffJulianDurationRollOver day2 day1 = let
 #endif
 
 #if !MIN_VERSION_time(1,11,0)
-#if __GLASGOW_HASKELL__ >= 710
 -- | Bidirectional abstract constructor for the proleptic Julian calendar.
 -- Invalid values will be clipped to the correct range, month first, then day.
 pattern JulianYearMonthDay :: Year -> MonthOfYear -> DayOfMonth -> Day
 pattern JulianYearMonthDay y m d <- (toJulian -> (y,m,d)) where
     JulianYearMonthDay y m d = fromJulian y m d
 
-#if __GLASGOW_HASKELL__ >= 802
 {-# COMPLETE JulianYearMonthDay #-}
 #endif
-#endif
-#endif

src/Data/Time/Calendar/Julian/Compat.hs

@@ -1,18 +1,12 @@
 {-# LANGUAGE CPP                #-}
 {-# LANGUAGE DeriveDataTypeable #-}
-#if __GLASGOW_HASKELL__ >= 710
 {-# LANGUAGE PatternSynonyms    #-}
 {-# LANGUAGE ViewPatterns       #-}
-#endif
 module Data.Time.Calendar.Month.Compat (
     Month(..), addMonths, diffMonths,
-#if __GLASGOW_HASKELL__ >= 710
     pattern YearMonth,
-#endif
     fromYearMonthValid,
-#if __GLASGOW_HASKELL__ >= 710
     pattern MonthDay,
-#endif
     fromMonthDayValid,
     -- * time-compat extras
     fromYearMonth,
@@ -113,10 +107,8 @@ toSomeDay (MkMonth m) =
 
 #if MIN_VERSION_time(1,9,0)
 #define FORMAT_OPTS fo
-#elif MIN_VERSION_time(1,8,0)
-#define FORMAT_OPTS tl mpo i
 #else
-#define FORMAT_OPTS tl mpo
+#define FORMAT_OPTS tl mpo i
 #endif
 
 #if MIN_VERSION_time(1,9,0)
@@ -158,17 +150,13 @@ toYearMonth :: Month -> (Year, MonthOfYear)
 toYearMonth (MkMonth m) = case divMod' m 12 of
     (y, my) -> (y, succ (fromInteger my))
 
-#if __GLASGOW_HASKELL__ >= 710
 -- | Bidirectional abstract constructor.
 -- Invalid months of year will be clipped to the correct range.
 pattern YearMonth :: Year -> MonthOfYear -> Month
 pattern YearMonth y my <- (toYearMonth -> (y, my))
   where YearMonth y my = fromYearMonth y my
 
-#if __GLASGOW_HASKELL__ >= 802
 {-# COMPLETE YearMonth #-}
-#endif
-#endif
 
 -- | Part of 'MonthDay' pattern
 toMonthDay :: Day -> (Month,DayOfMonth)
@@ -184,17 +172,12 @@ fromMonthDayValid :: Month -> DayOfMonth -> Maybe Day
 fromMonthDayValid m dm = case toYearMonth m of
     (y, my) -> fromGregorianValid y my dm
 
-#if __GLASGOW_HASKELL__ >= 710
 -- | Bidirectional abstract constructor.
 -- Invalid days of month will be clipped to the correct range.
 pattern MonthDay :: Month -> DayOfMonth -> Day
 pattern MonthDay m dm <- (toMonthDay -> (m,dm)) where
     MonthDay (YearMonth y my) dm = fromGregorian y my dm
 
-
-#if __GLASGOW_HASKELL__ >= 802
 {-# COMPLETE MonthDay #-}
-#endif
-#endif
 
 #endif

src/Data/Time/Calendar/Month/Compat.hs

@@ -1,12 +1,8 @@
 {-# 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,
@@ -23,7 +19,6 @@ import Data.Time.Calendar.Types
 
 {-
 #if !MIN_VERSION_time(1,12,0)
-#if __GLASGOW_HASKELL__ >= 710
 pattern January :: MonthOfYear
 pattern January = 1
 
@@ -61,9 +56,6 @@ pattern November = 11
 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
 -}

src/Data/Time/Calendar/MonthDay/Compat.hs

@@ -1,15 +1,11 @@
 {-# LANGUAGE CPP #-}
-#if __GLASGOW_HASKELL__ >= 710
 {-# LANGUAGE PatternSynonyms #-}
 {-# LANGUAGE ViewPatterns #-}
-#endif
 module Data.Time.Calendar.OrdinalDate.Compat (
     Day, Year, DayOfYear, WeekOfYear,
     toOrdinalDate,
     fromOrdinalDate,
-#if __GLASGOW_HASKELL__ >= 710
     pattern YearDay,
-#endif
     fromOrdinalDateValid,
     showOrdinalDate,
     isLeapYear,
@@ -24,11 +20,7 @@ module Data.Time.Calendar.OrdinalDate.Compat (
 import Data.Time.Orphans ()
 
 import Data.Time.Calendar.OrdinalDate hiding (fromSundayStartWeekValid)
-#if MIN_VERSION_time(1,6,0)
 import Data.Time.Calendar.OrdinalDate (fromSundayStartWeekValid)
-#else
-import Data.Time.Calendar.Private
-#endif
 
 #if !MIN_VERSION_time(1,11,0)
 import Data.Time.Calendar
@@ -37,46 +29,12 @@ import Data.Time.Calendar.Types
 
 #if !MIN_VERSION_time(1,11,0)
 
-#if __GLASGOW_HASKELL__ >= 710
 -- | Bidirectional abstract constructor for ISO 8601 Ordinal Date format.
 -- Invalid day numbers will be clipped to the correct range (1 to 365 or 366).
 pattern YearDay :: Year -> DayOfYear -> Day
 pattern YearDay y d <- (toOrdinalDate -> (y,d)) where
     YearDay y d = fromOrdinalDate y d
 
-#if __GLASGOW_HASKELL__ >= 802
 {-# COMPLETE YearDay #-}
-#endif
-#endif
-
-#endif
 
-#if !MIN_VERSION_time(1,6,0)
-fromSundayStartWeekValid ::
-       Year -- ^ Year.
-    -> WeekOfYear -- ^ Sunday-starting week number (as @%U@ in 'Data.Time.Format.formatTime').
-    -> Int -- ^ Day of week.
-                               -- Sunday is 0, Saturday is 6 (as @%w@ in 'Data.Time.Format.formatTime').
-    -> Maybe Day
-fromSundayStartWeekValid year w d = do
-    d' <- clipValid 0 6 d
-    let
-        -- first day of the year
-        firstDay = fromOrdinalDate year 1
-        -- 0-based week of year
-        zbFirstSunday = (4 - toModifiedJulianDay firstDay) `mod` 7
-        -- 0-based week number
-        zbWeek = w - 1
-        -- 0-based day of week
-        zbDay = d'
-        -- 0-based day in year
-        zbYearDay = zbFirstSunday + 7 * toInteger zbWeek + toInteger zbDay
-    zbYearDay' <-
-        clipValid
-            0
-            (if isLeapYear year
-                 then 365
-                 else 364)
-            zbYearDay
-    return $ addDays zbYearDay' firstDay
 #endif

src/Data/Time/Calendar/OrdinalDate/Compat.hs

@@ -1,15 +1,11 @@
 {-# LANGUAGE CPP                #-}
 {-# LANGUAGE DeriveDataTypeable #-}
-#if __GLASGOW_HASKELL__ >= 710
 {-# LANGUAGE PatternSynonyms    #-}
 {-# LANGUAGE ViewPatterns       #-}
-#endif
 module Data.Time.Calendar.Quarter.Compat (
     QuarterOfYear(..), addQuarters, diffQuarters,
     Quarter(..),
-#if __GLASGOW_HASKELL__ >= 710
     pattern YearQuarter,
-#endif
     monthOfYearQuarter,
     monthQuarter,
     dayQuarter,
@@ -122,16 +118,12 @@ addQuarters n (MkQuarter a) = MkQuarter $ a + n
 diffQuarters :: Quarter -> Quarter -> Integer
 diffQuarters (MkQuarter a) (MkQuarter b) = a - b
 
-#if __GLASGOW_HASKELL__ >= 710
 -- | Bidirectional abstract constructor.
 pattern YearQuarter :: Year -> QuarterOfYear -> Quarter
 pattern YearQuarter y qy <- (toYearQuarter -> (y, qy))
   where YearQuarter y qy = fromYearQuarter y qy
 
-#if __GLASGOW_HASKELL__ >= 802
 {-# COMPLETE YearQuarter #-}
-#endif
-#endif
 
 monthOfYearQuarter :: MonthOfYear -> QuarterOfYear
 monthOfYearQuarter my | my <= 3 = Q1