From 9422e5cd5f4b163114a2311ec70f62fedc18f777 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 18 Nov 2016 12:59:05 -0400 Subject: Fix build with recent versions of cabal and ghc. --- CHANGELOG | 6 ++++++ Common.hs | 3 +-- git-repair.cabal | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index faa87c4..fa6f44d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,9 @@ +git-repair (1.20161118) UNRELEASED; urgency=medium + + * Fix build with recent versions of cabal and ghc. + + -- Joey Hess Fri, 18 Nov 2016 12:58:43 -0400 + git-repair (1.20161111) unstable; urgency=medium * git-repair.cabal: Add Setup-Depends. diff --git a/Common.hs b/Common.hs index a6c5d54..7710306 100644 --- a/Common.hs +++ b/Common.hs @@ -13,7 +13,6 @@ import Data.String.Utils as X hiding (join) import Data.Monoid as X import System.FilePath as X -import System.Directory as X import System.IO as X hiding (FilePath) #ifndef mingw32_HOST_OS import System.Posix.IO as X hiding (createPipe) @@ -25,12 +24,12 @@ import Utility.Exception as X import Utility.SafeCommand as X import Utility.Process as X import Utility.Path as X -import Utility.Directory as X import Utility.Monad as X import Utility.Data as X import Utility.Applicative as X import Utility.FileSystemEncoding as X import Utility.PosixFiles as X hiding (fileSize) import Utility.FileSize as X +import Utility.Directory as X import Utility.PartialPrelude as X diff --git a/git-repair.cabal b/git-repair.cabal index b8fc4ea..ccac779 100644 --- a/git-repair.cabal +++ b/git-repair.cabal @@ -1,5 +1,5 @@ Name: git-repair -Version: 1.20161111 +Version: 1.20161118 Cabal-Version: >= 1.8 License: GPL Maintainer: Joey Hess @@ -32,7 +32,7 @@ Flag network-uri custom-setup Setup-Depends: base (>= 4.5), hslogger, MissingH, unix-compat, process, unix, filepath, exceptions, bytestring, directory, IfElse, data-default, - Cabal + mtl, Cabal source-repository head type: git -- cgit v1.2.3