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.

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

Jump to bottom

Support template-haskell 2.20.0 and unix-compat 0.7 #2496

Closed
wants to merge 2 commits into from
Closed

Support template-haskell 2.20.0 and unix-compat 0.7 #2496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a74c8dc
compatibility with template-haskell-2.20.0
locallycompact Mar 28, 2023
b091521
System.PosixCompat.User -> System.Posix.User
locallycompact Mar 28, 2023
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
1 change: 1 addition & 0 deletions dhall/dhall.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,7 @@ Common common
th-lift-instances >= 0.1.13 && < 0.2 ,
time >= 1.9 && < 1.13,
transformers >= 0.5.2.0 && < 0.7 ,
unix >= 2.7 && < 2.9 ,
unix-compat >= 0.4.2 && < 0.7 ,
unordered-containers >= 0.1.3.0 && < 0.3 ,
uri-encode < 1.6 ,
Expand Down
2 changes: 1 addition & 1 deletion dhall/src/Dhall/DirectoryTree.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ import qualified Dhall.Util as Util
import qualified Prettyprinter.Render.String as Pretty
import qualified System.Directory as Directory
import qualified System.FilePath as FilePath
import qualified System.Posix.User as Posix
import qualified System.PosixCompat.Files as Posix
import qualified System.PosixCompat.User as Posix

{-| Attempt to transform a Dhall record into a directory tree where:

Expand Down
5 changes: 5 additions & 0 deletions dhall/src/Dhall/Syntax/Instances/Lift.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE DeriveLift #-}
{-# LANGUAGE StandaloneDeriving #-}

Expand All @@ -15,13 +16,17 @@ import Dhall.Syntax.Types
import Dhall.Syntax.Var
import Language.Haskell.TH.Syntax (Lift)

#if !MIN_VERSION_template_haskell(2,20,0)
import qualified Data.Fixed as Fixed
#endif
import qualified Data.Time as Time

deriving instance Lift Time.Day
deriving instance Lift Time.TimeOfDay
deriving instance Lift Time.TimeZone
#if !MIN_VERSION_template_haskell(2,20,0)
deriving instance Lift (Fixed.Fixed a)
#endif
deriving instance Lift Const
deriving instance Lift Var
deriving instance (Lift s, Lift a) => Lift (Binding s a)
Expand Down