diff options
| author | Brandon Chinn <brandon@leapyear.io> | 2019-01-02 02:53:05 -0800 |
|---|---|---|
| committer | Jasper Van der Jeugt <jaspervdj@gmail.com> | 2019-01-02 11:53:05 +0100 |
| commit | 3da91c53431af1b43dda27316588502ab113f7ec (patch) | |
| tree | dc653f073482f7e16b9200446928cc100613006d | |
| parent | ea534a99e7f4684906ae4aff7328673b1ec4e3b5 (diff) | |
| download | stylish-haskell-3da91c53431af1b43dda27316588502ab113f7ec.tar.gz | |
Update bounds to support >= lts-2.5 (#227)
| -rw-r--r-- | lib/Language/Haskell/Stylish/Config.hs | 7 | ||||
| -rw-r--r-- | stack.yaml | 4 | ||||
| -rw-r--r-- | stylish-haskell.cabal | 12 |
3 files changed, 11 insertions, 12 deletions
diff --git a/lib/Language/Haskell/Stylish/Config.hs b/lib/Language/Haskell/Stylish/Config.hs index 19588b7..ad30498 100644 --- a/lib/Language/Haskell/Stylish/Config.hs +++ b/lib/Language/Haskell/Stylish/Config.hs @@ -22,7 +22,8 @@ import Data.List (inits, import Data.Map (Map) import qualified Data.Map as M import Data.Maybe (fromMaybe) -import Data.Yaml (decodeEither) +import Data.Yaml (decodeEither', + prettyPrintParseException) import System.Directory import System.FilePath (joinPath, splitPath, @@ -103,9 +104,9 @@ loadConfig verbose userSpecified = do mbFp <- configFilePath verbose userSpecified verbose $ "Loading configuration at " ++ fromMaybe "<embedded>" mbFp bytes <- maybe (return defaultConfigBytes) B.readFile mbFp - case decodeEither bytes of + case decodeEither' bytes of Left err -> error $ - "Language.Haskell.Stylish.Config.loadConfig: " ++ err + "Language.Haskell.Stylish.Config.loadConfig: " ++ prettyPrintParseException err Right config -> return config @@ -1,6 +1,4 @@ flags: {} packages: - '.' -resolver: lts-11.5 -extra-deps: -- 'aeson-1.3.1.0' +resolver: lts-13.0 diff --git a/stylish-haskell.cabal b/stylish-haskell.cabal index d811274..4305675 100644 --- a/stylish-haskell.cabal +++ b/stylish-haskell.cabal @@ -49,7 +49,7 @@ Library Paths_stylish_haskell Build-depends: - aeson >= 0.6 && < 1.4, + aeson >= 0.6 && < 1.5, base >= 4.8 && < 5, bytestring >= 0.9 && < 0.11, containers >= 0.3 && < 0.7, @@ -60,7 +60,7 @@ Library mtl >= 2.0 && < 2.3, semigroups >= 0.18 && < 0.19, syb >= 0.3 && < 0.8, - yaml >= 0.7 && < 0.10 + yaml >= 0.8.11 && < 0.12 Executable stylish-haskell Ghc-options: -Wall @@ -72,7 +72,7 @@ Executable stylish-haskell strict >= 0.3 && < 0.4, optparse-applicative >= 0.12 && < 0.15, -- Copied from regular dependencies... - aeson >= 0.6 && < 1.4, + aeson >= 0.6 && < 1.5, base >= 4.8 && < 5, bytestring >= 0.9 && < 0.11, containers >= 0.3 && < 0.7, @@ -82,7 +82,7 @@ Executable stylish-haskell haskell-src-exts >= 1.18 && < 1.21, mtl >= 2.0 && < 2.3, syb >= 0.3 && < 0.8, - yaml >= 0.7 && < 0.10 + yaml >= 0.8.11 && < 0.12 Test-suite stylish-haskell-tests Ghc-options: -Wall @@ -121,7 +121,7 @@ Test-suite stylish-haskell-tests test-framework >= 0.4 && < 0.9, test-framework-hunit >= 0.2 && < 0.4, -- Copied from regular dependencies... - aeson >= 0.6 && < 1.4, + aeson >= 0.6 && < 1.5, base >= 4.8 && < 5, bytestring >= 0.9 && < 0.11, containers >= 0.3 && < 0.7, @@ -131,7 +131,7 @@ Test-suite stylish-haskell-tests haskell-src-exts >= 1.18 && < 1.21, mtl >= 2.0 && < 2.3, syb >= 0.3 && < 0.8, - yaml >= 0.7 && < 0.10 + yaml >= 0.8.11 && < 0.12 Source-repository head Type: git |