Use base-compat for our custom prelude.

This should give us more complete coverage of newer
base features.

See #4255.

1 files changed, 5 insertions, 15 deletions

diff --git a/prelude/Prelude.hs b/prelude/Prelude.hs
index 34f133d83..8f5181fba 100644
--- a/prelude/Prelude.hs
+++ b/prelude/Prelude.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE NoImplicitPrelude #-}
 {-# LANGUAGE PackageImports #-}
 {-# LANGUAGE CPP #-}
 
@@ -6,21 +7,10 @@
 
 module Prelude
 (
-  module P
-#if MIN_VERSION_base(4,8,0)
-#else
-, Monoid(..)
-, Applicative(..)
-, (<$>)
-, (<$)
-#endif
+  module Prelude.Compat
+, module Monoid.Compat
 )
 where
 
-#if MIN_VERSION_base(4,8,0)
-import "base" Prelude as P
-#else
-import "base" Prelude as P
-import Control.Applicative
-import Data.Monoid
-#endif
+import Prelude.Compat
+import Monoid.Compat