[commit: packages/directory] master: Restore Safe Haskell support with base < 4.8 (208d7fd)

git at git.haskell.org git at git.haskell.org
Fri Dec 18 09:52:12 UTC 2015


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/208d7fd2f2df69e9cb59ef1e88448e5d2d4a3ae0/directory

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

commit 208d7fd2f2df69e9cb59ef1e88448e5d2d4a3ae0
Author: Eric Mertens <emertens at gmail.com>
Date:   Fri Aug 14 14:57:23 2015 -0700

    Restore Safe Haskell support with base < 4.8
    
    Fixes #30


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

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

diff --git a/System/Directory.hs b/System/Directory.hs
index d5c8abd..b3c7fb8 100644
--- a/System/Directory.hs
+++ b/System/Directory.hs
@@ -1,5 +1,10 @@
 {-# LANGUAGE CPP, NondecreasingIndentation #-}
 
+#if !(MIN_VERSION_base(4,8,0))
+-- In base-4.8.0 the Foreign module became Safe
+{-# LANGUAGE Trustworthy #-}
+#endif
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  System.Directory
diff --git a/changelog.md b/changelog.md
index f3e6088..6cea768 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,6 +1,11 @@
 Changelog for the [`directory`][1] package
 ==========================================
 
+## 1.2.3.1
+
+  * Restore support for Safe Haskell with base < 4.8
+    ([#30](https://github.com/haskell/directory/issues/30))
+
 ## 1.2.3.0 (July 2015)
 
   * Add support for XDG Base Directory Specification
diff --git a/directory.cabal b/directory.cabal
index 72f7b0a..9f82899 100644
--- a/directory.cabal
+++ b/directory.cabal
@@ -1,5 +1,5 @@
 name:           directory
-version:        1.2.3.0
+version:        1.2.3.1
 -- NOTE: Don't forget to update ./changelog.md
 license:        BSD3
 license-file:   LICENSE



More information about the ghc-commits mailing list