From a5fa55969f1b4afc0ca3e38be50b69c65d43a460 Mon Sep 17 00:00:00 2001
From: Albert Krewinkel <albert@zeitkraut.de>
Date: Sun, 15 Mar 2020 17:45:44 +0100
Subject: Use implicit Prelude (#6187)

* Use implicit Prelude

The previous behavior was introduced as a fix for #4464. It seems that
this change alone did not fix the issue, and `stack ghci` and `cabal
repl` only work with GHC 8.4.1 or newer, as no custom Prelude is loaded
for these versions. Given this, it seems cleaner to revert to the
implicit Prelude.

* PandocMonad: remove outdated check for base version

Only base versions 4.9 and later are supported, the check for
`MIN_VERSION_base(4,8,0)` is therefore unnecessary.

* Always use custom prelude

Previously, the custom prelude was used only with older GHC versions, as
a workaround for problems with ghci. The ghci problems are resolved by
replacing package `base` with `base-noprelude`, allowing for consistent
use of the custom prelude across all GHC versions.
---
 src/Text/Pandoc/Lua/Filter.hs                   | 2 --
 src/Text/Pandoc/Lua/Global.hs                   | 2 --
 src/Text/Pandoc/Lua/Init.hs                     | 2 --
 src/Text/Pandoc/Lua/Marshaling/AST.hs           | 2 --
 src/Text/Pandoc/Lua/Marshaling/AnyValue.hs      | 2 --
 src/Text/Pandoc/Lua/Marshaling/CommonState.hs   | 2 --
 src/Text/Pandoc/Lua/Marshaling/Context.hs       | 2 --
 src/Text/Pandoc/Lua/Marshaling/List.hs          | 2 --
 src/Text/Pandoc/Lua/Marshaling/MediaBag.hs      | 2 --
 src/Text/Pandoc/Lua/Marshaling/ReaderOptions.hs | 2 --
 src/Text/Pandoc/Lua/Marshaling/Version.hs       | 2 --
 src/Text/Pandoc/Lua/Module/MediaBag.hs          | 2 --
 src/Text/Pandoc/Lua/Module/Pandoc.hs            | 2 --
 src/Text/Pandoc/Lua/Module/System.hs            | 1 -
 src/Text/Pandoc/Lua/Module/Types.hs             | 1 -
 src/Text/Pandoc/Lua/Module/Utils.hs             | 2 --
 src/Text/Pandoc/Lua/Packages.hs                 | 2 --
 src/Text/Pandoc/Lua/Util.hs                     | 2 --
 src/Text/Pandoc/Lua/Walk.hs                     | 2 --
 19 files changed, 36 deletions(-)

(limited to 'src/Text/Pandoc/Lua')

diff --git a/src/Text/Pandoc/Lua/Filter.hs b/src/Text/Pandoc/Lua/Filter.hs
index beef492d7..f6a0aea5b 100644
--- a/src/Text/Pandoc/Lua/Filter.hs
+++ b/src/Text/Pandoc/Lua/Filter.hs
@@ -1,5 +1,4 @@
 {-# LANGUAGE FlexibleContexts  #-}
-{-# LANGUAGE NoImplicitPrelude #-}
 {- |
 Module      : Text.Pandoc.Lua.Filter
 Copyright   : © 2012–2020 John MacFarlane,
@@ -17,7 +16,6 @@ module Text.Pandoc.Lua.Filter ( LuaFilterFunction
                               , walkBlocks
                               , module Text.Pandoc.Lua.Walk
                               ) where
-import Prelude
 import Control.Applicative ((<|>))
 import Control.Monad (mplus, (>=>))
 import Control.Monad.Catch (finally)
diff --git a/src/Text/Pandoc/Lua/Global.hs b/src/Text/Pandoc/Lua/Global.hs
index f790a73b3..947c42cab 100644
--- a/src/Text/Pandoc/Lua/Global.hs
+++ b/src/Text/Pandoc/Lua/Global.hs
@@ -1,5 +1,4 @@
 {-# LANGUAGE DeriveDataTypeable #-}
-{-# LANGUAGE NoImplicitPrelude #-}
 {- |
    Module      : Text.Pandoc.Lua
    Copyright   : Copyright © 2017-2020 Albert Krewinkel
@@ -15,7 +14,6 @@ module Text.Pandoc.Lua.Global
   , setGlobals
   ) where
 
-import Prelude
 import Data.Data (Data)
 import Foreign.Lua (Lua, Peekable, Pushable)
 import Foreign.Lua.Userdata ( ensureUserdataMetatable, pushAnyWithMetatable
diff --git a/src/Text/Pandoc/Lua/Init.hs b/src/Text/Pandoc/Lua/Init.hs
index b4fc67eaa..8abe81125 100644
--- a/src/Text/Pandoc/Lua/Init.hs
+++ b/src/Text/Pandoc/Lua/Init.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE NoImplicitPrelude #-}
 {- |
    Module      : Text.Pandoc.Lua
    Copyright   : Copyright © 2017-2020 Albert Krewinkel
@@ -16,7 +15,6 @@ module Text.Pandoc.Lua.Init
   , luaPackageParams
   ) where
 
-import Prelude
 import Control.Monad.Trans (MonadIO (..))
 import Data.Data (Data, dataTypeConstrs, dataTypeOf, showConstr)
 import Foreign.Lua (Lua)
diff --git a/src/Text/Pandoc/Lua/Marshaling/AST.hs b/src/Text/Pandoc/Lua/Marshaling/AST.hs
index 68cfef5e1..a4087ad87 100644
--- a/src/Text/Pandoc/Lua/Marshaling/AST.hs
+++ b/src/Text/Pandoc/Lua/Marshaling/AST.hs
@@ -1,5 +1,4 @@
 {-# OPTIONS_GHC -fno-warn-orphans #-}
-{-# LANGUAGE NoImplicitPrelude    #-}
 {-# LANGUAGE LambdaCase           #-}
 {- |
    Module      : Text.Pandoc.Lua.Marshaling.AST
@@ -17,7 +16,6 @@ module Text.Pandoc.Lua.Marshaling.AST
   , LuaListAttributes (..)
   ) where
 
-import Prelude
 import Control.Applicative ((<|>))
 import Foreign.Lua (Lua, Peekable, Pushable, StackIndex)
 import Text.Pandoc.Definition
diff --git a/src/Text/Pandoc/Lua/Marshaling/AnyValue.hs b/src/Text/Pandoc/Lua/Marshaling/AnyValue.hs
index b4830ed3b..c4720aedf 100644
--- a/src/Text/Pandoc/Lua/Marshaling/AnyValue.hs
+++ b/src/Text/Pandoc/Lua/Marshaling/AnyValue.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE NoImplicitPrelude    #-}
 {- |
    Module      : Text.Pandoc.Lua.Marshaling.AnyValue
    Copyright   : © 2017-2020 Albert Krewinkel
@@ -15,7 +14,6 @@ into HsLua.
 -}
 module Text.Pandoc.Lua.Marshaling.AnyValue (AnyValue (..)) where
 
-import Prelude
 import Foreign.Lua (Peekable (peek), StackIndex)
 
 -- | Dummy type to allow values of arbitrary Lua type. This just wraps
diff --git a/src/Text/Pandoc/Lua/Marshaling/CommonState.hs b/src/Text/Pandoc/Lua/Marshaling/CommonState.hs
index e78acb826..636650af3 100644
--- a/src/Text/Pandoc/Lua/Marshaling/CommonState.hs
+++ b/src/Text/Pandoc/Lua/Marshaling/CommonState.hs
@@ -1,6 +1,5 @@
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 {-# LANGUAGE LambdaCase           #-}
-{-# LANGUAGE NoImplicitPrelude    #-}
 {-# LANGUAGE OverloadedStrings    #-}
 {- |
    Module      : Text.Pandoc.Lua.Marshaling.CommonState
@@ -14,7 +13,6 @@ Instances to marshal (push) and unmarshal (peek) the common state.
 -}
 module Text.Pandoc.Lua.Marshaling.CommonState () where
 
-import Prelude
 import Foreign.Lua (Lua, Peekable, Pushable)
 import Foreign.Lua.Types.Peekable (reportValueOnFailure)
 import Foreign.Lua.Userdata (ensureUserdataMetatable, pushAnyWithMetatable,
diff --git a/src/Text/Pandoc/Lua/Marshaling/Context.hs b/src/Text/Pandoc/Lua/Marshaling/Context.hs
index 9ecaa8fb7..effcc675d 100644
--- a/src/Text/Pandoc/Lua/Marshaling/Context.hs
+++ b/src/Text/Pandoc/Lua/Marshaling/Context.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE NoImplicitPrelude    #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 {- |
    Module      : Text.Pandoc.Lua.Marshaling.Context
@@ -13,7 +12,6 @@ Marshaling instance for doctemplates Context and its components.
 -}
 module Text.Pandoc.Lua.Marshaling.Context () where
 
-import Prelude
 import qualified Foreign.Lua as Lua
 import Foreign.Lua (Pushable)
 import Text.DocTemplates (Context(..), Val(..), TemplateTarget)
diff --git a/src/Text/Pandoc/Lua/Marshaling/List.hs b/src/Text/Pandoc/Lua/Marshaling/List.hs
index d1e39c993..e6614400d 100644
--- a/src/Text/Pandoc/Lua/Marshaling/List.hs
+++ b/src/Text/Pandoc/Lua/Marshaling/List.hs
@@ -1,7 +1,6 @@
 {-# LANGUAGE DeriveDataTypeable   #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
-{-# LANGUAGE NoImplicitPrelude    #-}
 {-# LANGUAGE UndecidableInstances #-}
 {- |
 Module      : Text.Pandoc.Lua.Marshaling.List
@@ -17,7 +16,6 @@ module Text.Pandoc.Lua.Marshaling.List
   ( List (..)
   ) where
 
-import Prelude
 import Data.Data (Data)
 import Foreign.Lua (Peekable, Pushable)
 import Text.Pandoc.Walk (Walkable (..))
diff --git a/src/Text/Pandoc/Lua/Marshaling/MediaBag.hs b/src/Text/Pandoc/Lua/Marshaling/MediaBag.hs
index 46db84a91..e9b0c5770 100644
--- a/src/Text/Pandoc/Lua/Marshaling/MediaBag.hs
+++ b/src/Text/Pandoc/Lua/Marshaling/MediaBag.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE NoImplicitPrelude    #-}
 {- |
    Module      : Text.Pandoc.Lua.Marshaling.MediaBag
    Copyright   : © 2012-2020 John MacFarlane
@@ -11,7 +10,6 @@ Instances to marshal (push) and unmarshal (peek) media data.
 -}
 module Text.Pandoc.Lua.Marshaling.MediaBag (pushIterator) where
 
-import Prelude
 import Foreign.Ptr (Ptr)
 import Foreign.StablePtr (StablePtr, deRefStablePtr, newStablePtr)
 import Foreign.Lua (Lua, NumResults, Peekable, Pushable, StackIndex)
diff --git a/src/Text/Pandoc/Lua/Marshaling/ReaderOptions.hs b/src/Text/Pandoc/Lua/Marshaling/ReaderOptions.hs
index 418703969..2e45affe4 100644
--- a/src/Text/Pandoc/Lua/Marshaling/ReaderOptions.hs
+++ b/src/Text/Pandoc/Lua/Marshaling/ReaderOptions.hs
@@ -1,5 +1,4 @@
 {-# LANGUAGE LambdaCase           #-}
-{-# LANGUAGE NoImplicitPrelude    #-}
 {-# LANGUAGE OverloadedStrings    #-}
 {-# LANGUAGE ScopedTypeVariables  #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
@@ -16,7 +15,6 @@ Marshaling instance for ReaderOptions and its components.
 -}
 module Text.Pandoc.Lua.Marshaling.ReaderOptions () where
 
-import Prelude
 import Data.Data (showConstr, toConstr)
 import Foreign.Lua (Lua, Pushable)
 import Text.Pandoc.Extensions (Extensions)
diff --git a/src/Text/Pandoc/Lua/Marshaling/Version.hs b/src/Text/Pandoc/Lua/Marshaling/Version.hs
index 9bbb147f0..090725afc 100644
--- a/src/Text/Pandoc/Lua/Marshaling/Version.hs
+++ b/src/Text/Pandoc/Lua/Marshaling/Version.hs
@@ -1,6 +1,5 @@
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 {-# LANGUAGE LambdaCase           #-}
-{-# LANGUAGE NoImplicitPrelude    #-}
 {-# LANGUAGE OverloadedStrings    #-}
 {-# LANGUAGE ScopedTypeVariables  #-}
 {- |
@@ -20,7 +19,6 @@ module Text.Pandoc.Lua.Marshaling.Version
   )
   where
 
-import Prelude
 import Data.Text (Text)
 import Data.Maybe (fromMaybe)
 import Data.Version (Version (..), makeVersion, parseVersion, showVersion)
diff --git a/src/Text/Pandoc/Lua/Module/MediaBag.hs b/src/Text/Pandoc/Lua/Module/MediaBag.hs
index a6f5bd86b..23f335caa 100644
--- a/src/Text/Pandoc/Lua/Module/MediaBag.hs
+++ b/src/Text/Pandoc/Lua/Module/MediaBag.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE NoImplicitPrelude #-}
 {-# LANGUAGE OverloadedStrings #-}
 {- |
    Module      : Text.Pandoc.Lua.Module.MediaBag
@@ -14,7 +13,6 @@ module Text.Pandoc.Lua.Module.MediaBag
   ( pushModule
   ) where
 
-import Prelude
 import Control.Monad (zipWithM_)
 import Foreign.Lua (Lua, NumResults, Optional, liftIO)
 import Text.Pandoc.Class (CommonState (..), fetchItem, putCommonState,
diff --git a/src/Text/Pandoc/Lua/Module/Pandoc.hs b/src/Text/Pandoc/Lua/Module/Pandoc.hs
index b4c301383..cc9f210a8 100644
--- a/src/Text/Pandoc/Lua/Module/Pandoc.hs
+++ b/src/Text/Pandoc/Lua/Module/Pandoc.hs
@@ -1,5 +1,4 @@
 {-# LANGUAGE FlexibleContexts  #-}
-{-# LANGUAGE NoImplicitPrelude #-}
 {-# LANGUAGE OverloadedStrings #-}
 {- |
    Module      : Text.Pandoc.Lua.Module.Pandoc
@@ -15,7 +14,6 @@ module Text.Pandoc.Lua.Module.Pandoc
   ( pushModule
   ) where
 
-import Prelude
 import Control.Monad (when)
 import Control.Monad.Except (throwError)
 import Data.Default (Default (..))
diff --git a/src/Text/Pandoc/Lua/Module/System.hs b/src/Text/Pandoc/Lua/Module/System.hs
index 52325aecd..04508e461 100644
--- a/src/Text/Pandoc/Lua/Module/System.hs
+++ b/src/Text/Pandoc/Lua/Module/System.hs
@@ -12,7 +12,6 @@ module Text.Pandoc.Lua.Module.System
   ( pushModule
   ) where
 
-import Prelude
 import Foreign.Lua (Lua, NumResults)
 import Foreign.Lua.Module.System (arch, env, getwd, os,
                                   with_env, with_tmpdir, with_wd)
diff --git a/src/Text/Pandoc/Lua/Module/Types.hs b/src/Text/Pandoc/Lua/Module/Types.hs
index 84acdffc7..999f2e588 100644
--- a/src/Text/Pandoc/Lua/Module/Types.hs
+++ b/src/Text/Pandoc/Lua/Module/Types.hs
@@ -12,7 +12,6 @@ module Text.Pandoc.Lua.Module.Types
   ( pushModule
   ) where
 
-import Prelude
 import Data.Version (Version)
 import Foreign.Lua (Lua, NumResults)
 import Text.Pandoc.Definition
diff --git a/src/Text/Pandoc/Lua/Module/Utils.hs b/src/Text/Pandoc/Lua/Module/Utils.hs
index 8f1d3d990..345a5bee4 100644
--- a/src/Text/Pandoc/Lua/Module/Utils.hs
+++ b/src/Text/Pandoc/Lua/Module/Utils.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE NoImplicitPrelude #-}
 {- |
    Module      : Text.Pandoc.Lua.Module.Utils
    Copyright   : Copyright © 2017-2020 Albert Krewinkel
@@ -13,7 +12,6 @@ module Text.Pandoc.Lua.Module.Utils
   ( pushModule
   ) where
 
-import Prelude
 import Control.Applicative ((<|>))
 import Data.Default (def)
 import Data.Version (Version)
diff --git a/src/Text/Pandoc/Lua/Packages.hs b/src/Text/Pandoc/Lua/Packages.hs
index ce891aac7..4a0401cfa 100644
--- a/src/Text/Pandoc/Lua/Packages.hs
+++ b/src/Text/Pandoc/Lua/Packages.hs
@@ -1,5 +1,4 @@
 {-# LANGUAGE FlexibleContexts #-}
-{-# LANGUAGE NoImplicitPrelude #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {- |
    Module      : Text.Pandoc.Lua.Packages
@@ -16,7 +15,6 @@ module Text.Pandoc.Lua.Packages
   , installPandocPackageSearcher
   ) where
 
-import Prelude
 import Control.Monad (forM_)
 import Data.ByteString (ByteString)
 import Foreign.Lua (Lua, NumResults, liftIO)
diff --git a/src/Text/Pandoc/Lua/Util.hs b/src/Text/Pandoc/Lua/Util.hs
index 86ab7b12f..e7bb17dc9 100644
--- a/src/Text/Pandoc/Lua/Util.hs
+++ b/src/Text/Pandoc/Lua/Util.hs
@@ -1,6 +1,5 @@
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE LambdaCase #-}
-{-# LANGUAGE NoImplicitPrelude #-}
 {-# LANGUAGE OverloadedStrings #-}
 {- |
    Module      : Text.Pandoc.Lua.Util
@@ -27,7 +26,6 @@ module Text.Pandoc.Lua.Util
   , dofileWithTraceback
   ) where
 
-import Prelude
 import Control.Monad (unless, when)
 import Foreign.Lua ( Lua, NumArgs, NumResults, Peekable, Pushable, StackIndex
                    , Status, ToHaskellFunction )
diff --git a/src/Text/Pandoc/Lua/Walk.hs b/src/Text/Pandoc/Lua/Walk.hs
index 44df6c238..7043a383d 100644
--- a/src/Text/Pandoc/Lua/Walk.hs
+++ b/src/Text/Pandoc/Lua/Walk.hs
@@ -1,7 +1,6 @@
 {-# LANGUAGE DeriveTraversable #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE FlexibleInstances #-}
-{-# LANGUAGE NoImplicitPrelude #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
 {- |
 Module      : Text.Pandoc.Lua.Walk
@@ -18,7 +17,6 @@ module Text.Pandoc.Lua.Walk
   )
 where
 
-import Prelude
 import Control.Monad ((<=<))
 import Text.Pandoc.Definition
 import Text.Pandoc.Walk
-- 
cgit v1.2.3