From 03ca4b5255f47f9bbf265c59e6d23e99561c4f38 Mon Sep 17 00:00:00 2001 From: Janus Troelsen Date: Sat, 24 Jun 2023 23:24:24 +0200 Subject: [PATCH] Compatibility with newer aeson --- src/Settings.hs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/Settings.hs b/src/Settings.hs index 17c76a2..c3e6e72 100644 --- a/src/Settings.hs +++ b/src/Settings.hs @@ -11,6 +11,9 @@ module Settings where import ClassyPrelude.Yesod import Data.Aeson (Result(..), fromJSON, withObject, (.!=), (.:?)) +#if MIN_VERSION_aeson(2,0,0) +import Data.Aeson.KeyMap (KeyMap) +#endif import Data.FileEmbed (embedFile) import Data.Yaml (decodeEither', Parser) import Data.Yaml.Config @@ -61,7 +64,11 @@ data DatabaseSettings parseDatabase :: Bool -- ^ is this dev? if so, allow default of SQLite +#if MIN_VERSION_aeson(2,0,0) + -> KeyMap Value +#else -> HashMap Text Value +#endif -> Parser DatabaseSettings parseDatabase isDev o = if isDev