diff options
| author | Sam Truzjan <pxqr.sta@gmail.com> | 2013-12-01 12:32:49 -0800 |
|---|---|---|
| committer | Sam Truzjan <pxqr.sta@gmail.com> | 2013-12-01 12:32:49 -0800 |
| commit | f4fcc6c1970ec8d63e185e49dff65a6bd77011ad (patch) | |
| tree | 5472de9cdb8afd6b15752f796ece829bf9e0316a /src/Data/Torrent/Block.hs | |
| parent | 2749007675a6ff28979fa793b48ffe910635c708 (diff) | |
| parent | 5dc7a19e42da1ee1cc3570ca74a55c32d7d243e0 (diff) | |
Merge pull request #2 from DanielG/master
Fix building with aeson >= 0.6.2.0
Diffstat (limited to 'src/Data/Torrent/Block.hs')
| -rw-r--r-- | src/Data/Torrent/Block.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Data/Torrent/Block.hs b/src/Data/Torrent/Block.hs index 37889a7a..fd12b7a0 100644 --- a/src/Data/Torrent/Block.hs +++ b/src/Data/Torrent/Block.hs | |||
| @@ -97,7 +97,7 @@ data BlockIx = BlockIx { | |||
| 97 | , ixLength :: {-# UNPACK #-} !BlockSize | 97 | , ixLength :: {-# UNPACK #-} !BlockSize |
| 98 | } deriving (Show, Eq) | 98 | } deriving (Show, Eq) |
| 99 | 99 | ||
| 100 | $(deriveJSON (L.map toLower . L.dropWhile isLower) ''BlockIx) | 100 | $(deriveJSON defaultOptions { fieldLabelModifier = (L.map toLower . L.dropWhile isLower) } ''BlockIx) |
| 101 | 101 | ||
| 102 | getInt :: S.Get Int | 102 | getInt :: S.Get Int |
| 103 | getInt = fromIntegral <$> S.getWord32be | 103 | getInt = fromIntegral <$> S.getWord32be |