From b83c5d53be21c03004ebb65d1dc9fe1f841a2a3c Mon Sep 17 00:00:00 2001
From: Daniel Gröber <dxld@darkboxed.org>
Date: Sun, 1 Dec 2013 21:12:40 +0100
Subject: Fix building with aeson >= 0.6.2.0

deriveJSON now takes an Option record instead of a single function. It might be
nicer to define a function that takes the fieldLabelModifier function rather
than doing it inline everywhere but I didn't know where a good place to put that
would be.
---
 src/Data/Torrent.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/Data/Torrent.hs')

diff --git a/src/Data/Torrent.hs b/src/Data/Torrent.hs
index b3ac7586..7469d621 100644
--- a/src/Data/Torrent.hs
+++ b/src/Data/Torrent.hs
@@ -123,7 +123,7 @@ data InfoDict = InfoDict
     --   BEP 27: <http://www.bittorrent.org/beps/bep_0027.html>
   } deriving (Show, Read, Eq, Typeable)
 
-$(deriveJSON (L.map Char.toLower . L.dropWhile isLower) ''InfoDict)
+$(deriveJSON defaultOptions { fieldLabelModifier =  (L.map Char.toLower . L.dropWhile isLower) } ''InfoDict)
 
 makeLensesFor
   [ ("idInfoHash"  , "infohash"  )
@@ -239,7 +239,7 @@ instance ToJSON NominalDiffTime where
 instance FromJSON NominalDiffTime where
   parseJSON v = utcTimeToPOSIXSeconds <$> parseJSON v
 
-$(deriveJSON (L.map Char.toLower . L.dropWhile isLower) ''Torrent)
+$(deriveJSON defaultOptions { fieldLabelModifier =  (L.map Char.toLower . L.dropWhile isLower) } ''Torrent)
 
 makeLensesFor
   [ ("tAnnounce"    , "announce"    )
-- 
cgit v1.2.3


From 5dc7a19e42da1ee1cc3570ca74a55c32d7d243e0 Mon Sep 17 00:00:00 2001
From: Daniel Gröber <dxld@darkboxed.org>
Date: Sun, 1 Dec 2013 21:19:35 +0100
Subject: Fix building with hashable >= 1.2

hashWithSalt is now the minimal implementation
---
 bittorrent.cabal                      | 2 +-
 src/Data/Torrent.hs                   | 4 ++--
 src/Data/Torrent/InfoHash.hs          | 4 ++--
 src/Network/BitTorrent/Core/PeerId.hs | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/Data/Torrent.hs')

diff --git a/bittorrent.cabal b/bittorrent.cabal
index 7f5a42ae..762bff01 100644
--- a/bittorrent.cabal
+++ b/bittorrent.cabal
@@ -113,7 +113,7 @@ library
 
                        -- Hashing
                      , cryptohash == 0.10.*
-                     , hashable
+                     , hashable >= 1.2
 
                        -- Codecs & Serialization
                      , aeson >= 0.6.2.0
diff --git a/src/Data/Torrent.hs b/src/Data/Torrent.hs
index 7469d621..ce919907 100644
--- a/src/Data/Torrent.hs
+++ b/src/Data/Torrent.hs
@@ -137,8 +137,8 @@ instance NFData InfoDict where
   rnf InfoDict {..} = rnf idLayoutInfo
 
 instance Hashable InfoDict where
-  hash = Hashable.hash . idInfoHash
-  {-# INLINE hash #-}
+  hashWithSalt = Hashable.hashUsing idInfoHash
+  {-# INLINE hashWithSalt #-}
 
 -- | Smart constructor: add a info hash to info dictionary.
 infoDictionary :: LayoutInfo -> PieceInfo -> Bool -> InfoDict
diff --git a/src/Data/Torrent/InfoHash.hs b/src/Data/Torrent/InfoHash.hs
index d840ac87..4d49fcb7 100644
--- a/src/Data/Torrent/InfoHash.hs
+++ b/src/Data/Torrent/InfoHash.hs
@@ -70,8 +70,8 @@ instance Default InfoHash where
 
 -- | Hash raw bytes. (no encoding)
 instance Hashable InfoHash where
-  hash (InfoHash ih) = Hashable.hash ih
-  {-# INLINE hash #-}
+  hashWithSalt s (InfoHash ih) = hashWithSalt s ih
+  {-# INLINE hashWithSalt #-}
 
 -- | Convert to\/from raw bencoded string. (no encoding)
 instance BEncode InfoHash where
diff --git a/src/Network/BitTorrent/Core/PeerId.hs b/src/Network/BitTorrent/Core/PeerId.hs
index 148f550d..1b4409a8 100644
--- a/src/Network/BitTorrent/Core/PeerId.hs
+++ b/src/Network/BitTorrent/Core/PeerId.hs
@@ -74,8 +74,8 @@ peerIdLen :: Int
 peerIdLen = 20
 
 instance Hashable PeerId where
-  hash = hash . getPeerId
-  {-# INLINE hash #-}
+  hashWithSalt = hashUsing getPeerId
+  {-# INLINE hashWithSalt #-}
 
 instance Serialize PeerId where
   put = putByteString . getPeerId
-- 
cgit v1.2.3