From f4118825b99e707b84256dec4891f7b791d71cd1 Mon Sep 17 00:00:00 2001
From: konsumlamm <konsumlamm@gmail.com>
Date: Thu, 19 Feb 2026 17:51:14 +0100
Subject: [PATCH 1/2] Don't import Safe ST modules for modern versions of
 `base`

Update .gitignore
---
 .gitignore                | 2 +-
 src/Control/Monad/Base.hs | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index e318496..33fe5e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 /cabal-dev
 /cabal.sandbox.config
 /dist
-/dist-newstyle
+/dist-*
 .*
 *~
diff --git a/src/Control/Monad/Base.hs b/src/Control/Monad/Base.hs
index 523d637..2b0c0a5 100644
--- a/src/Control/Monad/Base.hs
+++ b/src/Control/Monad/Base.hs
@@ -47,13 +47,14 @@ import Data.Monoid
 import Control.Applicative (Applicative(..))
 #endif
 #if !MIN_VERSION_base(4,4,0) && HS_TRANSFORMERS_BASE__ORPHANS
-import qualified Control.Monad.ST.Lazy as L
-import qualified Control.Monad.ST.Strict as S
 import Data.Orphans ()
 #endif
-#if MIN_VERSION_base(4,4,0)
+#if MIN_VERSION_base(4,4,0) && !MIN_VERSION_base(4,8,0)
 import qualified Control.Monad.ST.Lazy.Safe as L
 import qualified Control.Monad.ST.Safe as S
+#else
+import qualified Control.Monad.ST.Lazy as L
+import qualified Control.Monad.ST.Strict as S
 #endif
 import Control.Monad.STM (STM)
 

From a6eed7855c53d8b93207518613a913343edb52d2 Mon Sep 17 00:00:00 2001
From: konsumlamm <konsumlamm@gmail.com>
Date: Mon, 9 Mar 2026 12:11:48 +0100
Subject: [PATCH 2/2] Rewrite imports

---
 src/Control/Monad/Base.hs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/Control/Monad/Base.hs b/src/Control/Monad/Base.hs
index 2b0c0a5..52a40de 100644
--- a/src/Control/Monad/Base.hs
+++ b/src/Control/Monad/Base.hs
@@ -47,14 +47,18 @@ import Data.Monoid
 import Control.Applicative (Applicative(..))
 #endif
 #if !MIN_VERSION_base(4,4,0) && HS_TRANSFORMERS_BASE__ORPHANS
+import qualified Control.Monad.ST.Lazy as L
+import qualified Control.Monad.ST.Strict as S
 import Data.Orphans ()
 #endif
-#if MIN_VERSION_base(4,4,0) && !MIN_VERSION_base(4,8,0)
-import qualified Control.Monad.ST.Lazy.Safe as L
-import qualified Control.Monad.ST.Safe as S
-#else
+#if MIN_VERSION_base(4,4,0)
+# if MIN_VERSION_base(4,8,0)
 import qualified Control.Monad.ST.Lazy as L
 import qualified Control.Monad.ST.Strict as S
+# else
+import qualified Control.Monad.ST.Lazy.Safe as L
+import qualified Control.Monad.ST.Safe as S
+# endif
 #endif
 import Control.Monad.STM (STM)