Fix build with newest version of persistent-template.
This is untested because of rain, also I am operating from truncated copiler error messages in a bug report that also doesn't mention what the library version is. Still, it should work. May break builds with old ghc, in particular DerivingStrategies is I think fairly new? The pragmas could be ifdefed if necessary. Works with ghc 8.6.5.
This commit is contained in:
parent
ae2d42bad4
commit
4920df6573
6 changed files with 22 additions and 0 deletions
|
@ -1,3 +1,9 @@
|
||||||
|
git-annex (7.20200204) UNRELEASED; urgency=medium
|
||||||
|
|
||||||
|
* Fix build with newest version of persistent-template.
|
||||||
|
|
||||||
|
-- Joey Hess <id@joeyh.name> Tue, 04 Feb 2020 11:58:22 -0400
|
||||||
|
|
||||||
git-annex (7.20200202.7) upstream; urgency=medium
|
git-annex (7.20200202.7) upstream; urgency=medium
|
||||||
|
|
||||||
* add: --force-annex/--force-git options make it easier to override
|
* add: --force-annex/--force-git options make it easier to override
|
||||||
|
|
|
@ -10,6 +10,8 @@
|
||||||
{-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-}
|
{-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-}
|
||||||
{-# LANGUAGE RankNTypes #-}
|
{-# LANGUAGE RankNTypes #-}
|
||||||
{-# LANGUAGE UndecidableInstances #-}
|
{-# LANGUAGE UndecidableInstances #-}
|
||||||
|
{-# LANGUAGE DerivingStrategies #-}
|
||||||
|
{-# LANGUAGE StandaloneDeriving #-}
|
||||||
|
|
||||||
module Database.ContentIdentifier (
|
module Database.ContentIdentifier (
|
||||||
ContentIdentifierHandle,
|
ContentIdentifierHandle,
|
||||||
|
|
|
@ -10,6 +10,8 @@
|
||||||
{-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-}
|
{-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-}
|
||||||
{-# LANGUAGE RankNTypes #-}
|
{-# LANGUAGE RankNTypes #-}
|
||||||
{-# LANGUAGE UndecidableInstances #-}
|
{-# LANGUAGE UndecidableInstances #-}
|
||||||
|
{-# LANGUAGE DerivingStrategies #-}
|
||||||
|
{-# LANGUAGE StandaloneDeriving #-}
|
||||||
|
|
||||||
module Database.Export (
|
module Database.Export (
|
||||||
ExportHandle,
|
ExportHandle,
|
||||||
|
|
|
@ -10,6 +10,8 @@
|
||||||
{-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-}
|
{-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-}
|
||||||
{-# LANGUAGE RankNTypes #-}
|
{-# LANGUAGE RankNTypes #-}
|
||||||
{-# LANGUAGE UndecidableInstances #-}
|
{-# LANGUAGE UndecidableInstances #-}
|
||||||
|
{-# LANGUAGE DerivingStrategies #-}
|
||||||
|
{-# LANGUAGE StandaloneDeriving #-}
|
||||||
|
|
||||||
module Database.Fsck (
|
module Database.Fsck (
|
||||||
FsckHandle,
|
FsckHandle,
|
||||||
|
|
|
@ -10,6 +10,8 @@
|
||||||
{-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-}
|
{-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-}
|
||||||
{-# LANGUAGE RankNTypes, ScopedTypeVariables #-}
|
{-# LANGUAGE RankNTypes, ScopedTypeVariables #-}
|
||||||
{-# LANGUAGE UndecidableInstances #-}
|
{-# LANGUAGE UndecidableInstances #-}
|
||||||
|
{-# LANGUAGE DerivingStrategies #-}
|
||||||
|
{-# LANGUAGE StandaloneDeriving #-}
|
||||||
|
|
||||||
module Database.Keys.SQL where
|
module Database.Keys.SQL where
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,8 @@
|
||||||
|
[[!comment format=mdwn
|
||||||
|
username="joey"
|
||||||
|
subject="""comment 3"""
|
||||||
|
date="2020-02-04T15:56:00Z"
|
||||||
|
content="""
|
||||||
|
I think I've fixed this in master now, but have not been able to test the fix
|
||||||
|
yet since I don't have the bandwidth to upgrade.
|
||||||
|
"""]]
|
Loading…
Reference in a new issue