[commit: ghc] master: Add PolyKinds extension to Data.Monoid (18b2c46)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/18b2c46773eccb974bdd042a2f400edd23e193d7/ghc

>---------------------------------------------------------------

commit 18b2c46773eccb974bdd042a2f400edd23e193d7
Author: Alexander Berntsen <alexander at plaimi.net>
Date:   Fri Jul 18 23:53:48 2014 -0500

    Add PolyKinds extension to Data.Monoid
    
    Summary:
    Carl Howells pointed out[0] that the `Monoid` instance for
    `Data.Proxy.Proxy` is only defined for types with kind *.
    
    This is a very mild change. Furthermore, Edward Kmett revealed[1] that
    it was supposed to be there all along -- the extension simply got lost
    in commit 1d1ff77aaa09efaddc8cfe0dcf92d6763297cf11, as pointed out by
    Adam Vogt[2]. This used to be correct in GHC 7.6, so this commit fixes a
    regression.
    
    This addresses #9317.
    
    [0] <http://www.haskell.org/pipermail/libraries/2014-July/023261.html>.
    [1] <http://www.haskell.org/pipermail/libraries/2014-July/023267.html>.
    [2] <http://www.haskell.org/pipermail/libraries/2014-July/023265.html>.
    
    Signed-off-by: Alexander Berntsen <alexander at plaimi.net>
    
    Test Plan: See [0]
    
    Reviewers: austin, hvr, ekmett
    
    Reviewed By: austin, hvr, ekmett
    
    Subscribers: phaskell, simonmar, relrod, carter
    
    Differential Revision: https://phabricator.haskell.org/D70


>---------------------------------------------------------------

18b2c46773eccb974bdd042a2f400edd23e193d7
 libraries/base/Data/Monoid.hs | 1 +
 libraries/base/changelog.md   | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/libraries/base/Data/Monoid.hs b/libraries/base/Data/Monoid.hs
index b71176b..5889954 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 46006b1..06c9fa5 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