diff --git a/XMonad/Hooks/DebugEvents.hs b/XMonad/Hooks/DebugEvents.hs index 5208b663..341a9287 100644 --- a/XMonad/Hooks/DebugEvents.hs +++ b/XMonad/Hooks/DebugEvents.hs @@ -30,7 +30,7 @@ import XMonad.Util.DebugWindow (debugWindow) -- import Graphics.X11.Xlib.Extras.GetAtomName (getAtomName) -import Control.Exception.Extensible as E +import Control.Exception as E import Control.Monad.State import Control.Monad.Reader import Data.Char (isDigit) diff --git a/XMonad/Prompt.hs b/XMonad/Prompt.hs index 77e19fd9..3beee729 100644 --- a/XMonad/Prompt.hs +++ b/XMonad/Prompt.hs @@ -100,7 +100,7 @@ import XMonad.Util.XSelection (getSelection) import Codec.Binary.UTF8.String (decodeString,isUTF8Encoded) import Control.Arrow (first, second, (&&&), (***)) import Control.Concurrent (threadDelay) -import Control.Exception.Extensible as E hiding (handle) +import Control.Exception as E hiding (handle) import Control.Monad.State import Data.Bits import Data.Char (isSpace) diff --git a/XMonad/Prompt/AppendFile.hs b/XMonad/Prompt/AppendFile.hs index da3ca402..22682163 100644 --- a/XMonad/Prompt/AppendFile.hs +++ b/XMonad/Prompt/AppendFile.hs @@ -31,7 +31,7 @@ import XMonad.Core import XMonad.Prompt import System.IO -import Control.Exception.Extensible (bracket) +import Control.Exception (bracket) -- $usage -- diff --git a/XMonad/Prompt/Man.hs b/XMonad/Prompt/Man.hs index 3e6b245e..cc324ac9 100644 --- a/XMonad/Prompt/Man.hs +++ b/XMonad/Prompt/Man.hs @@ -33,7 +33,7 @@ import System.Directory import System.Process import System.IO -import qualified Control.Exception.Extensible as E +import qualified Control.Exception as E import Control.Monad import Data.List import Data.Maybe diff --git a/XMonad/Util/DebugWindow.hs b/XMonad/Util/DebugWindow.hs index 04cd4ef7..5620f04c 100644 --- a/XMonad/Util/DebugWindow.hs +++ b/XMonad/Util/DebugWindow.hs @@ -20,7 +20,7 @@ import Prelude import XMonad import Codec.Binary.UTF8.String (decodeString) -import Control.Exception.Extensible as E +import Control.Exception as E import Control.Monad (when) import Data.List (unfoldr ,intercalate diff --git a/XMonad/Util/NamedWindows.hs b/XMonad/Util/NamedWindows.hs index 95ac8f92..197c20e3 100644 --- a/XMonad/Util/NamedWindows.hs +++ b/XMonad/Util/NamedWindows.hs @@ -23,7 +23,7 @@ module XMonad.Util.NamedWindows ( unName ) where -import Control.Exception.Extensible as E +import Control.Exception as E import Data.Maybe ( fromMaybe, listToMaybe ) import qualified XMonad.StackSet as W ( peek ) diff --git a/XMonad/Util/XSelection.hs b/XMonad/Util/XSelection.hs index e8c37c56..3ddcad9e 100644 --- a/XMonad/Util/XSelection.hs +++ b/XMonad/Util/XSelection.hs @@ -22,7 +22,7 @@ module XMonad.Util.XSelection ( -- * Usage transformPromptSelection, transformSafePromptSelection) where -import Control.Exception.Extensible as E (catch,SomeException(..)) +import Control.Exception as E (catch,SomeException(..)) import Data.Maybe (fromMaybe) import XMonad import XMonad.Util.Run (safeSpawn, unsafeSpawn) diff --git a/xmonad-contrib.cabal b/xmonad-contrib.cabal index 598daa48..8026719e 100644 --- a/xmonad-contrib.cabal +++ b/xmonad-contrib.cabal @@ -51,7 +51,6 @@ library bytestring >= 0.10 && < 0.11, containers >= 0.5 && < 0.7, directory, - extensible-exceptions, filepath, old-locale, old-time, @@ -377,7 +376,6 @@ test-suite properties build-depends: base , QuickCheck >= 2 , containers - , extensible-exceptions , xmonad-contrib , directory , X11>=1.6.1 && < 1.10