From 58f6b5ee0c23a0615e43292dbbacf40636dcd7a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Mon, 15 Jan 2024 13:05:07 +0100 Subject: [PATCH 1/2] Use crypton-connection The old connection package is locked on tls 1.6. --- irc-conduit.cabal | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/irc-conduit.cabal b/irc-conduit.cabal index 7897b9a..fc14dca 100644 --- a/irc-conduit.cabal +++ b/irc-conduit.cabal @@ -84,7 +84,7 @@ library , bytestring >=0.10 && <0.12 , conduit >=1.2.8 && <1.4 , conduit-extra >=1.1 && <1.4 - , connection >=0.2 && <0.4 + , crypton-connection >=0.3 && <0.4 , irc >=0.6 && <0.7 , irc-ctcp >=0.1.1 && <0.2 , network-conduit-tls >=1.1 && <1.4 @@ -93,7 +93,7 @@ library , time >=1.4 && <2 , tls >=1.3 && <1.6 , transformers >=0.3 && <0.6 - , x509-validation >=1.6 && <1.7 + , crypton-x509-validation >=1.6 && <1.7 -- Directories containing source files. -- hs-source-dirs: From 311241ac24f082cd88c9d65385df5c555e2204ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Mon, 15 Jan 2024 13:06:05 +0100 Subject: [PATCH 2/2] Remove redundant imports --- Network/IRC/Conduit.hs | 2 -- Network/IRC/Conduit/Internal.hs | 2 -- 2 files changed, 4 deletions(-) diff --git a/Network/IRC/Conduit.hs b/Network/IRC/Conduit.hs index 1185749..e33d485 100644 --- a/Network/IRC/Conduit.hs +++ b/Network/IRC/Conduit.hs @@ -58,7 +58,6 @@ module Network.IRC.Conduit , module Network.IRC.Conduit.Lens ) where -import Control.Applicative ((*>)) import Control.Concurrent (newMVar, putMVar, takeMVar, threadDelay) import Control.Concurrent.Async (Concurrently(..)) @@ -71,7 +70,6 @@ import Data.Conduit.Network (AppData, appSink, appSource, clientSettings, runTCPClient) import Data.Conduit.Network.TLS (TLSClientConfig(..), runTLSClient, tlsClientConfig) -import Data.Monoid ((<>)) import Data.Text (unpack) import Data.Text.Encoding (decodeUtf8) import Data.Time.Clock (NominalDiffTime, addUTCTime, diff --git a/Network/IRC/Conduit/Internal.hs b/Network/IRC/Conduit/Internal.hs index 3b9eabf..7124a05 100644 --- a/Network/IRC/Conduit/Internal.hs +++ b/Network/IRC/Conduit/Internal.hs @@ -16,14 +16,12 @@ -- considered to form part of the public interface of this library. module Network.IRC.Conduit.Internal where -import Control.Applicative ((<$>)) import Control.Arrow ((&&&)) import Data.ByteString (ByteString, isSuffixOf, singleton, unpack) import Data.Char (ord) import Data.Conduit (ConduitM, await, yield) import Data.Maybe (isJust, listToMaybe) -import Data.Monoid ((<>)) import Data.Profunctor (Choice) import Data.String (fromString) import Network.IRC.CTCP (CTCPByteString, getUnderlyingByteString,