diff options
author | Daniel Gröber <dxld@darkboxed.org> | 2013-12-01 21:12:40 +0100 |
---|---|---|
committer | Daniel Gröber <dxld@darkboxed.org> | 2013-12-01 21:12:40 +0100 |
commit | b83c5d53be21c03004ebb65d1dc9fe1f841a2a3c (patch) | |
tree | 12d58df47e8b1a52173c72e97d29d3b8046fa309 /src/Data/Torrent/Layout.hs | |
parent | 2749007675a6ff28979fa793b48ffe910635c708 (diff) |
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.
Diffstat (limited to 'src/Data/Torrent/Layout.hs')
-rw-r--r-- | src/Data/Torrent/Layout.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Data/Torrent/Layout.hs b/src/Data/Torrent/Layout.hs index 8f35772d..d39c6c04 100644 --- a/src/Data/Torrent/Layout.hs +++ b/src/Data/Torrent/Layout.hs | |||
@@ -125,7 +125,7 @@ data FileInfo a = FileInfo { | |||
125 | , Functor, Foldable | 125 | , Functor, Foldable |
126 | ) | 126 | ) |
127 | 127 | ||
128 | $(deriveJSON (L.map Char.toLower . L.dropWhile isLower) ''FileInfo) | 128 | $(deriveJSON defaultOptions { fieldLabelModifier = (L.map Char.toLower . L.dropWhile isLower) } ''FileInfo) |
129 | 129 | ||
130 | makeLensesFor | 130 | makeLensesFor |
131 | [ ("fiLength", "fileLength") | 131 | [ ("fiLength", "fileLength") |
@@ -210,7 +210,7 @@ data LayoutInfo | |||
210 | , liDirName :: !ByteString | 210 | , liDirName :: !ByteString |
211 | } deriving (Show, Read, Eq, Typeable) | 211 | } deriving (Show, Read, Eq, Typeable) |
212 | 212 | ||
213 | $(deriveJSON (L.map Char.toLower . L.dropWhile isLower) ''LayoutInfo) | 213 | $(deriveJSON defaultOptions { fieldLabelModifier = (L.map Char.toLower . L.dropWhile isLower) } ''LayoutInfo) |
214 | 214 | ||
215 | makeLensesFor | 215 | makeLensesFor |
216 | [ ("liFile" , "singleFile" ) | 216 | [ ("liFile" , "singleFile" ) |