From 2dc3b0d1d226f79e8fe4f7b6f66df094a848e5f7 Mon Sep 17 00:00:00 2001 From: Teo Camarasu Date: Fri, 8 Nov 2024 19:13:40 +0000 Subject: [PATCH] Switch from template-haskell to template-haskell-lift --- lib/Data/Time/Calendar/CalendarDiffDays.hs | 2 +- lib/Data/Time/Calendar/Days.hs | 2 +- lib/Data/Time/Calendar/Month.hs | 2 +- lib/Data/Time/Calendar/Quarter.hs | 2 +- lib/Data/Time/Calendar/Week.hs | 2 +- lib/Data/Time/Calendar/WeekDate.hs | 2 +- lib/Data/Time/Clock/Internal/AbsoluteTime.hs | 2 +- lib/Data/Time/Clock/Internal/DiffTime.hs | 2 +- lib/Data/Time/Clock/Internal/NominalDiffTime.hs | 2 +- lib/Data/Time/Clock/Internal/SystemTime.hs | 2 +- lib/Data/Time/Clock/Internal/UTCTime.hs | 2 +- lib/Data/Time/Clock/Internal/UniversalTime.hs | 2 +- time.cabal | 4 ++-- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lib/Data/Time/Calendar/CalendarDiffDays.hs b/lib/Data/Time/Calendar/CalendarDiffDays.hs index bbc8f48c..3e3291da 100644 --- a/lib/Data/Time/Calendar/CalendarDiffDays.hs +++ b/lib/Data/Time/Calendar/CalendarDiffDays.hs @@ -5,7 +5,7 @@ module Data.Time.Calendar.CalendarDiffDays where import Control.DeepSeq import Data.Data import GHC.Generics -import Language.Haskell.TH.Syntax qualified as TH +import Language.Haskell.TH.Lift qualified as TH data CalendarDiffDays = CalendarDiffDays { cdMonths :: Integer diff --git a/lib/Data/Time/Calendar/Days.hs b/lib/Data/Time/Calendar/Days.hs index 54532df4..a629c5ce 100644 --- a/lib/Data/Time/Calendar/Days.hs +++ b/lib/Data/Time/Calendar/Days.hs @@ -7,7 +7,7 @@ import Data.Data import Data.Ix import Data.Time.Calendar.Private import GHC.Generics -import Language.Haskell.TH.Syntax qualified as TH +import Language.Haskell.TH.Lift qualified as TH -- | The Modified Julian Day is a standard count of days, with zero being the day 1858-11-17. newtype Day = ModifiedJulianDay diff --git a/lib/Data/Time/Calendar/Month.hs b/lib/Data/Time/Calendar/Month.hs index f3fcb6f1..be1e90bf 100644 --- a/lib/Data/Time/Calendar/Month.hs +++ b/lib/Data/Time/Calendar/Month.hs @@ -20,7 +20,7 @@ import Data.Time.Calendar.Gregorian import Data.Time.Calendar.Private import Data.Time.Calendar.Types import GHC.Generics -import Language.Haskell.TH.Syntax qualified as TH +import Language.Haskell.TH.Lift qualified as TH import Text.ParserCombinators.ReadP import Text.Read diff --git a/lib/Data/Time/Calendar/Quarter.hs b/lib/Data/Time/Calendar/Quarter.hs index cbdbab7a..dcf9fb9d 100644 --- a/lib/Data/Time/Calendar/Quarter.hs +++ b/lib/Data/Time/Calendar/Quarter.hs @@ -23,7 +23,7 @@ import Data.Time.Calendar.Month import Data.Time.Calendar.Private import Data.Time.Calendar.Types import GHC.Generics -import Language.Haskell.TH.Syntax qualified as TH +import Language.Haskell.TH.Lift qualified as TH import Text.ParserCombinators.ReadP import Text.Read diff --git a/lib/Data/Time/Calendar/Week.hs b/lib/Data/Time/Calendar/Week.hs index 1166f447..952fec89 100644 --- a/lib/Data/Time/Calendar/Week.hs +++ b/lib/Data/Time/Calendar/Week.hs @@ -8,7 +8,7 @@ import Data.Fixed import Data.Ix import Data.Time.Calendar.Days import GHC.Generics -import Language.Haskell.TH.Syntax qualified as TH +import Language.Haskell.TH.Lift qualified as TH data DayOfWeek = Monday diff --git a/lib/Data/Time/Calendar/WeekDate.hs b/lib/Data/Time/Calendar/WeekDate.hs index 9c399b25..b56bc513 100644 --- a/lib/Data/Time/Calendar/WeekDate.hs +++ b/lib/Data/Time/Calendar/WeekDate.hs @@ -23,7 +23,7 @@ import Data.Time.Calendar.Days import Data.Time.Calendar.OrdinalDate import Data.Time.Calendar.Private import Data.Time.Calendar.Week -import Language.Haskell.TH.Syntax qualified as TH +import Language.Haskell.TH.Lift qualified as TH data FirstWeekType = -- | first week is the first whole week of the year diff --git a/lib/Data/Time/Clock/Internal/AbsoluteTime.hs b/lib/Data/Time/Clock/Internal/AbsoluteTime.hs index 4024dd35..54ff6649 100644 --- a/lib/Data/Time/Clock/Internal/AbsoluteTime.hs +++ b/lib/Data/Time/Clock/Internal/AbsoluteTime.hs @@ -7,7 +7,7 @@ import Control.DeepSeq import Data.Data import Data.Time.Calendar.Days import Data.Time.Clock.Internal.DiffTime -import Language.Haskell.TH.Syntax qualified as TH +import Language.Haskell.TH.Lift qualified as TH -- | AbsoluteTime is TAI, time as measured by a clock. newtype AbsoluteTime diff --git a/lib/Data/Time/Clock/Internal/DiffTime.hs b/lib/Data/Time/Clock/Internal/DiffTime.hs index 3d4773e3..b1893533 100644 --- a/lib/Data/Time/Clock/Internal/DiffTime.hs +++ b/lib/Data/Time/Clock/Internal/DiffTime.hs @@ -9,7 +9,7 @@ import Data.Fixed #ifdef __GLASGOW_HASKELL__ import GHC.Read #endif -import Language.Haskell.TH.Syntax qualified as TH +import Language.Haskell.TH.Lift qualified as TH import Text.ParserCombinators.ReadP import Text.Read diff --git a/lib/Data/Time/Clock/Internal/NominalDiffTime.hs b/lib/Data/Time/Clock/Internal/NominalDiffTime.hs index e7a89d99..18d41f36 100644 --- a/lib/Data/Time/Clock/Internal/NominalDiffTime.hs +++ b/lib/Data/Time/Clock/Internal/NominalDiffTime.hs @@ -10,7 +10,7 @@ import Data.Fixed import GHC.Read #endif import Data.Time.Clock.Internal.DiffTime -import Language.Haskell.TH.Syntax qualified as TH +import Language.Haskell.TH.Lift qualified as TH import Text.ParserCombinators.ReadP import Text.ParserCombinators.ReadPrec diff --git a/lib/Data/Time/Clock/Internal/SystemTime.hs b/lib/Data/Time/Clock/Internal/SystemTime.hs index 5400a18a..3c463900 100644 --- a/lib/Data/Time/Clock/Internal/SystemTime.hs +++ b/lib/Data/Time/Clock/Internal/SystemTime.hs @@ -23,7 +23,7 @@ import Data.Int (Int64) import Data.Time.Clock.Internal.DiffTime import Data.Word import GHC.Generics -import Language.Haskell.TH.Syntax qualified as TH +import Language.Haskell.TH.Lift qualified as TH #ifdef mingw32_HOST_OS import qualified System.Win32.Time as Win32 diff --git a/lib/Data/Time/Clock/Internal/UTCTime.hs b/lib/Data/Time/Clock/Internal/UTCTime.hs index 69d0b110..81914f16 100644 --- a/lib/Data/Time/Clock/Internal/UTCTime.hs +++ b/lib/Data/Time/Clock/Internal/UTCTime.hs @@ -7,7 +7,7 @@ import Data.Data import Data.Time.Calendar.Days import Data.Time.Clock.Internal.DiffTime import GHC.Generics -import Language.Haskell.TH.Syntax qualified as TH +import Language.Haskell.TH.Lift qualified as TH -- | This is the simplest representation of UTC. -- It consists of the day number, and a time offset from midnight. diff --git a/lib/Data/Time/Clock/Internal/UniversalTime.hs b/lib/Data/Time/Clock/Internal/UniversalTime.hs index e84002c6..6ab0471a 100644 --- a/lib/Data/Time/Clock/Internal/UniversalTime.hs +++ b/lib/Data/Time/Clock/Internal/UniversalTime.hs @@ -5,7 +5,7 @@ module Data.Time.Clock.Internal.UniversalTime where import Control.DeepSeq import Data.Data import GHC.Generics -import Language.Haskell.TH.Syntax qualified as TH +import Language.Haskell.TH.Lift qualified as TH -- | The Modified Julian Date is the day with the fraction of the day, measured from UT midnight. -- It's used to represent UT1, which is time as measured by the earth's rotation, adjusted for various wobbles. diff --git a/time.cabal b/time.cabal index 4bc385b0..9d2b2371 100644 --- a/time.cabal +++ b/time.cabal @@ -55,7 +55,7 @@ library base >= 4.19 && < 5, deepseq >= 1.1, if impl(ghc) - build-depends: template-haskell >= 2.17, + build-depends: template-haskell-lift >= 0.1 && <0.2, if os(windows) build-depends: Win32 exposed-modules: @@ -175,7 +175,7 @@ test-suite test-main tasty, tasty-hunit, tasty-quickcheck, - template-haskell + template-haskell-lift main-is: Main.hs other-modules: Test.Types