Permalink
Browse files

Merge pull request #40 from trofi/master

ghc-7.6 support
  • Loading branch information...
2 parents 7874f79 + 8e5109b commit d53ea9383b783c1b421882754980eb7c08507ef6 @jlouis committed Dec 4, 2012
Showing with 5 additions and 2 deletions.
  1. +1 −1 Combinatorrent.cabal
  2. +4 −1 src/Digest.hs
View
2 Combinatorrent.cabal
@@ -78,7 +78,7 @@ executable Combinatorrent
parsec < 4,
pretty,
PSQueue,
- QuickCheck == 2.4.*,
+ QuickCheck >= 2.4 && < 2.6,
random,
random-shuffle,
stm,
View
5 src/Digest.hs
@@ -1,5 +1,5 @@
-- | Simple abstraction for message digests
-{-# LANGUAGE TypeSynonymInstances #-}
+{-# LANGUAGE TypeSynonymInstances, CPP #-}
module Digest
( Digest
, digest
@@ -17,7 +17,10 @@ import qualified Crypto.Hash.SHA1 as SHA1
-- Consider newtyping this
type Digest = B.ByteString
+#if ! MIN_VERSION_bytestring(0,10,0)
+-- instance was introduced
instance NFData Digest
+#endif
digest :: L.ByteString -> B.ByteString
digest bs = {-# SCC "sha1_digest" #-} SHA1.hashlazy bs

0 comments on commit d53ea93

Please sign in to comment.