Fix build with directory-1.2.6.2.

It started exporting a isSymbolicLink which supports windows. But,
git-annex does no use symlinks on windows yet and this conflicts with the
function by the same name from unix-compat, so hide it.

Annex/Fixup.hs

@@ -20,7 +20,7 @@ import Utility.Exception
 
 import System.IO
 import System.FilePath
-import System.Directory
+import System.Directory hiding (isSymbolicLink)
 import Data.List
 import Control.Monad
 import Control.Monad.IfElse

Assistant/Install/AutoStart.hs

@@ -14,7 +14,7 @@ import Utility.FreeDesktop
 #ifdef darwin_HOST_OS
 import Utility.OSX
 import Utility.Path
-import System.Directory
+import System.Directory hiding (isSymbolicLink)
 #endif
 
 installAutoStart :: FilePath -> FilePath -> IO ()

Build/Configure.hs

@@ -4,7 +4,7 @@
 
 module Build.Configure where
 
-import System.Directory
+import System.Directory hiding (isSymbolicLink)
 import Control.Applicative
 import System.Environment (getArgs)
 import Control.Monad.IfElse

Build/DesktopFile.hs

@@ -20,7 +20,7 @@ import Utility.OSX
 import Assistant.Install.AutoStart
 import Assistant.Install.Menu
 
-import System.Directory
+import System.Directory hiding (isSymbolicLink)
 import System.Environment
 #ifndef mingw32_HOST_OS
 import System.Posix.User

Build/EvilLinker.hs

@@ -15,7 +15,7 @@ import Text.Parsec
 import Text.Parsec.String
 import Control.Applicative ((<$>))
 import Control.Monad
-import System.Directory
+import System.Directory hiding (isSymbolicLink)
 import Data.Maybe
 import Data.List
 

Build/EvilSplicer.hs

@@ -39,7 +39,7 @@ import Data.String.Utils
 import Data.Char
 import System.Environment
 import System.FilePath
-import System.Directory
+import System.Directory hiding (isSymbolicLink)
 import System.IO
 import Control.Monad
 import Prelude hiding (log)

Build/LinuxMkLibs.hs

@@ -12,7 +12,7 @@ module Main where
 import System.Environment
 import Data.Maybe
 import System.FilePath
-import System.Directory
+import System.Directory hiding (isSymbolicLink)
 import Control.Monad
 import Data.List
 import System.Posix.Files

Build/NullSoftInstaller.hs

@@ -21,7 +21,7 @@
 {-# LANGUAGE OverloadedStrings, FlexibleContexts #-}
 
 import Development.NSIS
-import System.Directory
+import System.Directory hiding (isSymbolicLink)
 import System.FilePath
 import Control.Monad
 import Control.Applicative

Build/OSXMkLibs.hs

@@ -10,7 +10,7 @@ module Main where
 import System.Environment (getArgs)
 import Data.Maybe
 import System.FilePath
-import System.Directory
+import System.Directory hiding (isSymbolicLink)
 import Control.Monad
 import Control.Monad.IfElse
 import Data.List

Build/Standalone.hs

@@ -12,7 +12,7 @@ module Main where
 import Control.Monad.IfElse
 import System.Environment
 import System.FilePath
-import System.Directory
+import System.Directory hiding (isSymbolicLink)
 import Control.Monad
 import Build.BundledPrograms
 

Build/TestConfig.hs

@@ -10,7 +10,7 @@ import Utility.SafeCommand
 
 import System.IO
 import System.FilePath
-import System.Directory
+import System.Directory hiding (isSymbolicLink)
 
 type ConfigKey = String
 data ConfigValue =

Build/Version.hs

@@ -6,7 +6,7 @@ module Build.Version where
 
 import Data.List
 import System.Environment
-import System.Directory
+import System.Directory hiding (isSymbolicLink)
 import Data.Char
 import System.Process
 import Control.Applicative

Common.hs

@@ -14,7 +14,7 @@ import Data.Monoid as X
 import Data.Default as X
 
 import System.FilePath as X
-import System.Directory as X
+import System.Directory as X hiding (isSymbolicLink)
 import System.IO as X hiding (FilePath)
 #ifndef mingw32_HOST_OS
 import System.Posix.IO as X hiding (createPipe)

Setup.hs

@@ -12,7 +12,7 @@ import Distribution.Verbosity (Verbosity)
 import System.FilePath
 import Control.Applicative
 import Control.Monad
-import System.Directory
+import System.Directory hiding (isSymbolicLink)
 import Data.List
 import Control.Exception
 

Utility/Directory.hs

@@ -11,7 +11,7 @@
 module Utility.Directory where
 
 import System.IO.Error
-import System.Directory
+import System.Directory hiding (isSymbolicLink)
 import Control.Monad
 import System.FilePath
 import Control.Applicative

Utility/FreeDesktop.hs

@@ -35,7 +35,7 @@ import Utility.Process
 import Utility.PartialPrelude
 
 import System.Environment
-import System.Directory
+import System.Directory hiding (isSymbolicLink)
 import System.FilePath
 import Data.List
 import Data.String.Utils

Utility/LinuxMkLibs.hs

@@ -14,7 +14,7 @@ import Utility.Monad
 import Utility.Path
 
 import Data.Maybe
-import System.Directory
+import System.Directory hiding (isSymbolicLink)
 import System.FilePath
 import Data.List.Utils
 import System.Posix.Files

Utility/LockFile/PidLock.hs

@@ -34,7 +34,7 @@ import Data.List
 import Network.BSD
 import System.FilePath
 import Data.Hash.MD5
-import System.Directory
+import System.Directory hiding (isSymbolicLink)
 import Control.Applicative
 import Prelude
 

Utility/Path.hs

@@ -12,7 +12,7 @@ module Utility.Path where
 
 import Data.String.Utils
 import System.FilePath
-import System.Directory
+import System.Directory hiding (isSymbolicLink)
 import Data.List
 import Data.Maybe
 import Data.Char

Utility/Tmp.hs

@@ -11,7 +11,7 @@
 module Utility.Tmp where
 
 import System.IO
-import System.Directory
+import System.Directory hiding (isSymbolicLink)
 import Control.Monad.IfElse
 import System.FilePath
 import Control.Monad.IO.Class

debian/changelog

@@ -1,3 +1,9 @@
+git-annex (6.20160420) UNRELEASED; urgency=medium
+
+  * Fix build with directory-1.2.6.2.
+
+ -- Joey Hess <id@joeyh.name>  Thu, 28 Apr 2016 13:17:04 -0400
+
 git-annex (6.20160419) unstable; urgency=medium
 
   * Fix bug that prevented resuming of uploads to encrypted special remotes