From 4920df6573bfb9ca15a4bde12d5b244654ac3f06 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Tue, 4 Feb 2020 12:03:30 -0400
Subject: [PATCH] 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.
---
 CHANGELOG                                                 | 6 ++++++
 Database/ContentIdentifier.hs                             | 2 ++
 Database/Export.hs                                        | 2 ++
 Database/Fsck.hs                                          | 2 ++
 Database/Keys/SQL.hs                                      | 2 ++
 .../comment_3_627876a558898bb9f622b80dbacee051._comment   | 8 ++++++++
 6 files changed, 22 insertions(+)
 create mode 100644 doc/bugs/brew_install_git-annex_failed/comment_3_627876a558898bb9f622b80dbacee051._comment

diff --git a/CHANGELOG b/CHANGELOG
index 197afcaede..a7e451d490 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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
 
   * add: --force-annex/--force-git options make it easier to override
diff --git a/Database/ContentIdentifier.hs b/Database/ContentIdentifier.hs
index 024825eaec..0ff296e56b 100644
--- a/Database/ContentIdentifier.hs
+++ b/Database/ContentIdentifier.hs
@@ -10,6 +10,8 @@
 {-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE UndecidableInstances #-}
+{-# LANGUAGE DerivingStrategies #-}
+{-# LANGUAGE StandaloneDeriving #-}
 
 module Database.ContentIdentifier (
 	ContentIdentifierHandle,
diff --git a/Database/Export.hs b/Database/Export.hs
index 28784ac45b..67cb1c62b6 100644
--- a/Database/Export.hs
+++ b/Database/Export.hs
@@ -10,6 +10,8 @@
 {-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE UndecidableInstances #-}
+{-# LANGUAGE DerivingStrategies #-}
+{-# LANGUAGE StandaloneDeriving #-}
 
 module Database.Export (
 	ExportHandle,
diff --git a/Database/Fsck.hs b/Database/Fsck.hs
index 09f9222be3..88416f8a69 100644
--- a/Database/Fsck.hs
+++ b/Database/Fsck.hs
@@ -10,6 +10,8 @@
 {-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE UndecidableInstances #-}
+{-# LANGUAGE DerivingStrategies #-}
+{-# LANGUAGE StandaloneDeriving #-}
 
 module Database.Fsck (
 	FsckHandle,
diff --git a/Database/Keys/SQL.hs b/Database/Keys/SQL.hs
index 99606bbad5..77029cc801 100644
--- a/Database/Keys/SQL.hs
+++ b/Database/Keys/SQL.hs
@@ -10,6 +10,8 @@
 {-# LANGUAGE MultiParamTypeClasses, GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE RankNTypes, ScopedTypeVariables #-}
 {-# LANGUAGE UndecidableInstances #-}
+{-# LANGUAGE DerivingStrategies #-}
+{-# LANGUAGE StandaloneDeriving #-}
 
 module Database.Keys.SQL where
 
diff --git a/doc/bugs/brew_install_git-annex_failed/comment_3_627876a558898bb9f622b80dbacee051._comment b/doc/bugs/brew_install_git-annex_failed/comment_3_627876a558898bb9f622b80dbacee051._comment
new file mode 100644
index 0000000000..373cb3e662
--- /dev/null
+++ b/doc/bugs/brew_install_git-annex_failed/comment_3_627876a558898bb9f622b80dbacee051._comment
@@ -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.
+"""]]