From e041ff4da99ceef628e625ccce0e040598d3d7bf Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 13 May 2018 15:14:04 +0300 Subject: [PATCH] Cabal 2.2 support in yesod-bin (fixes #1511) --- yesod-bin/AddHandler.hs | 4 +++- yesod-bin/ChangeLog.md | 4 ++++ yesod-bin/Devel.hs | 4 ++++ yesod-bin/yesod-bin.cabal | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/yesod-bin/AddHandler.hs b/yesod-bin/AddHandler.hs index 8995a0b1..f3fd3b61 100644 --- a/yesod-bin/AddHandler.hs +++ b/yesod-bin/AddHandler.hs @@ -9,7 +9,9 @@ import Data.List (isPrefixOf, isSuffixOf, stripPrefix) import Data.Maybe (fromMaybe, listToMaybe) import qualified Data.Text as T import qualified Data.Text.IO as TIO -#if MIN_VERSION_Cabal(2, 0, 0) +#if MIN_VERSION_Cabal(2, 2, 0) +import Distribution.PackageDescription.Parsec (readGenericPackageDescription) +#elif MIN_VERSION_Cabal(2, 0, 0) import Distribution.PackageDescription.Parse (readGenericPackageDescription) #else import Distribution.PackageDescription.Parse (readPackageDescription) diff --git a/yesod-bin/ChangeLog.md b/yesod-bin/ChangeLog.md index 7017152a..afbd437e 100644 --- a/yesod-bin/ChangeLog.md +++ b/yesod-bin/ChangeLog.md @@ -1,3 +1,7 @@ +## 1.6.0.3 + +* Support Cabal 2.2 [#1151](https://github.com/yesodweb/yesod/issues/1511) + ## 1.6.0.2 * Fix broken support for older http-reverse-proxy diff --git a/yesod-bin/Devel.hs b/yesod-bin/Devel.hs index 1928b9c0..b5fab5eb 100644 --- a/yesod-bin/Devel.hs +++ b/yesod-bin/Devel.hs @@ -28,7 +28,11 @@ import Data.String (fromString) import Data.Time (getCurrentTime) import qualified Distribution.Package as D import qualified Distribution.PackageDescription as D +#if MIN_VERSION_Cabal(2, 2, 0) +import qualified Distribution.PackageDescription.Parsec as D +#else import qualified Distribution.PackageDescription.Parse as D +#endif import qualified Distribution.Simple.Utils as D import qualified Distribution.Verbosity as D import Network.HTTP.Client (newManager) diff --git a/yesod-bin/yesod-bin.cabal b/yesod-bin/yesod-bin.cabal index 8eed9040..39221c22 100644 --- a/yesod-bin/yesod-bin.cabal +++ b/yesod-bin/yesod-bin.cabal @@ -1,5 +1,5 @@ name: yesod-bin -version: 1.6.0.2 +version: 1.6.0.3 license: MIT license-file: LICENSE author: Michael Snoyman