3 files changed, 9 insertions, 10 deletions

diff --git a/overlays/spm/server/Spm/Server.hs b/overlays/spm/server/Spm/Server.hs
index 8e7f8786..dc334729 100644
--- a/overlays/spm/server/Spm/Server.hs
+++ b/overlays/spm/server/Spm/Server.hs
@@ -1,3 +1,5 @@
+{-# OPTIONS_GHC -Wno-orphans #-}
+
 {-# LANGUAGE OverloadedStrings #-}
 
 module Spm.Server
@@ -24,7 +26,6 @@ import Data.Attoparsec.Text
 import qualified Data.ByteString.Lazy as LBS
 
 import GHC.Generics (Generic)
-import Type.Reflection (Typeable)
 
 import Control.Applicative
 import Control.Monad
@@ -101,7 +102,7 @@ hSslClientSDn = "SSL-Client-S-DN"
 data SSLClientVerify
   = SSLClientVerifySuccess
   | SSLClientVerifyOther Text
-  deriving (Eq, Ord, Read, Show, Generic, Typeable)
+  deriving (Eq, Ord, Read, Show, Generic)
 instance FromHttpApiData SSLClientVerify where
   parseUrlPiece = (left Text.pack .) . parseOnly $ p <* endOfInput
     where
@@ -163,7 +164,7 @@ data ServerCtxError
   | ServerCtxNoCredentialsDirectory
   | ServerCtxJwkSetDecodeError String
   | ServerCtxJwkSetEmpty
-  deriving stock (Eq, Ord, Read, Show, Generic, Typeable)
+  deriving stock (Eq, Ord, Read, Show, Generic)
   deriving anyclass (Exception)
 
 mkSpmApp :: (MonadUnliftIO m, MonadThrow m) => m Application
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
 import UnliftIO.Pool
 import Control.Lens.TH
 
-import Type.Reflection (Typeable)
 import GHC.Generics (Generic)
 
 
@@ -19,6 +18,6 @@ data ServerCtx = ServerCtx
   { _sctxSqlPool :: Pool SqlBackend
   , _sctxInstanceId :: UUID
   , _sctxJwkSet :: JWKSet
-  } deriving (Generic, Typeable)
+  } deriving (Generic)
 makeLenses ''ServerCtx
 
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
 import Database.Persist.TH
 
 import GHC.Generics (Generic)
-import Type.Reflection (Typeable)
 
 import Data.Text (Text)
 
@@ -33,22 +32,22 @@ import Web.HttpApiData
 
 newtype MailMailbox = MailMailbox
   { unMailMailbox :: CI Text
-  } deriving stock (Eq, Ord, Read, Show, Generic, Typeable)
+  } deriving stock (Eq, Ord, Read, Show, Generic)
     deriving newtype (PersistField, PersistFieldSql)
 makeWrapped ''MailMailbox
 newtype MailLocal = MailLocal
   { unMailLocal :: CI Text
-  } deriving stock (Eq, Ord, Read, Show, Generic, Typeable)
+  } deriving stock (Eq, Ord, Read, Show, Generic)
     deriving newtype (PersistField, PersistFieldSql)
 makeWrapped ''MailLocal
 newtype MailExtension = MailExtension
   { unMailExtension :: CI Text
-  } deriving stock (Eq, Ord, Read, Show, Generic, Typeable)
+  } deriving stock (Eq, Ord, Read, Show, Generic)
     deriving newtype (PersistField, PersistFieldSql)
 makeWrapped ''MailExtension
 newtype MailDomain = MailDomain
   { unMailDomain :: CI Text
-  } deriving stock (Eq, Ord, Read, Show, Generic, Typeable)
+  } deriving stock (Eq, Ord, Read, Show, Generic)
     deriving newtype (PersistField, PersistFieldSql)
 makeWrapped ''MailDomain