Skip to content
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.

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

Preliminary support for GHC 9.12.1 #2649

Merged
merged 1 commit into from
Mar 11, 2025
Merged
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
3 changes: 3 additions & 0 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,6 @@ if impl(ghc < 9.8)
packages:
./dhall-nix
./dhall-nixpkgs

if impl(ghc >= 9.12)
allow-newer: repline:containers
2 changes: 1 addition & 1 deletion dhall/dhall.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ Common common
repline >= 0.4.0.0 && < 0.5 ,
serialise >= 0.2.0.0 && < 0.3 ,
scientific >= 0.3.0.0 && < 0.4 ,
template-haskell >= 2.13.0.0 && < 2.23,
template-haskell >= 2.13.0.0 && < 2.24,
text >= 0.11.1.0 && < 2.2 ,
text-manipulate >= 0.2.0.1 && < 0.4 ,
text-short >= 0.1 && < 0.2 ,
Expand Down
2 changes: 2 additions & 0 deletions dhall/src/Dhall/Syntax/Instances/Lift.hs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ import qualified Data.Fixed as Fixed
#endif
import qualified Data.Time as Time

#if !MIN_VERSION_time(1,14,0)
deriving instance Lift Time.Day
#endif
deriving instance Lift Time.TimeOfDay
deriving instance Lift Time.TimeZone
#if !MIN_VERSION_template_haskell(2,21,0)
Expand Down
Loading