From 0440b7e2ce943d960234c50957a55025771f567a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Mon, 15 Jan 2024 13:08:23 +0100 Subject: [PATCH 1/2] Use crypton-connection The old connection package is locked on tls 1.6. --- irc-client.cabal | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/irc-client.cabal b/irc-client.cabal index 490665b..49b3b17 100644 --- a/irc-client.cabal +++ b/irc-client.cabal @@ -90,7 +90,7 @@ library , bytestring >=0.10 && <0.12 , containers >=0.1 && <1 , conduit >=1.2.8 && <1.4 - , connection >=0.2 && <0.4 + , crypton-connection >=0.3 && <0.4 , contravariant >=0.1 && <1.6 , exceptions >=0.6 && <0.11 , irc-conduit >=0.3 && <0.4 @@ -105,9 +105,9 @@ library , time >=1.4 && <2 , tls >=1.3 && <1.6 , transformers >=0.3 && <0.6 - , x509 >=1.6 && <1.8 - , x509-store >=1.6 && <1.7 - , x509-validation >=1.6 && <1.7 + , crypton-x509 >=1.6 && <1.8 + , crypton-x509-store >=1.6 && <1.7 + , crypton-x509-validation >=1.6 && <1.7 -- Directories containing source files. -- hs-source-dirs: From a1329989d7a33c684525d4d550b1466f4b1872d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Mon, 15 Jan 2024 13:08:42 +0100 Subject: [PATCH 2/2] Remove redundant imports --- Network/IRC/Client/Events.hs | 3 +-- Network/IRC/Client/Internal.hs | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Network/IRC/Client/Events.hs b/Network/IRC/Client/Events.hs index eb922a8..c55e055 100644 --- a/Network/IRC/Client/Events.hs +++ b/Network/IRC/Client/Events.hs @@ -44,14 +44,13 @@ module Network.IRC.Client.Events , module Network.IRC.Conduit.Lens ) where -import Control.Applicative ((<$>), (<|>)) +import Control.Applicative ((<|>)) import Control.Concurrent.STM (atomically, modifyTVar, readTVar) import Control.Monad.Catch (SomeException, fromException, throwM) import Control.Monad.IO.Class (liftIO) import Data.Char (isAlphaNum) import Data.Maybe (fromMaybe) -import Data.Monoid ((<>)) import Data.Text (Text, breakOn, takeEnd, toUpper) import Data.Time.Clock (getCurrentTime) import Data.Time.Format (formatTime) diff --git a/Network/IRC/Client/Internal.hs b/Network/IRC/Client/Internal.hs index 24ea553..5aac6b9 100644 --- a/Network/IRC/Client/Internal.hs +++ b/Network/IRC/Client/Internal.hs @@ -22,7 +22,6 @@ module Network.IRC.Client.Internal , module Network.IRC.Client.Internal.Types ) where -import Control.Applicative ((<$>)) import Control.Concurrent (forkIO, killThread, myThreadId, threadDelay, throwTo)