diff --git a/HaskellNet-SSL.cabal b/HaskellNet-SSL.cabal index 88c245d..41f0de5 100644 --- a/HaskellNet-SSL.cabal +++ b/HaskellNet-SSL.cabal @@ -36,14 +36,16 @@ library HaskellNet >= 0.3, tls >= 1.2, connection >= 0.2.7, - network >= 2.4, + network >= 3, + network-bsd >= 2.8, bytestring, data-default else build-depends: base >= 4 && < 5, HaskellNet >= 0.3 && < 0.6, - tls >= 1.2 && < 1.5, - connection >= 0.2.7 && < 0.3, - network >= 2.4 && < 2.9, + tls >= 1.2 && < 1.6, + connection >= 0.2.7 && < 0.4, + network >= 3 && < 3.2, + network-bsd >= 2.8 && < 2.9, bytestring, data-default diff --git a/src/Network/HaskellNet/SSL.hs b/src/Network/HaskellNet/SSL.hs index acb9b84..f563289 100644 --- a/src/Network/HaskellNet/SSL.hs +++ b/src/Network/HaskellNet/SSL.hs @@ -3,12 +3,12 @@ module Network.HaskellNet.SSL , defaultSettingsWithPort ) where -import Network.Socket.Internal (PortNumber) +import Network.Socket (PortNumber) data Settings = Settings - { sslPort :: PortNumber - , sslMaxLineLength :: Int - , sslLogToConsole :: Bool + { sslPort :: PortNumber + , sslMaxLineLength :: Int + , sslLogToConsole :: Bool , sslDisableCertificateValidation :: Bool } deriving(Eq, Ord, Show) diff --git a/stack.yaml b/stack.yaml index 4525c3a..7262017 100644 --- a/stack.yaml +++ b/stack.yaml @@ -15,7 +15,7 @@ # resolver: # name: custom-snapshot # location: "./custom-snapshot.yaml" -resolver: lts-7.19 +resolver: lts-15.0 # User packages to be built. # Various formats can be used as shown in the example below. @@ -39,7 +39,9 @@ packages: - '.' # Dependency packages to be pulled from upstream that are not in the resolver # (e.g., acme-missiles-0.3) -extra-deps: [] +extra-deps: + - git: git://github.com/jtdaugherty/HaskellNet.git + commit: 5aa1f3b009253b02c4822005ac59ee208a10a347 # Override default flag values for local packages and extra-deps flags: {} diff --git a/stack.yaml.lock b/stack.yaml.lock new file mode 100644 index 0000000..035cfb1 --- /dev/null +++ b/stack.yaml.lock @@ -0,0 +1,26 @@ +# This file was autogenerated by Stack. +# You should not edit this file by hand. +# For more information, please see the documentation at: +# https://docs.haskellstack.org/en/stable/lock_files + +packages: +- completed: + cabal-file: + size: 2069 + sha256: 9192ac19ea5da3cd4b8c86a4266592aff7b9256311aa5f42ae6de94ccacf1366 + name: HaskellNet + version: 0.5.1 + git: git://github.com/jtdaugherty/HaskellNet.git + pantry-tree: + size: 4011 + sha256: 921b437ef18ccb04f889301c407263d6b5b72c5864803a000b1e61328988ce70 + commit: 5aa1f3b009253b02c4822005ac59ee208a10a347 + original: + git: git://github.com/jtdaugherty/HaskellNet.git + commit: 5aa1f3b009253b02c4822005ac59ee208a10a347 +snapshots: +- completed: + size: 488576 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/15/0.yaml + sha256: e4b6a87b47ec1cf63a7f1a0884a3b276fce2b0d174a10e8753c4f618e7983568 + original: lts-15.0