From b769f984172a5c002c8884709302417f48813a60 Mon Sep 17 00:00:00 2001 From: michaelt Date: Mon, 9 Nov 2015 20:51:33 -0500 Subject: [PATCH] update cabal file; rectify th conflict --- spoty.cabal | 10 +++++----- src/Utils/Spoty/Types.hs | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/spoty.cabal b/spoty.cabal index 50a27ee..f6ece7d 100644 --- a/spoty.cabal +++ b/spoty.cabal @@ -38,15 +38,15 @@ extra-source-files: Examples/Search.hs Examples/Albums.hs CHANGELOG library exposed-modules: Utils.Spoty, Utils.Spoty.Types build-depends: - aeson >= 0.7.0.6 && < 0.8.1, - base >= 4.6 && < 4.8, + aeson >= 0.7.0.6 && < 0.9.1, + base >= 4.6 && < 4.9, bytestring >= 0.10 && < 0.11, - lens >= 4.4 && < 4.5, + lens >= 4.4 && < 4.14, lens-aeson >= 1 && < 1.1, pipes >= 4.1 && < 4.2, - text >= 0.11 && < 1.2, + text >= 0.11 && < 1.3, unordered-containers >= 0.2.3 && < 0.3, - wreq >= 0.2 && < 0.3 + wreq >= 0.2 && < 0.4.1 hs-source-dirs: src default-language: Haskell2010 diff --git a/src/Utils/Spoty/Types.hs b/src/Utils/Spoty/Types.hs index 6d77feb..efa330c 100644 --- a/src/Utils/Spoty/Types.hs +++ b/src/Utils/Spoty/Types.hs @@ -262,7 +262,7 @@ instance FromJSON AlbumDetails where data Album = Album { - _albumType :: T.Text, + _albumSort :: T.Text, _albumAvailableMarkets :: [T.Text], _albumExternalURLs :: [ExternalURL], _albumHref :: T.Text, @@ -278,7 +278,7 @@ makeFields ''Album instance FromJSON Album where parseJSON (Object v) = Album <$> - v .: "album_type" <*> + v .: "album_sort" <*> v .: "available_markets" <*> v .: "external_urls" <*> v .: "href" <*>