Merge pull request #492 from Vlix/data-default-cleanup

Data default cleanup

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

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)

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

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)

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

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: []

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,

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

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)

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

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 =

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 (

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

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

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,