replace MIN_VERSION_ghc with MIN_VERSION_base

for reasons unclear, the nix build does not include a MIN_VERSION_ghc macro

src/bin/TutorialD/Interpreter/RODatabaseContextOperator.hs

@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE GADTs #-}
 module TutorialD.Interpreter.RODatabaseContextOperator where
 import ProjectM36.Base
@@ -13,11 +12,7 @@ import TutorialD.Interpreter.Base
 import TutorialD.Interpreter.RelationalExpr
 import TutorialD.Interpreter.DatabaseContextExpr
 import TutorialD.Printer
-#if MIN_VERSION_base(4,18,0)
 import Control.Monad (when)
-#else
-import Control.Monad.State
-#endif
 import qualified Data.Text as T
 import ProjectM36.Relation.Show.Gnuplot
 import ProjectM36.HashSecurely

src/lib/ProjectM36/AtomType.hs

@@ -13,11 +13,7 @@ import qualified Data.Set as S
 import qualified Data.List as L
 import Data.Maybe (isJust)
 import Data.Either (rights, lefts)
-#if MIN_VERSION_ghc(9,6,0)
 import Control.Monad (foldM, unless, when)
-#else
-import Control.Monad.Writer
-#endif
 import qualified Data.Map as M
 import qualified Data.Text as T
 

src/lib/ProjectM36/AttributeNames.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 module ProjectM36.AttributeNames where
 import ProjectM36.Base
 import qualified Data.Set as S

src/lib/ProjectM36/Client/Simple.hs

@@ -1,4 +1,4 @@
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving, CPP #-}
 -- | A simplified client interface for Project:M36 database access.
 module ProjectM36.Client.Simple (
   simpleConnectProjectM36,
@@ -31,7 +31,7 @@ module ProjectM36.Client.Simple (
   ) where
 
 import Control.Exception.Base
-#if MIN_VERSION_ghc(9,6,0)
+#if MIN_VERSION_base(4,18,0)
 import Control.Monad ((<=<))
 #endif
 import Control.Monad.Reader

src/lib/ProjectM36/RelationalExpression.hs

@@ -22,16 +22,13 @@ import qualified ProjectM36.Attribute as A
 import qualified Data.Map as M
 import qualified Data.HashSet as HS
 import qualified Data.Set as S
-#if MIN_VERSION_ghc(9,6,0)
 import Control.Monad (foldM, unless, when)
-import Control.Monad.State
-import Control.Monad.Except
-import Control.Monad.Reader as R
-#else
-import Control.Monad.State hiding (join)
-import Control.Monad.Except hiding (join)
-import Control.Monad.Reader as R hiding (join)
-#endif
+import Control.Monad.Except (ExceptT, MonadError, runExceptT, throwError, catchError)
+import Control.Monad.Reader (ReaderT, runReaderT, asks, ask, local)
+import qualified Control.Monad.Reader as R
+import Control.Monad.State (gets, get, put)
+import Control.Monad.Trans.Class (lift)
+import Control.Monad.IO.Class (liftIO)
 import Data.Bifunctor (second)
 import Data.Maybe
 import Data.Tuple (swap)

src/lib/ProjectM36/StaticOptimizer.hs

@@ -12,7 +12,7 @@ import ProjectM36.NormalizeExpr
 import qualified ProjectM36.Attribute as A
 import qualified ProjectM36.AttributeNames as AS
 import ProjectM36.TupleSet
-#if MIN_VERSION_ghc(9,6,0)
+#if MIN_VERSION_base(4,18,0)
 import Control.Monad (foldM)
 #endif
 import Control.Monad.State

src/lib/ProjectM36/TransactionGraph.hs

@@ -16,14 +16,11 @@ import ProjectM36.HashSecurely
 import ProjectM36.ReferencedTransactionIds
 
 import Codec.Winery
-#if MIN_VERSION_ghc(9,6,0)
+#if MIN_VERSION_base(4,18,0)
 import Control.Monad (foldM, forM, unless, when)
+#endif
 import Control.Monad.Except
 import Control.Monad.Reader
-#else
-import Control.Monad.Except hiding (join)
-import Control.Monad.Reader hiding (join)
-#endif
 import qualified Data.Vector as V
 import qualified Data.UUID as U
 import qualified Data.Set as S

src/lib/ProjectM36/TransactionGraph/Merge.hs

@@ -1,9 +1,10 @@
+{-# LANGUAGE CPP #-}
 --Transaction Merge Engines
 module ProjectM36.TransactionGraph.Merge where
 import ProjectM36.Base
 import ProjectM36.Error
 import ProjectM36.RelationalExpression
-#if MIN_VERSION_ghc(9,6,0)
+#if MIN_VERSION_base(4,18,0)
 import Control.Monad (foldM)
 import Control.Monad.Except
 #else