haskell/stackage-server
1
0
Fork 0
mirror of https://github.com/commercialhaskell/stackage-server.git synced 2026-01-28 11:50:24 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compatibility with newer aeson

Browse Source
This commit is contained in:
Janus Troelsen 2023-06-24 23:24:24 +02:00
parent 25e12579dd
commit 03ca4b5255
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Settings.hs
View File

@ -11,6 +11,9 @@ module Settings where
import ClassyPrelude.Yesod import ClassyPrelude.Yesod
import Data.Aeson (Result(..), fromJSON, withObject, (.!=), (.:?)) 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.FileEmbed (embedFile)
import Data.Yaml (decodeEither', Parser) import Data.Yaml (decodeEither', Parser)
import Data.Yaml.Config import Data.Yaml.Config
@ -61,7 +64,11 @@ data DatabaseSettings
parseDatabase parseDatabase
:: Bool -- ^ is this dev? if so, allow default of SQLite :: Bool -- ^ is this dev? if so, allow default of SQLite
#if MIN_VERSION_aeson(2,0,0)
-> KeyMap Value
#else
-> HashMap Text Value -> HashMap Text Value
#endif
-> Parser DatabaseSettings -> Parser DatabaseSettings
parseDatabase isDev o = parseDatabase isDev o =
if isDev if isDev