[commit: ghc] wip/nfs-locking: Re-export Data.Monoid from Expression. (024b562)

[git at git.haskell.org]

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

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/024b5625e53789755a0af096b7a9438e8e33cc8c/ghc

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

commit 024b5625e53789755a0af096b7a9438e8e33cc8c
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Mon Dec 28 14:28:36 2015 +0000

    Re-export Data.Monoid from Expression.


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

024b5625e53789755a0af096b7a9438e8e33cc8c
 src/Expression.hs    | 2 ++
 src/Rules/Program.hs | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Expression.hs b/src/Expression.hs
index a83ea15..2b7ef9a 100644
--- a/src/Expression.hs
+++ b/src/Expression.hs
@@ -18,6 +18,7 @@ module Expression (
     getInput, getOutput,
 
     -- * Re-exports
+    module Data.Monoid,
     module Builder,
     module Package,
     module Stage,
@@ -25,6 +26,7 @@ module Expression (
     ) where
 
 import Control.Monad.Trans.Reader
+import Data.Monoid
 
 import Base
 import Package
diff --git a/src/Rules/Program.hs b/src/Rules/Program.hs
index 781231f..0199071 100644
--- a/src/Rules/Program.hs
+++ b/src/Rules/Program.hs
@@ -3,7 +3,7 @@ module Rules.Program (buildProgram) where
 import Data.Char
 
 import Base
-import Expression hiding (splitPath)
+import Expression
 import GHC hiding (ghci)
 import Oracles
 import Rules.Actions