Fix GHC 7.10 compilation errors

Fixes #1 * Remove -Werror * Use CPP to compile cleanly with 7.10 * Update stack.yaml to GHC 7.10
reiddraper · Jan 11, 2016 · 0c995e7 · 0c995e7
1 parent d837ba5
commit 0c995e7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/ordeal.cabal b/ordeal.cabal
@@ -15,7 +15,7 @@ cabal-version:       >=1.10
 
 library
   hs-source-dirs:      src
-  ghc-options: -Wall -Werror
+  ghc-options: -Wall
   exposed-modules:     Ordeal
   build-depends:       base >= 4.7 && < 5
                      , process

diff --git a/src/Ordeal.hs b/src/Ordeal.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedStrings #-}
 
 module Ordeal
@@ -8,7 +9,10 @@ import qualified Control.Concurrent.Async as Async
 import qualified Control.Concurrent.MVar as MVar
 import           Control.Concurrent.Chan (newChan, readChan)
 import           Control.Monad (forever, unless, void)
-import           Data.Monoid ((<>), mempty)
+#if __GLASGOW_HASKELL__ < 710
+import           Data.Monoid (mempty)
+#endif
+import           Data.Monoid ((<>))
 import qualified Data.Text as Text
 import qualified Data.Text.IO as TextIO
 import           System.FSNotify (WatchConfig(..), Debounce(..), withManagerConf, defaultConfig, watchTreeChan)

diff --git a/stack.yaml b/stack.yaml
@@ -3,4 +3,4 @@ packages:
 - '.'
 extra-deps:
     - hfsevents-0.1.5
-resolver: lts-2.20
+resolver: lts-3.22