suppress some warnings under ghc 6.12.1 and clean up redundant imports to get rid of some others.

XMonad/Actions/CopyWindow.hs

@@ -26,7 +26,6 @@ module XMonad.Actions.CopyWindow (
 
 import XMonad
 import Control.Arrow ((&&&))
-import Control.Monad
 import qualified Data.List as L
 
 import XMonad.Actions.WindowGo

XMonad/Actions/DynamicWorkspaceOrder.hs

@@ -41,7 +41,6 @@ import qualified Data.Map as M
 import qualified Data.Set as S
 import Data.Maybe (fromJust, fromMaybe)
 import Data.Ord (comparing)
-import Data.Typeable
 
 -- $usage
 -- You can use this module by importing it into your ~\/.xmonad\/xmonad.hs file:

XMonad/Actions/MouseResize.hs

@@ -23,12 +23,8 @@ module XMonad.Actions.MouseResize
     , MouseResize (..)
     ) where
 
-import Control.Monad
-import Data.Maybe
-
 import XMonad
 import XMonad.Layout.Decoration
-import XMonad.Layout.LayoutModifier
 
 import XMonad.Layout.WindowArranger
 import XMonad.Util.XUtils

XMonad/Actions/OnScreen.hs

@@ -26,7 +26,6 @@ module XMonad.Actions.OnScreen (
     ) where
 
 import XMonad
-import XMonad.Core
 import XMonad.StackSet hiding (new)
 
 import Control.Monad (guard)

XMonad/Actions/PhysicalScreens.hs

