diff --git a/debug/src/RetrieveCertificate.hs b/debug/src/RetrieveCertificate.hs index a1817ec3b..8e3f2e11d 100644 --- a/debug/src/RetrieveCertificate.hs +++ b/debug/src/RetrieveCertificate.hs @@ -2,7 +2,7 @@ import Control.Exception import qualified Data.ByteString.Char8 as B -import Data.Default +import Data.Default (def) import Data.IORef import Data.PEM import Data.X509 as X509 diff --git a/debug/src/SimpleClient.hs b/debug/src/SimpleClient.hs index aedde6a1d..4c5b19c19 100644 --- a/debug/src/SimpleClient.hs +++ b/debug/src/SimpleClient.hs @@ -7,7 +7,7 @@ import Crypto.Random import qualified Data.ByteString as B import qualified Data.ByteString.Char8 as BC import qualified Data.ByteString.Lazy.Char8 as LC -import Data.Default +import Data.Default (def) import Data.IORef import Data.X509.CertificateStore import Network.Socket (PortNumber, close, connect, socket) diff --git a/debug/src/SimpleServer.hs b/debug/src/SimpleServer.hs index 945c4cad6..904b903fb 100644 --- a/debug/src/SimpleServer.hs +++ b/debug/src/SimpleServer.hs @@ -8,7 +8,7 @@ import Crypto.Random import qualified Data.ByteString as B import qualified Data.ByteString.Char8 as BC import qualified Data.ByteString.Lazy.Char8 as LC -import Data.Default +import Data.Default (def) import Data.X509.CertificateStore import Network.Socket (accept, bind, close, listen, socket) import qualified Network.Socket as S diff --git a/debug/src/Stunnel.hs b/debug/src/Stunnel.hs index 98a6bf89e..8c135e3cb 100644 --- a/debug/src/Stunnel.hs +++ b/debug/src/Stunnel.hs @@ -7,7 +7,7 @@ import qualified Control.Exception as E import qualified Crypto.PubKey.DH as DH () import qualified Data.ByteString as B import qualified Data.ByteString.Lazy as L -import Data.Default +import Data.Default (def) import Data.X509.CertificateStore import Data.X509.Validation import Network.Socket hiding (Debug) diff --git a/debug/tls-debug.cabal b/debug/tls-debug.cabal index 623d55b40..2b8e0353a 100644 --- a/debug/tls-debug.cabal +++ b/debug/tls-debug.cabal @@ -36,7 +36,7 @@ executable tls-stunnel crypton-x509-store, crypton-x509-system >=1.0, crypton-x509-validation >=1.5, - data-default >= 0.8, + data-default, crypton, tls >=1.5.5, tls-session-manager diff --git a/stack.yaml b/stack.yaml index 02a0536dc..b41a88766 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,3 +1,8 @@ -# ~*~ auto-generated by haskell-ci with config : 612b7b1ece7f8fc31b366a09f7f526209ba27c62216380e24186ee1751a48093 ~*~ -{ resolver: lts-14.27, packages: [ core/, debug/, session/ ], extra-deps: [ cryptonite-0.27 ], flags: {} } - +resolver: lts-22.39 +packages: + - debug + - tls + - tls-session-manager +extra-deps: + - crypto-token-0.1.2 +# flags: [] diff --git a/tls-session-manager/tls-session-manager.cabal b/tls-session-manager/tls-session-manager.cabal index b5e5edf95..2db9eebc7 100644 --- a/tls-session-manager/tls-session-manager.cabal +++ b/tls-session-manager/tls-session-manager.cabal @@ -21,7 +21,7 @@ library ghc-options: -Wall build-depends: base >=4.7 && <5, - auto-update >= 0.1 && < 0.3, + auto-update >= 0.2.2 && < 0.3, basement >= 0.0.16 && < 0.1, bytestring >= 0.10 && < 0.13, clock >= 0.8 && < 0.9, diff --git a/tls/Benchmarks/Benchmarks.hs b/tls/Benchmarks/Benchmarks.hs index f87623eae..df91086c4 100644 --- a/tls/Benchmarks/Benchmarks.hs +++ b/tls/Benchmarks/Benchmarks.hs @@ -5,7 +5,7 @@ module Main where import Certificate import Connection import Control.Concurrent.Chan -import Data.Default +import Data.Default (def) import Data.IORef import Data.X509 import Data.X509.Validation diff --git a/tls/Network/TLS/Hooks.hs b/tls/Network/TLS/Hooks.hs index bafe55235..9d8ad0aba 100644 --- a/tls/Network/TLS/Hooks.hs +++ b/tls/Network/TLS/Hooks.hs @@ -5,7 +5,7 @@ module Network.TLS.Hooks ( ) where import qualified Data.ByteString as B -import Data.Default +import Data.Default (Default (def)) import Network.TLS.Struct (Handshake, Header) import Network.TLS.Struct13 (Handshake13) import Network.TLS.X509 (CertificateChain) diff --git a/tls/Network/TLS/Parameters.hs b/tls/Network/TLS/Parameters.hs index fd2708cde..68c43bf69 100644 --- a/tls/Network/TLS/Parameters.hs +++ b/tls/Network/TLS/Parameters.hs @@ -23,7 +23,7 @@ module Network.TLS.Parameters ( ) where import qualified Data.ByteString as B -import Data.Default +import Data.Default (Default (def)) import Network.TLS.Cipher import Network.TLS.Compression import Network.TLS.Credentials diff --git a/tls/Network/TLS/QUIC.hs b/tls/Network/TLS/QUIC.hs index 5d1b6f1be..57f431b36 100644 --- a/tls/Network/TLS/QUIC.hs +++ b/tls/Network/TLS/QUIC.hs @@ -87,7 +87,7 @@ import Network.TLS.Record.State import Network.TLS.Struct import Network.TLS.Types -import Data.Default +import Data.Default (def) nullBackend :: Backend nullBackend = diff --git a/tls/test/Arbitrary.hs b/tls/test/Arbitrary.hs index 8641e3075..e14cc3250 100644 --- a/tls/test/Arbitrary.hs +++ b/tls/test/Arbitrary.hs @@ -5,7 +5,7 @@ module Arbitrary where import Control.Monad import qualified Data.ByteString as B -import Data.Default +import Data.Default (def) import Data.List import Data.Word import Data.X509 ( diff --git a/tls/test/HandshakeSpec.hs b/tls/test/HandshakeSpec.hs index 812d9edea..b883014a9 100644 --- a/tls/test/HandshakeSpec.hs +++ b/tls/test/HandshakeSpec.hs @@ -5,7 +5,7 @@ module HandshakeSpec where import Control.Monad import qualified Data.ByteString as B import qualified Data.ByteString.Lazy as L -import Data.Default +import Data.Default (def) import Data.IORef import Data.List import Data.Maybe diff --git a/tls/test/Run.hs b/tls/test/Run.hs index 8a1d404d9..41d303294 100644 --- a/tls/test/Run.hs +++ b/tls/test/Run.hs @@ -21,7 +21,7 @@ import Control.Monad import Data.ByteString (ByteString) import qualified Data.ByteString as B import qualified Data.ByteString.Lazy as L -import Data.Default +import Data.Default (def) import Data.IORef import Network.TLS import System.Timeout diff --git a/tls/tls.cabal b/tls/tls.cabal index 5a0c71ea6..353dd56a2 100644 --- a/tls/tls.cabal +++ b/tls/tls.cabal @@ -122,7 +122,7 @@ library crypton-x509 >= 1.7 && < 1.8, crypton-x509-store >= 1.6 && < 1.7, crypton-x509-validation >= 1.6.5 && < 1.7, - data-default >= 0.8 && < 0.9, + data-default, memory >= 0.18 && < 0.19, mtl >= 2.2 && < 2.4, network >= 3.1,