LIB/GTK: use more recent library versions

src/HSFM/FileSystem/Errors.hs

@@ -51,8 +51,9 @@ import System.IO.Error
     catchIOError
   )
 
-import qualified System.Posix.Files.ByteString as PF
 import qualified System.Posix.Directory.ByteString as PFD
+import System.Posix.FilePath
+import qualified System.Posix.Files.ByteString as PF
 
 
 data FmIOException = FileDoesNotExist ByteString
@@ -146,7 +147,7 @@ throwSameFile fp1 fp2 = do
                        (\_ -> fmap P.fromAbs
                        $ (\x -> maybe x (\y -> x P.</> y) $ P.basename fp2)
                                 <$> (P.canonicalizePath $ P.dirname fp2))
-  when (P.equalFilePath fp1' fp2') (throw $ SameFile fp1' fp2')
+  when (equalFilePath fp1' fp2') (throw $ SameFile fp1' fp2')
 
 
 -- |Checks whether the destination directory is contained

src/HSFM/FileSystem/FileOperations.hs

@@ -82,11 +82,6 @@ import HSFM.FileSystem.Errors
 import HSFM.FileSystem.FileType
 import HSFM.Utils.IO
 import Prelude hiding (readFile)
-import Network.Sendfile
-  (
-    sendfileFd
-  , FileRange(EntireFile)
-  )
 import System.Posix.Directory.ByteString
   (
     createDirectory
@@ -114,6 +109,11 @@ import System.Posix.Files.ByteString
 import qualified System.Posix.Files.ByteString as PF
 import qualified "unix" System.Posix.IO.ByteString as SPI
 import qualified "unix-bytestring" System.Posix.IO.ByteString as SPB
+import System.Posix.IO.Sendfile.ByteString
+  (
+    sendfileFd
+  , FileRange(EntireFile)
+  )
 import qualified System.Posix.Process.ByteString as SPP
 import System.Posix.Types
   (
@@ -361,7 +361,7 @@ unsafeCopyFile cm from@RegFile{} to@Dir{} fn
                 bracket (SPI.openFd dest SPI.WriteOnly (Just fileM)
                                     SPI.defaultFileFlags)
                         SPI.closeFd
-                        $ \dfd -> sendfileFd dfd sfd EntireFile (return ())
+                        $ \dfd -> sendfileFd dfd sfd EntireFile
     -- low-level copy operation utilizing read(2)/write(2)
     -- in case `sendFileCopy` fails/is unsupported
     fallbackCopy source dest =

src/HSFM/FileSystem/FileType.hs

@@ -59,6 +59,7 @@ import System.IO.Error
   , isDoesNotExistErrorType
   )
 import qualified System.Posix.Directory.ByteString as PFD
+import System.Posix.Directory.Traversals (realpath)
 import qualified System.Posix.Files.ByteString as PF
 import System.Posix.Types
   (
@@ -310,7 +311,7 @@ readFile ff p =
             -- TODO: could it happen that too many '..' lead
             -- to something like '/' after normalization?
             let sfp = (P.fromAbs . P.dirname $ p') `P.combine` x
-            rsfp <- P.realPath sfp
+            rsfp <- realpath sfp
             readFile ff =<< P.parseAbs rsfp
           return $ SymLink p' fv resolvedSyml x
       | PF.isDirectory       fs = return $ Dir       p' fv