diff options
| author |  Mark Wright <markwright@internode.on.net> | 2011-11-26 23:39:47 +1100 |
|---|---|---|
| committer |  Joey Hess <joey@kitenet.net> | 2011-11-26 12:05:08 -0400 |
| commit | 041d32412535ecaba103806f95a7d74234034416 (patch) | |
| tree | 4bfec56dd401d36973faa600a44924d3512ac84a | |
| parent | afe9e78401f7842a41bc353b27036baa2e3046c2 (diff) | |
Remove haskell98 to build with ghc 7.2.2, also built with ghc 7.0.4
Signed-off-by: Joey Hess <joey@kitenet.net>
| -rw-r--r-- | Locations.hs | 4 | ||||
| -rw-r--r-- | Logs/Location.hs | 2 | ||||
| -rw-r--r-- | Utility/TempFile.hs | 2 | ||||
| -rw-r--r-- | git-annex.cabal | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/Locations.hs b/Locations.hs index 83897f488..3cb632aae 100644 --- a/Locations.hs +++ b/Locations.hs @@ -26,8 +26,8 @@ module Locations ( prop_idempotent_fileKey ) where -import Bits -import Word +import Data.Bits +import Data.Word import Data.Hash.MD5 import Common diff --git a/Logs/Location.hs b/Logs/Location.hs index ab29ffcad..cb21a2d1c 100644 --- a/Logs/Location.hs +++ b/Logs/Location.hs @@ -1,3 +1,5 @@ +{-# LANGUAGE BangPatterns #-} + {- git-annex location log - - git-annex keeps track of which repositories have the contents of annexed diff --git a/Utility/TempFile.hs b/Utility/TempFile.hs index 8d50dd8b2..3887b422b 100644 --- a/Utility/TempFile.hs +++ b/Utility/TempFile.hs @@ -7,7 +7,7 @@ module Utility.TempFile where -import IO (bracket) +import Control.Exception (bracket) import System.IO import System.Posix.Process hiding (executeFile) import System.Directory diff --git a/git-annex.cabal b/git-annex.cabal index f31c7a86e..c257eaff6 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -28,7 +28,7 @@ Description: Executable git-annex Main-Is: git-annex.hs - Build-Depends: haskell98, MissingH, hslogger, directory, filepath, + Build-Depends: MissingH, hslogger, directory, filepath, unix, containers, utf8-string, network, mtl, bytestring, old-locale, time, pcre-light, extensible-exceptions, dataenc, SHA, process, hS3, HTTP, base < 5, monad-control, json |