[commit: packages/directory] Mistuke-bump-win32-version-bounds, bgamari-patch-1, cbits, master: Import (<*>) on Windows when base < 4.8 (ba68962)

git at git.haskell.org git at git.haskell.org
Mon Apr 17 21:33:55 UTC 2017


Repository : ssh://git@git.haskell.org/directory

On branches: Mistuke-bump-win32-version-bounds,bgamari-patch-1,cbits,master
Link       : http://ghc.haskell.org/trac/ghc/changeset/ba689623323720f0ee1f8d0dbcf7c5499e8c3e06/directory

>---------------------------------------------------------------

commit ba689623323720f0ee1f8d0dbcf7c5499e8c3e06
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Sat Apr 30 13:48:25 2016 -0400

    Import (<*>) on Windows when base < 4.8
    
    Fixes #53.


>---------------------------------------------------------------

ba689623323720f0ee1f8d0dbcf7c5499e8c3e06
 System/Directory.hs | 3 +++
 changelog.md        | 5 +++++
 directory.cabal     | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/System/Directory.hs b/System/Directory.hs
index bec9149..19a322a 100644
--- a/System/Directory.hs
+++ b/System/Directory.hs
@@ -100,6 +100,9 @@ module System.Directory
 import Control.Exception (bracket, mask, onException)
 import Control.Monad ( when, unless )
 #ifdef mingw32_HOST_OS
+#if !MIN_VERSION_base(4, 8, 0)
+import Control.Applicative ((<*>))
+#endif
 import Data.Function (on)
 #endif
 #if !MIN_VERSION_base(4, 8, 0)
diff --git a/changelog.md b/changelog.md
index 83e1a4a..0d36c1a 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,6 +1,11 @@
 Changelog for the [`directory`][1] package
 ==========================================
 
+## 1.2.6.3 (April 2015)
+
+  * Add missing import of `(<*>)` on Windows for `base` earlier than 4.8.0.0
+    ([#53](https://github.com/haskell/directory/issues/53))
+
 ## 1.2.6.2 (April 2015)
 
   * Fix typo in file time functions when `utimensat` is not available and
diff --git a/directory.cabal b/directory.cabal
index 27f528f..18f0094 100644
--- a/directory.cabal
+++ b/directory.cabal
@@ -1,5 +1,5 @@
 name:           directory
-version:        1.2.6.2
+version:        1.2.6.3
 -- NOTE: Don't forget to update ./changelog.md
 license:        BSD3
 license-file:   LICENSE



More information about the ghc-commits mailing list