Commits (3)
......@@ -731,7 +731,11 @@ renamePath opath npath = (`ioeAddLocation` "renamePath") `modifyIOError` do
(`ioeSetFileName` opath) `modifyIOError` do
opath' <- toExtendedLengthPath <$> prependCurrentDirectory opath
npath' <- toExtendedLengthPath <$> prependCurrentDirectory npath
# if MIN_VERSION_Win32(2,6,0)
Win32.moveFileEx opath' (Just npath') Win32.mOVEFILE_REPLACE_EXISTING
# else
Win32.moveFileEx opath' npath' Win32.mOVEFILE_REPLACE_EXISTING
# endif
#else
Posix.rename opath npath
#endif
......@@ -1106,7 +1110,11 @@ makeRelativeToCurrentDirectory x = do
findExecutable :: String -> IO (Maybe FilePath)
findExecutable binary = do
#if defined(mingw32_HOST_OS)
# if MIN_VERSION_Win32(2,6,0)
Win32.searchPath Nothing binary (Just exeExtension)
# else
Win32.searchPath Nothing binary exeExtension
# endif
#else
path <- getPath
findFileWith isExecutable path (binary <.> exeExtension)
......
Changelog for the [`directory`][1] package
==========================================
## Unreleased
* Fix `Win32` version 2.6 compatibility.
## 1.3.1.3 (September 2017)
* Relax `Win32` version bounds to support 2.6.
## 1.3.1.2 (September 2017)
* Relax `base` version bounds to support 4.11.
......
name: directory
version: 1.3.1.2
version: 1.3.1.3
-- NOTE: Don't forget to update ./changelog.md
license: BSD3
license-file: LICENSE
......@@ -59,7 +59,7 @@ Library
time >= 1.4 && < 1.9,
filepath >= 1.3 && < 1.5
if os(windows)
build-depends: Win32 >= 2.2.2 && < 2.6
build-depends: Win32 >= 2.2.2 && < 2.7
else
build-depends: unix >= 2.5.1 && < 2.8
......