From 8464c3e3e709869acab3f60efb3ba11f44d233b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Estrella?= Date: Sun, 14 Jan 2018 22:56:38 -0500 Subject: [PATCH] Support megaparsec >= 6.4.0 --- CHANGELOG.md | 3 +++ Text/Inflections/Parse/CamelCase.hs | 2 ++ Text/Inflections/Parse/SnakeCase.hs | 2 ++ inflections.cabal | 2 +- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e268061..b30b6d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## Inflections 0.4.0.1 +* Support `megaparsec` >= 6.4.0 + ## Inflections 0.4.0.0 * Update megaparsec to version 6. diff --git a/Text/Inflections/Parse/CamelCase.hs b/Text/Inflections/Parse/CamelCase.hs index baeef76..206da1e 100644 --- a/Text/Inflections/Parse/CamelCase.hs +++ b/Text/Inflections/Parse/CamelCase.hs @@ -17,7 +17,9 @@ module Text.Inflections.Parse.CamelCase ( parseCamelCase ) where +#if !MIN_VERSION_megaparsec(6,4,0) import Control.Applicative +#endif import Data.Text (Text) import Data.Void (Void) import Text.Inflections.Types diff --git a/Text/Inflections/Parse/SnakeCase.hs b/Text/Inflections/Parse/SnakeCase.hs index cbd6782..bed26db 100644 --- a/Text/Inflections/Parse/SnakeCase.hs +++ b/Text/Inflections/Parse/SnakeCase.hs @@ -16,7 +16,9 @@ module Text.Inflections.Parse.SnakeCase ( parseSnakeCase ) where +#if !MIN_VERSION_megaparsec(6,4,0) import Control.Applicative +#endif import Data.Text (Text) import Data.Void (Void) import Text.Inflections.Types diff --git a/inflections.cabal b/inflections.cabal index 661fd81..2d21532 100644 --- a/inflections.cabal +++ b/inflections.cabal @@ -1,5 +1,5 @@ name: inflections -version: 0.4.0.0 +version: 0.4.0.1 synopsis: Inflections library for Haskell description: Inflections provides methods for singularization, pluralization,