From b5d7520880b807dcd7c07fc0647061fe4ba51a3e Mon Sep 17 00:00:00 2001
From: Felix Yan <felixonmars@archlinux.org>
Date: Sun, 20 Jun 2021 08:28:48 +0800
Subject: [PATCH] Remove monad-unlift

monad-unlift has been abandoned for years. Let's drop its usage.
---
 src/Web/Handler.hs   | 10 ++++------
 tamarin-prover.cabal |  2 --
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/Web/Handler.hs b/src/Web/Handler.hs
index 167dd38b5..6a4110f8f 100644
--- a/src/Web/Handler.hs
+++ b/src/Web/Handler.hs
@@ -79,7 +79,6 @@ import           Web.Types
 import           Yesod.Core
 
 import           Control.Monad.Trans.Resource (runResourceT)
-import           Control.Monad.Trans.Unlift
 
 import           Data.Label
 import           Data.Maybe
@@ -103,8 +102,7 @@ import           Control.Applicative
 import           Control.Concurrent
 import qualified Control.Concurrent.Thread    as Thread ( forkIO )
 import           Control.DeepSeq
-import           Control.Exception.Base
-import qualified Control.Exception.Lifted     as E
+import           Control.Exception.Base       as E
 import           Control.Monad
 import qualified Data.Binary                  as Bin
 import           Data.Time.LocalTime
@@ -300,11 +298,11 @@ getThreads = do
 ------------------------------------------------------------------------------
 
 -- | Print exceptions, if they happen.
-traceExceptions :: MonadBaseControl IO m => String -> m a -> m a
+traceExceptions :: String -> IO a -> IO a
 traceExceptions info =
     E.handle handler
   where
-    handler :: MonadBaseControl IO m => E.SomeException -> m a
+    handler :: E.SomeException -> IO a
     handler e =
       trace (info ++ ": exception `" ++ show e ++ "'") $ E.throwIO e
 
@@ -329,7 +327,7 @@ responseToJson = go
 -- | Fully evaluate a value in a thread that can be canceled.
 evalInThread :: NFData a
              => IO a
-             -> Handler (Either SomeException a)
+             -> Handler (Either E.SomeException a)
 evalInThread io = do
     renderF <- getUrlRender
     maybeRoute <- getCurrentRoute
diff --git a/tamarin-prover.cabal b/tamarin-prover.cabal
index fc05423b3..691dd327a 100644
--- a/tamarin-prover.cabal
+++ b/tamarin-prover.cabal
@@ -141,8 +141,6 @@ executable tamarin-prover
       , filepath
       , gitrev
       , http-types
-      , lifted-base
-      , monad-unlift
       , mtl
       , parsec
       , process