Skip to content

Commit 3da91c5

Browse files
brandon-leapyearjaspervdj
authored andcommitted
Update bounds to support >= lts-2.5 (#227)
1 parent ea534a9 commit 3da91c5

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

lib/Language/Haskell/Stylish/Config.hs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ import Data.List (inits,
2222
import Data.Map (Map)
2323
import qualified Data.Map as M
2424
import Data.Maybe (fromMaybe)
25-
import Data.Yaml (decodeEither)
25+
import Data.Yaml (decodeEither',
26+
prettyPrintParseException)
2627
import System.Directory
2728
import System.FilePath (joinPath,
2829
splitPath,
@@ -103,9 +104,9 @@ loadConfig verbose userSpecified = do
103104
mbFp <- configFilePath verbose userSpecified
104105
verbose $ "Loading configuration at " ++ fromMaybe "<embedded>" mbFp
105106
bytes <- maybe (return defaultConfigBytes) B.readFile mbFp
106-
case decodeEither bytes of
107+
case decodeEither' bytes of
107108
Left err -> error $
108-
"Language.Haskell.Stylish.Config.loadConfig: " ++ err
109+
"Language.Haskell.Stylish.Config.loadConfig: " ++ prettyPrintParseException err
109110
Right config -> return config
110111

111112

stack.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
flags: {}
22
packages:
33
- '.'
4-
resolver: lts-11.5
5-
extra-deps:
6-
- 'aeson-1.3.1.0'
4+
resolver: lts-13.0

stylish-haskell.cabal

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Library
4949
Paths_stylish_haskell
5050

5151
Build-depends:
52-
aeson >= 0.6 && < 1.4,
52+
aeson >= 0.6 && < 1.5,
5353
base >= 4.8 && < 5,
5454
bytestring >= 0.9 && < 0.11,
5555
containers >= 0.3 && < 0.7,
@@ -60,7 +60,7 @@ Library
6060
mtl >= 2.0 && < 2.3,
6161
semigroups >= 0.18 && < 0.19,
6262
syb >= 0.3 && < 0.8,
63-
yaml >= 0.7 && < 0.10
63+
yaml >= 0.8.11 && < 0.12
6464

6565
Executable stylish-haskell
6666
Ghc-options: -Wall
@@ -72,7 +72,7 @@ Executable stylish-haskell
7272
strict >= 0.3 && < 0.4,
7373
optparse-applicative >= 0.12 && < 0.15,
7474
-- Copied from regular dependencies...
75-
aeson >= 0.6 && < 1.4,
75+
aeson >= 0.6 && < 1.5,
7676
base >= 4.8 && < 5,
7777
bytestring >= 0.9 && < 0.11,
7878
containers >= 0.3 && < 0.7,
@@ -82,7 +82,7 @@ Executable stylish-haskell
8282
haskell-src-exts >= 1.18 && < 1.21,
8383
mtl >= 2.0 && < 2.3,
8484
syb >= 0.3 && < 0.8,
85-
yaml >= 0.7 && < 0.10
85+
yaml >= 0.8.11 && < 0.12
8686

8787
Test-suite stylish-haskell-tests
8888
Ghc-options: -Wall
@@ -121,7 +121,7 @@ Test-suite stylish-haskell-tests
121121
test-framework >= 0.4 && < 0.9,
122122
test-framework-hunit >= 0.2 && < 0.4,
123123
-- Copied from regular dependencies...
124-
aeson >= 0.6 && < 1.4,
124+
aeson >= 0.6 && < 1.5,
125125
base >= 4.8 && < 5,
126126
bytestring >= 0.9 && < 0.11,
127127
containers >= 0.3 && < 0.7,
@@ -131,7 +131,7 @@ Test-suite stylish-haskell-tests
131131
haskell-src-exts >= 1.18 && < 1.21,
132132
mtl >= 2.0 && < 2.3,
133133
syb >= 0.3 && < 0.8,
134-
yaml >= 0.7 && < 0.10
134+
yaml >= 0.8.11 && < 0.12
135135

136136
Source-repository head
137137
Type: git

0 commit comments

Comments
 (0)