split out module to work around badly named symbol in directory-1.2.6.2
Sadly my bug report about this is not going to get fixed it seems, so I have to drag around a whole added module file just to deal with it. https://github.com/haskell/directory/issues/52
This commit is contained in:
parent
6427b2866c
commit
d9368afa54
2 changed files with 19 additions and 3 deletions
|
@ -6,15 +6,14 @@
|
||||||
-}
|
-}
|
||||||
|
|
||||||
{-# LANGUAGE CPP #-}
|
{-# LANGUAGE CPP #-}
|
||||||
{-# OPTIONS_GHC -fno-warn-tabs -w #-}
|
{-# OPTIONS_GHC -fno-warn-tabs #-}
|
||||||
|
|
||||||
module Utility.Directory (
|
module Utility.Directory (
|
||||||
module Utility.Directory,
|
module Utility.Directory,
|
||||||
module System.Directory
|
module Utility.SystemDirectory
|
||||||
) where
|
) where
|
||||||
|
|
||||||
import System.IO.Error
|
import System.IO.Error
|
||||||
import System.Directory hiding (isSymbolicLink)
|
|
||||||
import Control.Monad
|
import Control.Monad
|
||||||
import System.FilePath
|
import System.FilePath
|
||||||
import Control.Applicative
|
import Control.Applicative
|
||||||
|
@ -31,6 +30,7 @@ import Utility.SafeCommand
|
||||||
import Control.Monad.IfElse
|
import Control.Monad.IfElse
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
import Utility.SystemDirectory
|
||||||
import Utility.PosixFiles
|
import Utility.PosixFiles
|
||||||
import Utility.Tmp
|
import Utility.Tmp
|
||||||
import Utility.Exception
|
import Utility.Exception
|
||||||
|
|
16
Utility/SystemDirectory.hs
Normal file
16
Utility/SystemDirectory.hs
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
{- System.Directory without its conflicting isSymbolicLink
|
||||||
|
-
|
||||||
|
- Copyright 2016 Joey Hess <id@joeyh.name>
|
||||||
|
-
|
||||||
|
- License: BSD-2-clause
|
||||||
|
-}
|
||||||
|
|
||||||
|
-- Disable warnings because only some versions of System.Directory export
|
||||||
|
-- isSymbolicLink.
|
||||||
|
{-# OPTIONS_GHC -fno-warn-tabs -w #-}
|
||||||
|
|
||||||
|
module Utility.SystemDirectory (
|
||||||
|
module System.Directory
|
||||||
|
) where
|
||||||
|
|
||||||
|
import System.Directory hiding (isSymbolicLink)
|
Loading…
Add table
Add a link
Reference in a new issue