af58e92 · elk · git.iko.soy

git.iko.soy/elk

Merge pull request #1407 from elm-lang/fix-deps

Fix deps

commitaf58e922ef75f5a0671d0fed6ff1c1938c178ed4 authorEvan Czaplicki <info@elm-lang.org> dateMon 6 Jun 2016, 13:52 (10 years ago) parentfbd2b39 d5ce7c2

2 files changed+5−6

compare with master

unifiedsplit

elm-compiler.cabal+5−5 src/Parse/Pattern.hs−1

elm-compiler.cabal+5−5

@@ -140,8 +140,8 @@ Library

140140 Paths_elm_compiler

141141

142142 Build-depends:

143− aeson >= 0.7 && < 0.9,

144− aeson-pretty >= 0.7 && < 0.8,

143+ aeson >= 0.11,

144+ aeson-pretty,

145145 ansi-terminal >= 0.6.2.1 && < 0.7,

146146 ansi-wl-pprint >= 0.6.7 && < 0.7,

147147 base >=4.2 && <5,

@@ -178,7 +178,7 @@ Executable elm

178178

179179 Build-depends:

180180 base >=4.2 && <5,

181− aeson >= 0.7 && < 0.9,

181+ aeson >= 0.11,

182182 binary >= 0.7.0.0 && < 0.8,

183183 directory >= 1.0 && < 2.0,

184184 filepath >= 1 && < 2.0,

@@ -212,8 +212,8 @@ Test-Suite compiler-tests

212212 test-framework-quickcheck2 >= 0.3 && < 0.4,

213213 HUnit >= 1.1 && < 2,

214214 QuickCheck >= 2 && < 3,

215− aeson >= 0.7 && < 0.9,

216− aeson-pretty >= 0.7 && < 0.8,

215+ aeson >= 0.11,

216+ aeson-pretty,

217217 ansi-terminal >= 0.6.2.1 && < 0.7,

218218 ansi-wl-pprint >= 0.6.7 && < 0.7,

219219 base >=4.2 && <5,

src/Parse/Pattern.hs−1

@@ -1,6 +1,5 @@

11module Parse.Pattern (term, expr) where

3−import Data.Char (isUpper)

43import qualified Data.List as List

54import Text.Parsec ((<|>), (<?>), char, choice, optionMaybe, try)