Remove -text dep, make Postgresql work...
This commit is contained in:
parent
df52b8a340
commit
cfb11cca89
@ -30,8 +30,7 @@ data AppConfig e = AppConfig
|
||||
|
||||
-- | Information required to connect to a postgres database
|
||||
data PostgresConf = PostgresConf
|
||||
{ pgConnStr :: String
|
||||
, pgDatabase :: String
|
||||
{ pgConnStr :: Text
|
||||
, pgPoolSize :: Int
|
||||
}
|
||||
|
||||
@ -126,11 +125,11 @@ loadPostgresql env = withYamlEnvironment "config/postgresql.yml" env $ \e -> do
|
||||
-- TODO: default host/port?
|
||||
connparts <- forM ["user", "password", "host", "port"] $ \k -> do
|
||||
v <- lookupScalar k e
|
||||
return $ k ++ "=" ++ v
|
||||
return $ k ++ "=" ++ v ++ " "
|
||||
|
||||
conn <- return $ concat connparts
|
||||
|
||||
return $ PostgresConf conn db pool
|
||||
return $ PostgresConf (T.pack $ conn ++ " dbname=" ++ db) pool
|
||||
|
||||
-- | Load a @'SqliteConf'@ from @config\/sqlite.yml@.
|
||||
--
|
||||
|
||||
@ -38,7 +38,6 @@ library
|
||||
, shakespeare >= 0.10 && < 0.11
|
||||
, shakespeare-js >= 0.10 && < 0.11
|
||||
, shakespeare-css >= 0.10 && < 0.11
|
||||
, shakespeare-text >= 0.10 && < 0.11
|
||||
, blaze-builder >= 0.2.1 && < 0.4
|
||||
, transformers >= 0.2 && < 0.3
|
||||
, clientsession >= 0.7.2 && < 0.8
|
||||
|
||||
Loading…
Reference in New Issue
Block a user