summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libraries/base/Data/Monoid.hs1
-rw-r--r--libraries/base/changelog.md4
2 files changed, 5 insertions, 0 deletions
diff --git a/libraries/base/Data/Monoid.hs b/libraries/base/Data/Monoid.hs
index b71176b19c..58899541b6 100644
--- a/libraries/base/Data/Monoid.hs
+++ b/libraries/base/Data/Monoid.hs
@@ -3,6 +3,7 @@
{-# LANGUAGE AutoDeriveTypeable #-}
{-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE PolyKinds #-}
-----------------------------------------------------------------------------
-- |
diff --git a/libraries/base/changelog.md b/libraries/base/changelog.md
index 46006b134c..06c9fa5a97 100644
--- a/libraries/base/changelog.md
+++ b/libraries/base/changelog.md
@@ -14,6 +14,10 @@
* Add `Control.Monad.(<$!>)` as a strict version of `(<$>)`
+ * The `Data.Monoid` module now has the `PolyKinds` extension
+ enabled, so that the `Monoid` instance for `Proxy` are polykinded
+ like `Proxy` itself is.
+
## 4.7.0.1 *Jul 2014*
* Bundled with GHC 7.8.3