diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Build Status](https://travis-ci.org/LTI2000/hinterface.svg?branch=master)](https://travis-ci.org/LTI2000/hinterface) +[![Build Status](https://travis-ci.org/lindenbaum/hinterface.svg?branch=master)](https://travis-ci.org/lindenbaum/hinterface) # hinterface - Haskell / Erlang interoperability library diff --git a/hinterface.cabal b/hinterface.cabal --- a/hinterface.cabal +++ b/hinterface.cabal @@ -1,12 +1,12 @@ -name: hinterface -version: 0.5.0.2 cabal-version: >=1.22 -build-type: Simple +name: hinterface +version: 0.6.0.0 license: BSD3 license-file: LICENSE -copyright: 2016 Timo Koepke, Sven Heyll +copyright: 2016-2018 Timo Koepke, Sven Heyll maintainer: timo.koepke@googlemail.com, sven.heyll@gmail.com -homepage: https://github.com/LTI2000/hinterface +author: Timo Koepke, Sven Heyll +homepage: https://github.com/lindenbaum/hinterface synopsis: Haskell / Erlang interoperability library description: A library for building nodes of a distributed Erlang system in Haskell. @@ -16,7 +16,7 @@ In it's preliminary state hinterface supports of Erlangs binary terms and a subset of the distribution protocol. category: Language -author: Timo Koepke, Sven Heyll +build-type: Simple extra-source-files: README.md stack.yaml @@ -26,7 +26,7 @@ source-repository head type: git - location: https://github.com/LTI2000/hinterface.git + location: https://github.com/lindenbaum/hinterface.git library exposed-modules: @@ -46,56 +46,56 @@ Foreign.Erlang.ControlMessage Foreign.Erlang.Mailbox Foreign.Erlang.Connection - build-depends: - QuickCheck >=2.9.2, - array >=0.5.1.1, - async >=2.1.1, - base >=4.9 && <5, - binary >=0.8.3.0, - bytestring >=0.10.8.1, - containers >=0.5.7.1, - cryptonite >=0.21, - exceptions >=0.8.3, - lifted-async >=0.9.1.1, - lifted-base >=0.2.3.10, - memory >=0.14.2, - monad-control >=1.0.1.0, - monad-logger >=0.3.21, - mtl >=2.2.1, - network >=2.6.3.1, - random >=1.1, - resourcet >=1.1.9, - safe-exceptions >=0.1.5.0, - stm >=2.4.4.1, - text >=1.2.2.1, - transformers >=0.5.2.0, - transformers-base >=0.4.4, - vector >=0.11.0.0 + hs-source-dirs: src default-language: Haskell2010 default-extensions: OverloadedStrings NamedFieldPuns FlexibleContexts - hs-source-dirs: src ghc-options: -Wall -O2 -funbox-strict-fields + build-depends: + QuickCheck >=2.11.3 && <2.12, + array >=0.5.2.0 && <0.6, + async >=2.2.1 && <2.3, + base >=4.9 && <5, + binary >=0.8.5.1 && <0.9, + bytestring >=0.10.8.2 && <0.11, + containers >=0.5.11.0 && <0.6, + cryptonite ==0.25.*, + exceptions >=0.10.0 && <0.11, + lifted-async >=0.10.0.2 && <0.11, + lifted-base >=0.2.3.12 && <0.3, + memory >=0.14.16 && <0.15, + monad-control >=1.0.2.3 && <1.1, + monad-logger >=0.3.29 && <0.4, + mtl >=2.2.2 && <2.3, + network >=2.6.3.6 && <2.7, + random ==1.1.*, + resourcet >=1.2.1 && <1.3, + safe-exceptions >=0.1.7.0 && <0.2, + stm >=2.4.5.0 && <2.5, + text >=1.2.3.0 && <1.3, + transformers >=0.5.5.0 && <0.6, + transformers-base >=0.4.5.2 && <0.5, + vector >=0.12.0.1 && <0.13 test-suite hinterface-test type: exitcode-stdio-1.0 main-is: Spec.hs - build-depends: - QuickCheck >=2.9.2, - async >=2.1.1, - base >=4.9 && <5, - binary >=0.8.3.0, - bytestring >=0.10.8.1, - hinterface >=0.5.0.2, - hspec >=2.4.3, - monad-logger >=0.3.21, - transformers >=0.5.2.0 - default-language: Haskell2010 - default-extensions: OverloadedStrings NamedFieldPuns hs-source-dirs: test other-modules: Foreign.Erlang.NodeDataSpec Foreign.Erlang.HandshakeSpec Foreign.Erlang.ControlMessageSpec Foreign.Erlang.TermSpec + default-language: Haskell2010 + default-extensions: OverloadedStrings NamedFieldPuns ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N + build-depends: + QuickCheck >=2.11.3 && <2.12, + async >=2.2.1 && <2.3, + base >=4.9 && <5, + binary >=0.8.5.1 && <0.9, + bytestring >=0.10.8.2 && <0.11, + hinterface -any, + hspec >=2.5.5 && <2.6, + monad-logger >=0.3.29 && <0.4, + transformers >=0.5.5.0 && <0.6 diff --git a/src/Util/Binary.hs b/src/Util/Binary.hs --- a/src/Util/Binary.hs +++ b/src/Util/Binary.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} module Util.Binary ( runGetA , BinaryGetError(..) @@ -36,7 +37,9 @@ import Data.Int (Int64) import Data.Word +#if !MIN_VERSION_binary(0,8,5) import Util.FloatCast +#endif import Util.IOExtra -------------------------------------------------------------------------------- @@ -68,6 +71,7 @@ runPutA :: (LBS.ByteString -> m ()) -> Put -> m () runPutA = (. runPut) +#if !MIN_VERSION_binary(0,8,5) -------------------------------------------------------------------------------- ------------------------------------------------------------------------ -- Floats/Doubles @@ -106,6 +110,7 @@ putDoublehost = putWord64host . doubleToWord {-# INLINE putDoublehost #-} +#endif -------------------------------------------------------------------------------- putLength16beByteString :: BS.ByteString -> Put @@ -141,6 +146,7 @@ getChar8 :: Get Char getChar8 = (chr . fromIntegral) <$> getWord8 +#if !MIN_VERSION_binary(0,8,5) ------------------------------------------------------------------------ -- Double/Float reads -- | Read a 'Float' in big endian IEEE-754 format. @@ -178,6 +184,7 @@ getDoublehost = wordToDouble <$> getWord64host {-# INLINE getDoublehost #-} +#endif -------------------------------------------------------------------------------- getLength8ByteString :: Get BS.ByteString diff --git a/stack.yaml b/stack.yaml --- a/stack.yaml +++ b/stack.yaml @@ -1,12 +1,7 @@ -resolver: lts-8.6 - -packages: -- '.' - -extra-deps: [] - flags: {} - extra-package-dbs: [] - +packages: +- . pvp-bounds: lower +extra-deps: [] +resolver: lts-12.9