diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-11-09 12:47:05 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-11-09 12:47:05 -0400 |
| commit | ac57659e61f9743aebd35258e89752ced0040f9f (patch) | |
| tree | 4712861c73a7c7eb521d545cbfe61b9124d2fd49 /Annex | |
| parent | 0d594ee1cde0f0b523d66062bcf2d0b854b400dc (diff) | |
use unix-compat 0.5 on windows
That version has my patches for the problems that Utility.PosixFiles
was working around, so am able to get rid of that module now.
This will later allow bringing back the custom-setup stanza in the cabal
file. It will need to depend on unix-compat 0.5 on all OS's, which I'm
not ready to do yet.
This commit was sponsored by Nick Daly on Patreon.
Diffstat (limited to 'Annex')
| -rw-r--r-- | Annex/Content.hs | 2 | ||||
| -rw-r--r-- | Annex/Fixup.hs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Annex/Content.hs b/Annex/Content.hs index 0b665d4dc..2ba387105 100644 --- a/Annex/Content.hs +++ b/Annex/Content.hs @@ -50,6 +50,7 @@ module Annex.Content ( ) where import System.IO.Unsafe (unsafeInterleaveIO) +import System.PosixCompat.Files import qualified Data.Set as S import Annex.Common @@ -84,7 +85,6 @@ import Types.Key import Annex.UUID import Annex.InodeSentinal import Utility.InodeCache -import Utility.PosixFiles {- Checks if a given key's content is currently present. -} inAnnex :: Key -> Annex Bool diff --git a/Annex/Fixup.hs b/Annex/Fixup.hs index 6a14f22bc..4b5149d0a 100644 --- a/Annex/Fixup.hs +++ b/Annex/Fixup.hs @@ -15,11 +15,11 @@ import qualified Git.BuildVersion import Utility.Path import Utility.SafeCommand import Utility.Directory -import Utility.PosixFiles import Utility.Exception import System.IO import System.FilePath +import System.PosixCompat.Files import Data.List import Control.Monad import Control.Monad.IfElse |