Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

ghc-7.6 support #40

Merged
merged 2 commits into from

2 participants

@trofi

No description provided.

trofi added some commits
@trofi trofi .cabal: allow quickcheck-2.5
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
56e27d9
@trofi trofi src/Digest.hs: fix build failure against-0.10
src/Digest.hs:20:10:
    Duplicate instance declarations:
      instance NFData Digest -- Defined at src/Digest.hs:20:10
      instance NFData B.ByteString
        -- Defined in `Data.ByteString.Internal'

Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
8e5109b
@jlouis jlouis merged commit d53ea93 into jlouis:master
@jlouis
Owner

Thank you, this is pretty cool!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Nov 20, 2012
  1. @trofi

    .cabal: allow quickcheck-2.5

    trofi authored
    Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
  2. @trofi

    src/Digest.hs: fix build failure against-0.10

    trofi authored
    src/Digest.hs:20:10:
        Duplicate instance declarations:
          instance NFData Digest -- Defined at src/Digest.hs:20:10
          instance NFData B.ByteString
            -- Defined in `Data.ByteString.Internal'
    
    Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
This page is out of date. Refresh to see the latest.
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
Something went wrong with that request. Please try again.