[commit: ghc] wip/nfs-locking: Add userPackages for overriding default list of target packages. (f500bd1)

[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/f500bd171e7d5ca2416876b5477b59fa89e7762e/ghc

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

commit f500bd171e7d5ca2416876b5477b59fa89e7762e
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sun Jun 14 15:02:09 2015 +0100

    Add userPackages for overriding default list of target packages.


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

f500bd171e7d5ca2416876b5477b59fa89e7762e
 src/Expression.hs   | 2 +-
 src/Rules.hs        | 1 +
 src/Targets.hs      | 8 ++++----
 src/UserSettings.hs | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/Expression.hs b/src/Expression.hs
index 77be4e9..ec76244 100644
--- a/src/Expression.hs
+++ b/src/Expression.hs
@@ -89,7 +89,7 @@ interpret = flip runReaderT
 fromDiff :: Monoid a => DiffExpr a -> Expr a
 fromDiff = fmap (($ mempty) . appEndo)
 
-interpretDiff :: Environment -> Expr a -> Action a
+interpretDiff :: Monoid a => Environment -> DiffExpr a -> Action a
 interpretDiff env = interpret env . fromDiff
 
 applyPredicate :: Monoid a => Predicate -> Expr a -> Expr a
diff --git a/src/Rules.hs b/src/Rules.hs
index 2873abf..227eef1 100644
--- a/src/Rules.hs
+++ b/src/Rules.hs
@@ -10,6 +10,7 @@ import Targets
 import Settings
 import Package
 import Expression
+import UserSettings
 import Rules.Package
 
 -- generateTargets needs package-data.mk files of all target packages
diff --git a/src/Targets.hs b/src/Targets.hs
index 186a321..5929eb8 100644
--- a/src/Targets.hs
+++ b/src/Targets.hs
@@ -1,10 +1,10 @@
 module Targets (
     targetWays, targetPackages, targetDirectory, allPackages,
     customConfigureSettings,
-    array, base, binPackageDb, binary, bytestring, cabal, containers, deepseq,
-    directory, filepath, ghcPrim, haskeline, hoopl, hpc, integerLibrary,
-    parallel, pretty, primitive, process, stm, templateHaskell, terminfo, time,
-    transformers, unix, win32, xhtml
+    array, base, binPackageDb, binary, bytestring, cabal, compiler, containers,
+    deepseq, directory, filepath, ghcPrim, haskeline, hoopl, hpc,
+    integerLibrary, parallel, pretty, primitive, process, stm, templateHaskell,
+    terminfo, time, transformers, unix, win32, xhtml
     ) where
 
 import Ways hiding (parallel)
diff --git a/src/UserSettings.hs b/src/UserSettings.hs
index 1615d60..b785c7f 100644
--- a/src/UserSettings.hs
+++ b/src/UserSettings.hs
@@ -3,8 +3,8 @@ module UserSettings (
     ) where
 
 import Base hiding (arg, args, Args)
-import Rules.Data
 import Oracles.Builder
+import Targets
 import Expression
 import Expression.Settings
 
@@ -14,7 +14,7 @@ userSettings = mconcat
     , builder (Ghc Stage0) ? remove ["-O2"]
     , builder GhcCabal ? removeSub "--configure-option=CFLAGS" ["-Werror"] ]
 
-userPackages :: Settings
+userPackages :: Packages
 userPackages = mconcat
     [ stage Stage1 ? remove [cabal]
     ,                remove [compiler] ]