From a2e32f0f9a72d37a51a707955ac9556ff456ba5a Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Tue, 1 Aug 2023 08:25:39 -0400
Subject: [PATCH] Import Control.Monad functions directly

Newer Control.Monad.Except no longer re-exports these things. Using
targeted imports keeps this working in those versions.
---
 src/UnliftIO/Except.hs            | 3 ++-
 src/Yesod/Auth/OAuth2/Dispatch.hs | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/UnliftIO/Except.hs b/src/UnliftIO/Except.hs
index 3dce8db..690fdbf 100644
--- a/src/UnliftIO/Except.hs
+++ b/src/UnliftIO/Except.hs
@@ -2,7 +2,8 @@
 
 module UnliftIO.Except () where
 
-import Control.Monad.Except
+import Control.Monad ((<=<))
+import Control.Monad.Except (ExceptT (..), runExceptT)
 import UnliftIO
 
 instance (MonadUnliftIO m, Exception e) => MonadUnliftIO (ExceptT e m) where
diff --git a/src/Yesod/Auth/OAuth2/Dispatch.hs b/src/Yesod/Auth/OAuth2/Dispatch.hs
index e03865f..49e37ec 100644
--- a/src/Yesod/Auth/OAuth2/Dispatch.hs
+++ b/src/Yesod/Auth/OAuth2/Dispatch.hs
@@ -12,7 +12,8 @@ module Yesod.Auth.OAuth2.Dispatch
   , dispatchAuthRequest
   ) where
 
-import Control.Monad.Except
+import Control.Monad (unless)
+import Control.Monad.Except (MonadError (..))
 import Data.Text (Text)
 import qualified Data.Text as T
 import Data.Text.Encoding (encodeUtf8)