d9d1dfd · elk · git.iko.soy

git.iko.soy/elk

Merge pull request #128 from osa1/relaxdeps

relax blaze-html and happstack-server dependencies

commitd9d1dfd746748dc511ad5a4c30ca4fcb1aa9062d authorEvan Czaplicki <info@elm-lang.org> dateTue 26 Mar 2013, 17:34 (14 years ago) parent95758d2 a3c011a

2 files changed+4−4

compare with master

unifiedsplit

elm-server/elm-server.cabal+1−1 elm/Elm.cabal+3−3

elm-server/elm-server.cabal+1−1

@@ -32,7 +32,7 @@ Executable elm-server

3232 parsec >= 3.1.1,

3333 blaze-html >= 0.5.1,

3434 HTTP >= 4000,

35− happstack-server == 7.1.1 || == 7.0.2,

35+ happstack-server == 7.1.1 || == 7.1.7 || == 7.0.2,

3636 deepseq,

3737 filepath,

3838 Elm >= 0.7

elm/Elm.cabal+3−3

@@ -66,7 +66,7 @@ Library

6666 transformers >= 0.2,

6767 mtl >= 2,

6868 parsec >= 3.1.1,

69− blaze-html == 0.5.*,

69+ blaze-html == 0.5.* || == 0.6.*,

7070 blaze-markup == 0.5.1.*,

7171 deepseq,

7272 text,

@@ -114,7 +114,7 @@ Executable elm

114114 transformers >= 0.2,

115115 mtl >= 2,

116116 parsec >= 3.1.1,

117− blaze-html == 0.5.*,

117+ blaze-html == 0.5.* || == 0.6.*,

118118 blaze-markup == 0.5.1.*,

119119 deepseq,

120120 cmdargs,

@@ -134,7 +134,7 @@ test-suite Main

134134 transformers >= 0.2,

135135 mtl >= 2,

136136 parsec >= 3.1.1,

137− blaze-html == 0.5.*,

137+ blaze-html == 0.5.* || == 0.6.*,

138138 blaze-markup == 0.5.1.*,

139139 deepseq,

140140 text,