From afaade75a5793878339042c6b8bda9da9bb7bfc1 Mon Sep 17 00:00:00 2001 From: konsumlamm Date: Thu, 25 Dec 2025 02:06:21 +0100 Subject: [PATCH] Remove unnecessary `extensible-exceptions` dependency --- default.nix | 4 ++-- happstack-server.cabal | 1 - src/Happstack/Server/FileServe/BuildingBlocks.hs | 2 +- src/Happstack/Server/Internal/Handler.hs | 2 +- src/Happstack/Server/Internal/Listen.hs | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/default.nix b/default.nix index c886423..59733e7 100644 --- a/default.nix +++ b/default.nix @@ -1,5 +1,5 @@ { mkDerivation, base, base64-bytestring, blaze-html, bytestring -, containers, directory, exceptions, extensible-exceptions +, containers, directory, exceptions , filepath, hslogger, html, HUnit, monad-control, mtl, network , network-uri, old-locale, parsec, process, semigroups, sendfile , stdenv, syb, system-filepath, template-haskell, text, threads @@ -12,7 +12,7 @@ mkDerivation { src = ./.; libraryHaskellDepends = [ base base64-bytestring blaze-html bytestring containers directory - exceptions extensible-exceptions filepath hslogger html + exceptions filepath hslogger html monad-control mtl network network-uri old-locale parsec process semigroups sendfile syb system-filepath template-haskell text threads time transformers transformers-base transformers-compat diff --git a/happstack-server.cabal b/happstack-server.cabal index 698c2b5..9a8cc06 100644 --- a/happstack-server.cabal +++ b/happstack-server.cabal @@ -88,7 +88,6 @@ Library containers, directory >=1.2, exceptions, - extensible-exceptions, filepath, hslogger >= 1.0.2, html, diff --git a/src/Happstack/Server/FileServe/BuildingBlocks.hs b/src/Happstack/Server/FileServe/BuildingBlocks.hs index 36e5808..189d63f 100644 --- a/src/Happstack/Server/FileServe/BuildingBlocks.hs +++ b/src/Happstack/Server/FileServe/BuildingBlocks.hs @@ -54,7 +54,7 @@ module Happstack.Server.FileServe.BuildingBlocks isDot ) where -import Control.Exception.Extensible as E (IOException, bracket, catch) +import Control.Exception as E (IOException, bracket, catch) import Control.Monad (MonadPlus(mzero), msum) import Control.Monad.Trans (MonadIO(liftIO)) import qualified Data.ByteString.Lazy.Char8 as L diff --git a/src/Happstack/Server/Internal/Handler.hs b/src/Happstack/Server/Internal/Handler.hs index 5e4c7b1..b0d92a8 100644 --- a/src/Happstack/Server/Internal/Handler.hs +++ b/src/Happstack/Server/Internal/Handler.hs @@ -10,7 +10,7 @@ import qualified Paths_happstack_server as Paths import qualified Data.Version as DV import Control.Applicative (pure) import Control.Concurrent (newMVar, newEmptyMVar, tryTakeMVar) -import Control.Exception.Extensible as E +import Control.Exception as E import Control.Monad import Data.List(elemIndex) import Data.Char(toLower) diff --git a/src/Happstack/Server/Internal/Listen.hs b/src/Happstack/Server/Internal/Listen.hs index 1069ba0..cbe488f 100644 --- a/src/Happstack/Server/Internal/Listen.hs +++ b/src/Happstack/Server/Internal/Listen.hs @@ -8,7 +8,7 @@ import Happstack.Server.Internal.Socket (acceptLite) import Happstack.Server.Internal.TimeoutManager (cancel, initialize, register, forceTimeoutAll) import Happstack.Server.Internal.TimeoutSocket as TS import qualified Control.Concurrent.Thread.Group as TG -import Control.Exception.Extensible as E +import Control.Exception as E import Control.Concurrent (forkIO, killThread, myThreadId) import Control.Monad import qualified Data.Maybe as Maybe