@@ -24,7 +24,6 @@ module XMonad.Actions.PhysicalScreens (
 import XMonad
 import qualified XMonad.StackSet as W
 
-import qualified Graphics.X11.Xlib as X
 import Graphics.X11.Xinerama
 
 import Data.List (sortBy)

XMonad/Actions/SwapWorkspaces.hs

@@ -25,7 +25,6 @@ module XMonad.Actions.SwapWorkspaces (
 import XMonad (windows, X())
 import XMonad.StackSet
 import XMonad.Actions.CycleWS
-import XMonad.Util.Types
 import XMonad.Util.WorkspaceCompare
 
 

XMonad/Actions/TagWindows.hs

@@ -25,7 +25,7 @@ module XMonad.Actions.TagWindows (
                  tagDelPrompt
                  ) where
 
-import Data.List (nub,concat,sortBy)
+import Data.List (nub,sortBy)
 import Control.Monad
 
 import XMonad.StackSet hiding (filter)

XMonad/Actions/TopicSpace.hs

@@ -44,10 +44,9 @@ import Data.List
 import Data.Maybe (fromMaybe, isNothing, listToMaybe)
 import Data.Ord
 import qualified Data.Map as M
-import Control.Monad ((=<<),liftM2,when,unless,replicateM_)
+import Control.Monad (liftM2,when,unless,replicateM_)
 import System.IO
 
-import XMonad.Operations
 import qualified XMonad.StackSet as W
 
 import XMonad.Prompt

XMonad/Actions/UpdateFocus.hs

@@ -21,7 +21,6 @@ module XMonad.Actions.UpdateFocus (
 
 import XMonad
 import qualified XMonad.StackSet as W
-import Graphics.X11.Xlib.Extras
 import Control.Monad (when)
 import Data.Monoid
 

XMonad/Actions/Warp.hs

@@ -22,7 +22,6 @@ module XMonad.Actions.Warp (
                            warpToWindow
                           ) where
 
-import Data.Ratio
 import Data.List
 import XMonad
 import XMonad.StackSet as W

XMonad/Actions/WindowNavigation.hs

@@ -52,7 +52,6 @@ import qualified Data.Map as M
 import Data.Maybe (catMaybes, fromMaybe, listToMaybe)
 import Data.Ord (comparing)
 import qualified Data.Set as S
-import Graphics.X11.Xlib
 
 -- $usage
 --

XMonad/Actions/WithAll.hs

@@ -18,8 +18,6 @@ module XMonad.Actions.WithAll (
 import Data.Foldable hiding (foldr)
 
 import XMonad
-import XMonad.Core
-import XMonad.Operations
 import XMonad.StackSet
 
 -- $usage

XMonad/Config/Bluetile.hs

@@ -26,7 +26,6 @@ module XMonad.Config.Bluetile (
 
 import XMonad hiding ( (|||) )
 
-import XMonad.Layout hiding ( (|||) )
 import XMonad.Layout.BorderResize
 import XMonad.Layout.BoringWindows
 import XMonad.Layout.ButtonDecoration

XMonad/Config/Desktop.hs

@@ -54,7 +54,6 @@ module XMonad.Config.Desktop (
     ) where
 
 import XMonad
-import XMonad.Config (defaultConfig)
 import XMonad.Hooks.ManageDocks
 import XMonad.Hooks.EwmhDesktops
 import XMonad.Util.Cursor

XMonad/Config/Droundy.hs

@@ -10,7 +10,6 @@ module XMonad.Config.Droundy ( config, mytab ) where
 
 import XMonad hiding (keys, config, (|||))
 import qualified XMonad (keys)
-import XMonad.Config ( defaultConfig )
 
 import qualified XMonad.StackSet as W
 import qualified Data.Map as M

XMonad/Config/Sjanssen.hs

@@ -6,7 +6,6 @@ import qualified XMonad.StackSet as W
 import XMonad.Actions.CopyWindow
 import XMonad.Layout.Tabbed
 import XMonad.Layout.HintedTile
-import XMonad.Config (defaultConfig)
 import XMonad.Layout.NoBorders
 import XMonad.Hooks.DynamicLog
 import XMonad.Hooks.ManageDocks

XMonad/Hooks/ManageDocks.hs

@@ -30,7 +30,6 @@ module XMonad.Hooks.ManageDocks (
 -----------------------------------------------------------------------------
 import XMonad
 import Foreign.C.Types (CLong)
-import Control.Monad
 import XMonad.Layout.LayoutModifier
 import XMonad.Util.Types
 import XMonad.Util.WindowProperties (getProp32s)

XMonad/Hooks/Place.hs

@@ -42,7 +42,7 @@ import XMonad.Actions.FloatKeys
 import qualified Data.Map as M
 import Data.Ratio ((%))
 import Data.List (sortBy, minimumBy, partition)
-import Data.Maybe (maybe, fromMaybe, catMaybes)
+import Data.Maybe (fromMaybe, catMaybes)
 import Data.Monoid (Endo(..))
 import Control.Monad (guard, join)
 import Control.Monad.Trans (lift)

XMonad/Hooks/Script.hs

@@ -26,7 +26,6 @@ module XMonad.Hooks.Script (
 --
 import XMonad
 
-import Control.Monad.Trans
 import System.Directory
 
 -- $usage

XMonad/Hooks/ServerMode.hs

@@ -64,7 +64,6 @@ module XMonad.Hooks.ServerMode
     ) where
 
 import Control.Monad (when)
-import Data.List
 import Data.Monoid
 import System.IO
 

XMonad/Hooks/XPropManage.hs

@@ -18,13 +18,11 @@ module XMonad.Hooks.XPropManage (
                  ) where
 
 import Data.Char (chr)
-import Data.List (concat)
 import Data.Monoid (mconcat, Endo(..))
 
 import Control.Monad.Trans (lift)
 
 import XMonad
-import XMonad.ManageHook ((-->))
 
 -- $usage
 -- You can use this module with the following in your @~\/.xmonad\/xmonad.hs@:

XMonad/Layout/ComboP.hs

@@ -27,7 +27,7 @@ import Data.List ( delete, intersect, (\\) )
 import Data.Maybe ( isJust )
 import Control.Monad
 import XMonad hiding (focus)
-import XMonad.StackSet ( integrate, Workspace (..), Stack(..) )
+import XMonad.StackSet ( Workspace (..), Stack(..) )
 import XMonad.Layout.WindowNavigation
 import XMonad.Util.WindowProperties
 import qualified XMonad.StackSet as W

XMonad/Layout/DecorationAddons.hs

@@ -29,7 +29,6 @@ import XMonad.Layout.Maximize
 import XMonad.Hooks.ManageDocks
 import XMonad.Util.Font
 import XMonad.Util.PositionStore
-import XMonad.Util.XUtils (fi)
 
 import Control.Applicative((<$>))
 import Data.Maybe

XMonad/Layout/DecorationMadness.hs

@@ -94,7 +94,6 @@ import XMonad.Layout.TabBarDecoration
 
 import XMonad.Layout.Accordion
 import XMonad.Layout.Circle
-import XMonad.Layout.ResizeScreen
 import XMonad.Layout.WindowArranger
 import XMonad.Layout.SimpleFloat
 

XMonad/Layout/Dishes.hs

@@ -21,7 +21,6 @@ module XMonad.Layout.Dishes (
                               Dishes (..)
                             ) where
 
-import Data.List
 import XMonad
 import XMonad.StackSet (integrate)
 import Control.Monad (ap)

XMonad/Layout/IM.hs

@@ -29,8 +29,6 @@ module XMonad.Layout.IM (
 
 import XMonad
 import qualified XMonad.StackSet as S
-import Data.List
-import XMonad.Layout (splitHorizontallyBy)
 import XMonad.Layout.Grid
 import XMonad.Layout.LayoutModifier
 import XMonad.Util.WindowProperties

XMonad/Layout/IndependentScreens.hs

@@ -26,7 +26,6 @@ module XMonad.Layout.IndependentScreens (
 -- for the screen stuff
 import Control.Arrow hiding ((|||))
 import Control.Monad
-import Control.Monad.Instances
 import Data.List
 import Graphics.X11.Xinerama
 import XMonad

XMonad/Layout/LayoutBuilder.hs

@@ -28,11 +28,8 @@ module XMonad.Layout.LayoutBuilder (
 ) where
 
 import XMonad
-import XMonad.Layout
 import qualified XMonad.StackSet as W
-import Graphics.X11.Xlib
 import Data.Maybe (isJust)
-import Control.Monad
 
 -- $usage
 -- You can use this module with the following in your @~\/.xmonad\/xmonad.hs@:

XMonad/Layout/LayoutHints.hs

@@ -32,7 +32,7 @@ import XMonad.Layout.LayoutModifier(ModifiedLayout(..),
 import XMonad.Util.Types(Direction2D(..))
 import Control.Applicative((<$>))
 import Control.Arrow(Arrow((***), first, second))
-import Control.Monad(Monad(return), mapM, join)
+import Control.Monad(join)
 import Data.Function(on)
 import Data.List(sortBy)
 

XMonad/Layout/LimitWindows.hs

@@ -29,7 +29,6 @@ module XMonad.Layout.LimitWindows (
 import XMonad.Layout.LayoutModifier
 import XMonad
 import qualified XMonad.StackSet as W
-import XMonad.Layout (IncMasterN (..))
 import Control.Monad((<=<),guard)
 import Control.Applicative((<$>))
 import Data.Maybe(fromJust)

XMonad/Layout/NoBorders.hs

@@ -33,7 +33,6 @@ module XMonad.Layout.NoBorders (
 import XMonad
 import XMonad.Layout.LayoutModifier
 import qualified XMonad.StackSet as W
-import Control.Monad
 import Data.List
 import qualified Data.Map as M
 import Data.Function (on)

XMonad/Layout/SubLayouts.hs

@@ -51,13 +51,10 @@ import XMonad.Util.Types(Direction2D(..))
 import XMonad
 import Control.Applicative((<$>),(<*))
 import Control.Arrow(Arrow(second, (&&&)))
-import Control.Monad(Monad(return), Functor(..),
+import Control.Monad(MonadPlus(mplus), foldM, guard, when, join)
-                     MonadPlus(mplus), (=<<), sequence, foldM, guard, when, join)
+import Data.Function(on)
-import Data.Function((.), ($), flip, id, on)
+import Data.List(nubBy, (\\), find)
-import Data.List((++), foldr, filter, map, concatMap, elem,
+import Data.Maybe(isNothing, fromMaybe, listToMaybe, mapMaybe)
-                 notElem, null, nubBy, (\\), find)
-import Data.Maybe(Maybe(..), isNothing, maybe, fromMaybe, listToMaybe,
-                  mapMaybe)
 import Data.Traversable(sequenceA)
 
 import qualified XMonad.Layout.BoringWindows as B

XMonad/Layout/Tabbed.hs

@@ -28,7 +28,6 @@ module XMonad.Layout.Tabbed
     , Shrinker(..)
     ) where
 
-import Data.Maybe
 import Data.List
 
 import XMonad

XMonad/Layout/WindowArranger.hs

@@ -32,7 +32,6 @@ import XMonad.Util.XUtils (fi)
 
 import Control.Arrow
 import Data.List
-import Data.Maybe
 
 -- $usage
 -- You can use this module with the following in your

XMonad/Prompt/RunOrRaise.hs

@@ -26,7 +26,6 @@ import XMonad.Actions.WindowGo (runOrRaise)
 import XMonad.Util.Run (runProcessWithInput)
 
 import Control.Monad (liftM, liftM2)
-import Data.Maybe
 import System.Directory (doesDirectoryExist, doesFileExist, executable, getPermissions)
 
 {- $usage

XMonad/Prompt/Shell.hs

@@ -30,7 +30,6 @@ import System.Environment
 import Control.Monad
 import Data.List
 import System.Directory
-import System.IO
 import System.Posix.Files
 import XMonad.Util.Run
 import XMonad hiding (config)

XMonad/Prompt/Ssh.hs

@@ -26,7 +26,6 @@ import System.Directory
 import System.Environment
 
 import Control.Monad
-import Data.List
 import Data.Maybe
 
 -- $usage

XMonad/Prompt/Theme.hs

@@ -20,7 +20,6 @@ module XMonad.Prompt.Theme
 import Control.Arrow ( (&&&) )
 import qualified Data.Map as M
 import Data.Maybe ( fromMaybe )
-import Data.List
 import XMonad
 import XMonad.Prompt
 import XMonad.Layout.Decoration

XMonad/Util/Dzen.hs

@@ -38,7 +38,6 @@ module XMonad.Util.Dzen (
   ) where
 
 import Control.Monad
-import Data.List
 import XMonad
 import XMonad.StackSet
 import XMonad.Util.Run (runProcessWithInputAndWait, seconds)

XMonad/Util/NamedActions.hs

@@ -45,17 +45,14 @@ import XMonad.Actions.Submap(submap)
 import XMonad
 import System.Posix.Process(executeFile)
 import Control.Arrow(Arrow((&&&), second, (***)))
-import Data.Bits(Bits((.&.), complement, (.|.)))
+import Data.Bits(Bits((.&.), complement))
-import Data.Function((.), const, ($), flip, id)
+import Data.List (groupBy)
-import Data.List((++), filter, zip, map, concatMap, null, unlines,
-                 groupBy)
 import System.Exit(ExitCode(ExitSuccess), exitWith)
 
 import Control.Applicative ((<*>))
 
 import qualified Data.Map as M
 import qualified XMonad.StackSet as W
-import qualified XMonad
 
 -- $usage
 -- Here is an example config that demonstrates the usage of 'sendMessage'',

XMonad/Util/NamedScratchpad.hs

@@ -27,13 +27,11 @@ module XMonad.Util.NamedScratchpad (
   ) where
 
 import XMonad
-import XMonad.Core
-import XMonad.ManageHook (composeAll,doFloat)
 import XMonad.Hooks.ManageHelpers (doRectFloat)
 import XMonad.Actions.DynamicWorkspaces (addHiddenWorkspace)
 
 import Control.Monad (filterM)
-import Data.Maybe (maybe,listToMaybe)
+import Data.Maybe (listToMaybe)
 
 import qualified XMonad.StackSet as W
 

XMonad/Util/Paste.hs

@@ -29,7 +29,6 @@ import Control.Monad.Reader (asks)
 import XMonad.Operations (withFocused)
 import Data.Char (isUpper)
 import Data.Maybe (listToMaybe)
-import Graphics.X11.Xlib.Misc (stringToKeysym)
 import XMonad.Util.XSelection (getSelection)
 import XMonad.Util.EZConfig (parseKey)
 import Text.ParserCombinators.ReadP (readP_to_S)

XMonad/Util/PositionStore.hs

@@ -27,9 +27,6 @@ module XMonad.Util.PositionStore (
 
 import XMonad
 import qualified XMonad.Util.ExtensibleState as XS
-import Graphics.X11.Xlib
-import Graphics.X11.Types
-import Data.Typeable
 import qualified Data.Map as M
 
 -- Store window positions relative to the upper left screen edge

XMonad/Util/Scratchpad.hs

@@ -24,7 +24,6 @@ module XMonad.Util.Scratchpad (
   ) where
 
 import XMonad
-import XMonad.Core
 import qualified XMonad.StackSet as W
 import XMonad.Util.NamedScratchpad
 

XMonad/Util/XSelection.hs

@@ -23,7 +23,7 @@ module XMonad.Util.XSelection (  -- * Usage
                                  transformSafePromptSelection) where
 
 import Control.Exception as E (catch)
-import Control.Monad(Monad (return, (>>)), Functor(..), liftM, join)
+import Control.Monad (liftM, join)
 import Data.Maybe (fromMaybe)
 import XMonad
 import XMonad.Util.Run (safeSpawn, unsafeSpawn)

xmonad-contrib.cabal

@@ -50,12 +50,18 @@ library
         cpp-options: -DXFT
 
     build-depends:      mtl, unix, X11>=1.5.0.0 && < 1.6, xmonad>=0.9.1, xmonad<0.10, utf8-string
-    ghc-options:        -fwarn-tabs -Wall
+
+    if true
+        ghc-options:    -fwarn-tabs -Wall
+
     extensions:         ForeignFunctionInterface
 
     if flag(testing)
         ghc-options:    -fwarn-tabs -Werror
 
+    if impl(ghc >= 6.12.1)
+        ghc-options:    -fno-warn-warnings-deprecations -fno-warn-unused-do-bind    
+
     if impl (ghc == 6.10.1) && arch (x86_64)
         ghc-options:    -O0