summaryrefslogtreecommitdiff
path: root/overlays/spm/server/Spm/Server
diff options
context:
space:
mode:
Diffstat (limited to 'overlays/spm/server/Spm/Server')
-rw-r--r--overlays/spm/server/Spm/Server/Ctx.hs3
-rw-r--r--overlays/spm/server/Spm/Server/Database.hs9
2 files changed, 5 insertions, 7 deletions
diff --git a/overlays/spm/server/Spm/Server/Ctx.hs b/overlays/spm/server/Spm/Server/Ctx.hs
index 18452a0a..1d228043 100644
--- a/overlays/spm/server/Spm/Server/Ctx.hs
+++ b/overlays/spm/server/Spm/Server/Ctx.hs
@@ -11,7 +11,6 @@ import Database.Persist.Postgresql
11import UnliftIO.Pool 11import UnliftIO.Pool
12import Control.Lens.TH 12import Control.Lens.TH
13 13
14import Type.Reflection (Typeable)
15import GHC.Generics (Generic) 14import GHC.Generics (Generic)
16 15
17 16
@@ -19,6 +18,6 @@ data ServerCtx = ServerCtx
19 { _sctxSqlPool :: Pool SqlBackend 18 { _sctxSqlPool :: Pool SqlBackend
20 , _sctxInstanceId :: UUID 19 , _sctxInstanceId :: UUID
21 , _sctxJwkSet :: JWKSet 20 , _sctxJwkSet :: JWKSet
22 } deriving (Generic, Typeable) 21 } deriving (Generic)
23makeLenses ''ServerCtx 22makeLenses ''ServerCtx
24 23
diff --git a/overlays/spm/server/Spm/Server/Database.hs b/overlays/spm/server/Spm/Server/Database.hs
index 3156e920..4405452f 100644
--- a/overlays/spm/server/Spm/Server/Database.hs
+++ b/overlays/spm/server/Spm/Server/Database.hs
@@ -13,7 +13,6 @@ import Database.Persist.Sql
13import Database.Persist.TH 13import Database.Persist.TH
14 14
15import GHC.Generics (Generic) 15import GHC.Generics (Generic)
16import Type.Reflection (Typeable)
17 16
18import Data.Text (Text) 17import Data.Text (Text)
19 18
@@ -33,22 +32,22 @@ import Web.HttpApiData
33 32
34newtype MailMailbox = MailMailbox 33newtype MailMailbox = MailMailbox
35 { unMailMailbox :: CI Text 34 { unMailMailbox :: CI Text
36 } deriving stock (Eq, Ord, Read, Show, Generic, Typeable) 35 } deriving stock (Eq, Ord, Read, Show, Generic)
37 deriving newtype (PersistField, PersistFieldSql) 36 deriving newtype (PersistField, PersistFieldSql)
38makeWrapped ''MailMailbox 37makeWrapped ''MailMailbox
39newtype MailLocal = MailLocal 38newtype MailLocal = MailLocal
40 { unMailLocal :: CI Text 39 { unMailLocal :: CI Text
41 } deriving stock (Eq, Ord, Read, Show, Generic, Typeable) 40 } deriving stock (Eq, Ord, Read, Show, Generic)
42 deriving newtype (PersistField, PersistFieldSql) 41 deriving newtype (PersistField, PersistFieldSql)
43makeWrapped ''MailLocal 42makeWrapped ''MailLocal
44newtype MailExtension = MailExtension 43newtype MailExtension = MailExtension
45 { unMailExtension :: CI Text 44 { unMailExtension :: CI Text
46 } deriving stock (Eq, Ord, Read, Show, Generic, Typeable) 45 } deriving stock (Eq, Ord, Read, Show, Generic)
47 deriving newtype (PersistField, PersistFieldSql) 46 deriving newtype (PersistField, PersistFieldSql)
48makeWrapped ''MailExtension 47makeWrapped ''MailExtension
49newtype MailDomain = MailDomain 48newtype MailDomain = MailDomain
50 { unMailDomain :: CI Text 49 { unMailDomain :: CI Text
51 } deriving stock (Eq, Ord, Read, Show, Generic, Typeable) 50 } deriving stock (Eq, Ord, Read, Show, Generic)
52 deriving newtype (PersistField, PersistFieldSql) 51 deriving newtype (PersistField, PersistFieldSql)
53makeWrapped ''MailDomain 52makeWrapped ''MailDomain
54 53