From f6d629e483f6290435186341f289a2ffedce71ee Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Fri, 28 Feb 2020 12:57:55 -0400
Subject: [PATCH] changelog and minor style

---
 CHANGELOG                   | 2 ++
 CmdLine/GitAnnex/Options.hs | 2 +-
 Command/Expire.hs           | 2 +-
 Command/Init.hs             | 2 +-
 Utility/HumanTime.hs        | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 18a8963432..5d930a1c81 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,8 @@ git-annex (8.20200227) UNRELEASED; urgency=medium
   * When external special remotes fail but neglect to provide an error
     message, say what request failed, which is better than displaying an
     empty error message to the user.
+  * Fix build with ghc 8.8 (MonadFail)
+    Thanks, Peter Simons
 
  -- Joey Hess <id@joeyh.name>  Thu, 27 Feb 2020 00:44:11 -0400
 
diff --git a/CmdLine/GitAnnex/Options.hs b/CmdLine/GitAnnex/Options.hs
index a9a36d76f1..2fe128e0e2 100644
--- a/CmdLine/GitAnnex/Options.hs
+++ b/CmdLine/GitAnnex/Options.hs
@@ -9,7 +9,7 @@
 
 module CmdLine.GitAnnex.Options where
 
-import Control.Monad.Fail as Fail ( MonadFail(..) )
+import Control.Monad.Fail as Fail (MonadFail(..))
 import Options.Applicative
 import qualified Data.Map as M
 
diff --git a/Command/Expire.hs b/Command/Expire.hs
index 37dc33883b..64cc882f8e 100644
--- a/Command/Expire.hs
+++ b/Command/Expire.hs
@@ -17,7 +17,7 @@ import Annex.VectorClock
 import qualified Remote
 import Utility.HumanTime
 
-import Control.Monad.Fail as Fail ( MonadFail(..) )
+import Control.Monad.Fail as Fail (MonadFail(..))
 import Data.Time.Clock.POSIX
 import qualified Data.Map as M
 
diff --git a/Command/Init.hs b/Command/Init.hs
index 879a1110f2..65bb05ca0b 100644
--- a/Command/Init.hs
+++ b/Command/Init.hs
@@ -13,7 +13,7 @@ import Annex.Version
 import Types.RepoVersion
 import qualified Annex.SpecialRemote
 
-import Control.Monad.Fail as Fail ( MonadFail(..) )
+import Control.Monad.Fail as Fail (MonadFail(..))
 import qualified Data.Map as M
 	
 cmd :: Command
diff --git a/Utility/HumanTime.hs b/Utility/HumanTime.hs
index d2e70f332f..d90143ec09 100644
--- a/Utility/HumanTime.hs
+++ b/Utility/HumanTime.hs
@@ -19,7 +19,7 @@ module Utility.HumanTime (
 import Utility.PartialPrelude
 import Utility.QuickCheck
 
-import Control.Monad.Fail as Fail ( MonadFail(..) )
+import Control.Monad.Fail as Fail (MonadFail(..))
 import qualified Data.Map as M
 import Data.Time.Clock
 import Data.Time.Clock.POSIX (POSIXTime)