diff options
author | Benjamin Barenblat <bbarenblat@gmail.com> | 2022-01-19 13:42:04 -0500 |
---|---|---|
committer | Benjamin Barenblat <bbarenblat@gmail.com> | 2022-01-19 13:42:56 -0500 |
commit | 7b9f3501a40155ac05ea5b4fcda21e7f06d477ee (patch) | |
tree | 76caaaa2db7b085f94db07236841dc904ec39540 | |
parent | a9b9e5d0d72c2348580dbac5533b89a45abd8938 (diff) |
Support more language extensions for persistent
Recent persistent requires more language extensions to generate
entities. Turn them on where appropriate.
-rw-r--r-- | Database/Export.hs | 4 | ||||
-rw-r--r-- | Database/Fsck.hs | 4 | ||||
-rw-r--r-- | Database/Keys/SQL.hs | 5 | ||||
-rw-r--r-- | git-annex.cabal | 8 |
4 files changed, 17 insertions, 4 deletions
diff --git a/Database/Export.hs b/Database/Export.hs index a41048993..bc4e268b2 100644 --- a/Database/Export.hs +++ b/Database/Export.hs @@ -1,6 +1,7 @@ {- Sqlite database used for exports to special remotes. - - Copyright 2017 Joey Hess <id@joeyh.name> + - Copyright 2022 Benjamin Barenblat <bbarenblat@gmail.com> -: - Licensed under the GNU GPL version 3 or higher. -} @@ -8,7 +9,8 @@ {-# LANGUAGE QuasiQuotes, TypeFamilies, TemplateHaskell #-} {-# LANGUAGE OverloadedStrings, GADTs, FlexibleContexts #-} {-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-} -{-# LANGUAGE RankNTypes #-} +{-# LANGUAGE RankNTypes, DerivingStrategies, StandaloneDeriving #-} +{-# LANGUAGE UndecidableInstances, DataKinds, FlexibleInstances #-} {-# LANGUAGE CPP #-} module Database.Export ( diff --git a/Database/Fsck.hs b/Database/Fsck.hs index 1ce513dcf..f2fe1acf6 100644 --- a/Database/Fsck.hs +++ b/Database/Fsck.hs @@ -1,6 +1,7 @@ {- Sqlite database used for incremental fsck. - - Copyright 2015 Joey Hess <id@joeyh.name> + - Copyright 2022 Benjamin Barenblat <bbarenblat@gmail.com> -: - Licensed under the GNU GPL version 3 or higher. -} @@ -8,7 +9,8 @@ {-# LANGUAGE QuasiQuotes, TypeFamilies, TemplateHaskell #-} {-# LANGUAGE OverloadedStrings, GADTs, FlexibleContexts #-} {-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-} -{-# LANGUAGE RankNTypes #-} +{-# LANGUAGE RankNTypes, DerivingStrategies, StandaloneDeriving #-} +{-# LANGUAGE UndecidableInstances, DataKinds, FlexibleInstances #-} module Database.Fsck ( FsckHandle, diff --git a/Database/Keys/SQL.hs b/Database/Keys/SQL.hs index 77c1e4429..23a555554 100644 --- a/Database/Keys/SQL.hs +++ b/Database/Keys/SQL.hs @@ -1,6 +1,7 @@ {- Sqlite database of information about Keys - - Copyright 2015-2016 Joey Hess <id@joeyh.name> + - Copyright 2022 Benjamin Barenblat <bbarenblat@gmail.com> - - Licensed under the GNU GPL version 3 or higher. -} @@ -8,7 +9,9 @@ {-# LANGUAGE QuasiQuotes, TypeFamilies, TemplateHaskell #-} {-# LANGUAGE OverloadedStrings, GADTs, FlexibleContexts #-} {-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-} -{-# LANGUAGE RankNTypes, ScopedTypeVariables #-} +{-# LANGUAGE RankNTypes, ScopedTypeVariables, DerivingStrategies #-} +{-# LANGUAGE StandaloneDeriving, UndecidableInstances, DataKinds #-} +{-# LANGUAGE FlexibleInstances #-} module Database.Keys.SQL where diff --git a/git-annex.cabal b/git-annex.cabal index d51c73003..3e31b7aa1 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -265,7 +265,13 @@ Executable git-annex Extensions: PackageImports, LambdaCase -- Some things don't work with the non-threaded RTS. GHC-Options: -threaded - Other-Extensions: TemplateHaskell + Other-Extensions: + TemplateHaskell, + DerivingStrategies, + StandaloneDeriving, + UndecidableInstances, + DataKinds, + FlexibleInstances -- Fully optimize for production. if flag(Production) |