Expression: Don't re-export Base

The beginning of a long journey towards minimal re-exports

src/Expression.hs

@@ -18,7 +18,6 @@ module Expression (
     getInput, getOutput,
 
     -- * Re-exports
-    module Base,
     module Builder,
     module Package,
     module Stage,

src/Oracles/ArgsHash.hs

 {-# LANGUAGE DeriveDataTypeable, GeneralizedNewtypeDeriving #-}
 module Oracles.ArgsHash (checkArgsHash, argsHashOracle) where
 
+import Base
 import Expression
 import Settings
 import Settings.Args

src/Predicates.hs

@@ -6,6 +6,7 @@ module Predicates (
     stage0, stage1, stage2, notStage0, notPackage, registerPackage, splitObjects
     ) where
 
+import Base
 import Expression
 import GHC
 import Oracles.Config.Flag

src/Rules.hs

 module Rules (generateTargets, packageRules) where
 
+import Base
 import Expression
 import Rules.Install
 import Rules.Package

src/Rules/Actions.hs

 module Rules.Actions (build, buildWithResources) where
 
+import Base
 import Expression
 import Oracles.ArgsHash
 import Settings

src/Rules/Cabal.hs

 module Rules.Cabal (cabalRules) where
 
+import Base
 import Data.Version
 import Distribution.Package as DP
 import Distribution.PackageDescription

src/Rules/Compile.hs

 module Rules.Compile (compilePackage) where
 
+import Base
 import Expression
 import Oracles
 import Rules.Actions

src/Rules/Data.hs

 module Rules.Data (buildPackageData) where
 
+import Base
 import Expression
 import GHC
 import Oracles

src/Rules/Dependencies.hs

 module Rules.Dependencies (buildPackageDependencies) where
 
+import Base
 import Expression
 import Oracles
 import Rules.Actions

src/Rules/Documentation.hs

 module Rules.Documentation (buildPackageDocumentation) where
 
+import Base
 import Expression
 import Oracles
 import Rules.Actions

src/Rules/Generate.hs

@@ -3,6 +3,7 @@ module Rules.Generate (
     derivedConstantsPath, generatedDependencies
     ) where
 
+import Base
 import Expression
 import GHC
 import Rules.Generators.ConfigHs

src/Rules/Generators/ConfigHs.hs

 module Rules.Generators.ConfigHs (generateConfigHs) where
 
+import Base
 import Expression
 import GHC
 import Oracles

src/Rules/Generators/GhcAutoconfH.hs

 module Rules.Generators.GhcAutoconfH (generateGhcAutoconfH) where
 
+import Base
 import Expression
 import Oracles
 

src/Rules/Generators/GhcBootPlatformH.hs

 module Rules.Generators.GhcBootPlatformH (generateGhcBootPlatformH) where
 
+import Base
 import Expression
 import Oracles
 

src/Rules/Generators/GhcPlatformH.hs

 module Rules.Generators.GhcPlatformH (generateGhcPlatformH) where
 
+import Base
 import Expression
 import Oracles
 

src/Rules/Generators/VersionHs.hs

 module Rules.Generators.VersionHs (generateVersionHs) where
 
+import Base
 import Expression
 import Oracles
 

src/Rules/Install.hs

 module Rules.Install (installTargets, installRules) where
 
+import Base
 import Expression
 import GHC
 import Rules.Generate

src/Rules/Library.hs

@@ -2,6 +2,7 @@ module Rules.Library (buildPackageLibrary, cSources, hSources) where
 
 import Data.Char
 
+import Base
 import Expression hiding (splitPath)
 import GHC
 import Oracles

src/Rules/Program.hs

@@ -2,6 +2,7 @@ module Rules.Program (buildProgram) where
 
 import Data.Char
 
+import Base
 import Expression hiding (splitPath)
 import GHC hiding (ghci)
 import Oracles

src/Settings.hs

@@ -7,6 +7,7 @@ module Settings (
     getPackagePath, getTargetDirectory, getTargetPath, getPackageSources
     ) where
 
+import Base
 import Expression
 import Oracles
 import Oracles.ModuleFiles
@@ -16,13 +17,13 @@ import Settings.User
 import Settings.Ways
 
 getPackagePath :: Expr FilePath
-getPackagePath = liftM pkgPath getPackage
+getPackagePath = pkgPath <$> getPackage
 
 getTargetDirectory :: Expr FilePath
-getTargetDirectory = liftM2 targetDirectory getStage getPackage
+getTargetDirectory = targetDirectory <$> getStage <*> getPackage
 
 getTargetPath :: Expr FilePath
-getTargetPath = liftM2 targetPath getStage getPackage
+getTargetPath = targetPath <$> getStage <*> getPackage
 
 getPkgData :: (FilePath -> PackageData) -> Expr String
 getPkgData key = lift . pkgData . key =<< getTargetPath

src/Settings/Args.hs

 module Settings.Args (getArgs) where
 
+import Data.Monoid
+
 import Expression
 import Settings.Builders.Alex
 import Settings.Builders.Ar

src/Settings/Builders/Ar.hs

 module Settings.Builders.Ar (arArgs, arCmd) where
 
+import Base
 import Expression
 import Oracles
 import Predicates (builder)

src/Settings/Builders/DeriveConstants.hs

@@ -2,6 +2,7 @@ module Settings.Builders.DeriveConstants (
     derivedConstantsPath, deriveConstantsArgs
     ) where
 
+import Base
 import Expression
 import Oracles.Config.Flag
 import Oracles.Config.Setting

src/Settings/Builders/Gcc.hs

 module Settings.Builders.Gcc (gccArgs, gccMArgs) where
 
+import Development.Shake.FilePath
 import Expression
 import GHC
 import Oracles
+import Base ((-/-))
 import Predicates (package, stagedBuilder)
 import Settings
 

src/Settings/Builders/Ghc.hs

 module Settings.Builders.Ghc (ghcArgs, ghcMArgs, commonGhcArgs) where
 
+import Base
 import Expression
 import Oracles
 import GHC

src/Settings/Builders/GhcCabal.hs

@@ -3,6 +3,20 @@ module Settings.Builders.GhcCabal (
     customPackageArgs, ccArgs, cppArgs, ccWarnings, argStagedSettingList, needDll0
     ) where
 
+import Data.Monoid
+import Control.Monad.Trans.Class
+import Control.Monad.Extra
+
+import Development.Shake
+import Development.Shake.FilePath
+import Base ((-/-), bootPackageConstraints)
+import Oracles.Config.Setting
+import Oracles.Config.Flag
+import GHC
+import Package
+import Way
+import Builder
+import Stage
 import Expression
 import Predicates hiding (stage)
 import Settings

src/Settings/Builders/GhcPkg.hs

 module Settings.Builders.GhcPkg (ghcPkgArgs) where
 
+import Base
+import Builder
 import Expression
 import Predicates
 import Settings

src/Settings/Builders/Haddock.hs

 module Settings.Builders.Haddock (haddockArgs) where
 
+import Development.Shake.FilePath
+import Base
+import Package
 import Expression
 import Oracles
 import Predicates hiding (file)

src/Settings/Builders/Hsc2Hs.hs

 module Settings.Builders.Hsc2Hs (hsc2HsArgs) where
 
+import Control.Monad.Trans.Class
+import Control.Monad.Extra
+
+import Base
 import Expression
 import Oracles
 import Predicates (builder, stage0, notStage0)

src/Settings/Packages.hs

 module Settings.Packages (getPackages, knownPackages, findKnownPackage) where
 
+import Base
 import Expression
 import Predicates
 import Settings.User

src/Settings/TargetDirectory.hs

@@ -3,6 +3,7 @@ module Settings.TargetDirectory (
     pkgGhciLibraryFile
     ) where
 
+import Base
 import Expression
 import Settings.User
 

src/Settings/Ways.hs

 module Settings.Ways (getWays, getLibWays, getRtsWays) where
 
+import Data.Monoid
 import Expression
 import Predicates
 import Settings.User