Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions default.nix
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion happstack-server.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ Library
containers,
directory >=1.2,
exceptions,
extensible-exceptions,
filepath,
hslogger >= 1.0.2,
html,
Expand Down
2 changes: 1 addition & 1 deletion src/Happstack/Server/FileServe/BuildingBlocks.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Happstack/Server/Internal/Handler.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/Happstack/Server/Internal/Listen.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down