Update library to latest compiler(s)
Built with GHC 8.2.2, 8.4.4, 8.6.5
This commit is contained in:
parent
e69fc50d73
commit
238ebb7913
31
.travis.yml
31
.travis.yml
@ -1,27 +1,20 @@
|
|||||||
language: c
|
language: haskell
|
||||||
|
|
||||||
sudo: false
|
sudo: false
|
||||||
|
|
||||||
|
git:
|
||||||
|
depth: 5
|
||||||
|
|
||||||
|
cache:
|
||||||
|
directories:
|
||||||
|
- "$HOME/.cabal/store"
|
||||||
|
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- env: CABALVER=1.16 GHCVER=7.6.3
|
- ghc: 8.0.1
|
||||||
addons: {apt: {packages: [cabal-install-1.16,ghc-7.6.3], sources: [hvr-ghc]}}
|
- ghc: 8.2.2
|
||||||
- env: CABALVER=1.18 GHCVER=7.8.4
|
- ghc: 8.4.4
|
||||||
addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4], sources: [hvr-ghc]}}
|
- ghc: 8.6.5
|
||||||
- env: CABALVER=1.22 GHCVER=7.10.3 RUN_TESTS=--run-tests
|
|
||||||
addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3],sources: [hvr-ghc]}}
|
|
||||||
- env: CABALVER=1.24 GHCVER=8.0.1 RUN_TESTS=--run-tests
|
|
||||||
addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.1],sources: [hvr-ghc]}}
|
|
||||||
- env: CABALVER=head GHCVER=head RUN_TESTS=--run-tests
|
|
||||||
addons: {apt: {packages: [cabal-install-head,ghc-head], sources: [hvr-ghc]}}
|
|
||||||
|
|
||||||
allow_failures:
|
|
||||||
- env: CABALVER=1.16 GHCVER=7.6.3 # weird spec problems
|
|
||||||
- env: CABALVER=1.18 GHCVER=7.8.4 # weird spec problems
|
|
||||||
- env: CABALVER=head GHCVER=head RUN_TESTS=--run-tests
|
|
||||||
|
|
||||||
before_install:
|
|
||||||
- export PATH=$HOME/.cabal/bin:/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
|
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- cabal update
|
- cabal update
|
||||||
|
|||||||
@ -13,10 +13,10 @@ category: Network
|
|||||||
build-type: Simple
|
build-type: Simple
|
||||||
cabal-version: >= 1.10
|
cabal-version: >= 1.10
|
||||||
tested-with:
|
tested-with:
|
||||||
GHC == 7.6.3
|
GHC == 8.0.1
|
||||||
, GHC == 7.8.4
|
, GHC == 8.2.2
|
||||||
, GHC == 7.10.1
|
, GHC == 8.4.4
|
||||||
, GHC == 8.0.1
|
, GHC == 8.6.5
|
||||||
extra-source-files:
|
extra-source-files:
|
||||||
README.markdown
|
README.markdown
|
||||||
CHANGELOG.markdown
|
CHANGELOG.markdown
|
||||||
@ -57,6 +57,7 @@ library
|
|||||||
, bytestring
|
, bytestring
|
||||||
, connection >= 0.2
|
, connection >= 0.2
|
||||||
, containers
|
, containers
|
||||||
|
, fail
|
||||||
, network >= 2.6
|
, network >= 2.6
|
||||||
, semigroups >= 0.16
|
, semigroups >= 0.16
|
||||||
, stm
|
, stm
|
||||||
|
|||||||
@ -11,6 +11,9 @@ import Control.Applicative (Alternative(..), liftA2, optional)
|
|||||||
import Control.Applicative (Applicative(..), Alternative(..), liftA2, optional)
|
import Control.Applicative (Applicative(..), Alternative(..), liftA2, optional)
|
||||||
#endif
|
#endif
|
||||||
import Control.Monad (MonadPlus(..), (>=>), guard)
|
import Control.Monad (MonadPlus(..), (>=>), guard)
|
||||||
|
#if __GLASGOW_HASKELL__ >= 86
|
||||||
|
import Control.Monad.Fail (MonadFail, fail)
|
||||||
|
#endif
|
||||||
import Data.ASN1.Types (ASN1)
|
import Data.ASN1.Types (ASN1)
|
||||||
import qualified Data.ASN1.Types as Asn1
|
import qualified Data.ASN1.Types as Asn1
|
||||||
import Data.Foldable (asum)
|
import Data.Foldable (asum)
|
||||||
@ -416,6 +419,11 @@ instance MonadPlus (Parser s) where
|
|||||||
Parser ma `mplus` Parser mb =
|
Parser ma `mplus` Parser mb =
|
||||||
Parser (\s -> ma s `mplus` mb s)
|
Parser (\s -> ma s `mplus` mb s)
|
||||||
|
|
||||||
|
#if __GLASGOW_HASKELL__ >= 86
|
||||||
|
instance MonadFail (Parser s) where
|
||||||
|
fail _ = mzero
|
||||||
|
#endif
|
||||||
|
|
||||||
parse :: Parser s a -> s -> Maybe (s, a)
|
parse :: Parser s a -> s -> Maybe (s, a)
|
||||||
parse = unParser
|
parse = unParser
|
||||||
|
|
||||||
|
|||||||
@ -1,3 +1,4 @@
|
|||||||
|
{-# LANGUAGE CPP #-}
|
||||||
{-# LANGUAGE DeriveDataTypeable #-}
|
{-# LANGUAGE DeriveDataTypeable #-}
|
||||||
{-# LANGUAGE NamedFieldPuns #-}
|
{-# LANGUAGE NamedFieldPuns #-}
|
||||||
module Ldap.Client.Internal
|
module Ldap.Client.Internal
|
||||||
@ -35,7 +36,11 @@ import Data.ByteString (ByteString)
|
|||||||
import Data.List.NonEmpty (NonEmpty)
|
import Data.List.NonEmpty (NonEmpty)
|
||||||
import Data.Text (Text)
|
import Data.Text (Text)
|
||||||
import Data.Typeable (Typeable)
|
import Data.Typeable (Typeable)
|
||||||
|
#if __GLASGOW_HASKELL__ >= 84
|
||||||
|
import Network.Socket (PortNumber)
|
||||||
|
#else
|
||||||
import Network (PortNumber)
|
import Network (PortNumber)
|
||||||
|
#endif
|
||||||
import Network.Connection (TLSSettings)
|
import Network.Connection (TLSSettings)
|
||||||
|
|
||||||
import qualified Ldap.Asn1.Type as Type
|
import qualified Ldap.Asn1.Type as Type
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user