Skip to content

Remove unnecessary extensible-exceptions dependency #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
konsumlamm wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −7
Open

Remove unnecessary extensible-exceptions dependency #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ mkDerivation, base, bytestring, extensible-exceptions
{ mkDerivation, base, bytestring
, happstack-server, hslogger, HsOpenSSL, network, openssl, sendfile
, stdenv, time, unix
}:
Expand All @@ -7,7 +7,7 @@ mkDerivation {
version = "7.1.6";
src = ./.;
libraryHaskellDepends = [
base bytestring extensible-exceptions happstack-server hslogger
base bytestring happstack-server hslogger
HsOpenSSL network sendfile time unix
];
librarySystemDepends = [ openssl ];
Expand Down
3 changes: 1 addition & 2 deletions happstack-server-tls.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,8 @@ Library
Happstack.Server.Internal.TLS
Happstack.Server.SimpleHTTPS

Build-Depends: base < 5,
Build-Depends: base >= 4 && < 5,
bytestring >= 0.9 && < 0.13,
extensible-exceptions == 0.1.*,
happstack-server >= 6.6.4 && < 7.10,
hslogger >= 1.1 && < 1.4,
HsOpenSSL >= 0.10 && < 0.12,
Expand Down
4 changes: 2 additions & 2 deletions shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ let

inherit (nixpkgs) pkgs;

f = { mkDerivation, base, bytestring, extensible-exceptions
f = { mkDerivation, base, bytestring
, happstack-server, hslogger, HsOpenSSL, network, openssl, sendfile
, stdenv, time, unix, cabal-install
}:
Expand All @@ -13,7 +13,7 @@ let
version = "7.1.6";
src = ./.;
libraryHaskellDepends = [
base bytestring extensible-exceptions happstack-server hslogger
base bytestring happstack-server hslogger
HsOpenSSL network sendfile time unix
];
librarySystemDepends = [ openssl ];
Expand Down
2 changes: 1 addition & 1 deletion src/Happstack/Server/Internal/TLS.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
module Happstack.Server.Internal.TLS where

import Control.Concurrent (forkIO, killThread, myThreadId)
import Control.Exception.Extensible as E
import Control.Exception as E
import Control.Monad (forever, when)
import Data.Time (UTCTime)
import GHC.IO.Exception (IOErrorType(..))
Expand Down