git.iko.soy/elk
on master help sign in
Merge pull request #128 from osa1/relaxdeps
d9d1dfdEvan Czaplicki
elm-server/elm-server.cabal+1−1
compare with master
unifiedsplit
@@ -32,7 +32,7 @@ Executable elm-server
32 parsec >= 3.1.1,
32 parsec >= 3.1.1,
33 blaze-html >= 0.5.1,
33 blaze-html >= 0.5.1,
34 HTTP >= 4000,
34 HTTP >= 4000,
35− happstack-server == 7.1.1 || == 7.0.2,
35+ happstack-server == 7.1.1 || == 7.1.7 || == 7.0.2,
36 deepseq,
36 deepseq,
37 filepath,
37 filepath,
38 Elm >= 0.7
38 Elm >= 0.7
elm/Elm.cabal+3−3
@@ -66,7 +66,7 @@ Library
66 transformers >= 0.2,
66 transformers >= 0.2,
67 mtl >= 2,
67 mtl >= 2,
68 parsec >= 3.1.1,
68 parsec >= 3.1.1,
69− blaze-html == 0.5.*,
69+ blaze-html == 0.5.* || == 0.6.*,
70 blaze-markup == 0.5.1.*,
70 blaze-markup == 0.5.1.*,
71 deepseq,
71 deepseq,
72 text,
72 text,
@@ -114,7 +114,7 @@ Executable elm
114 transformers >= 0.2,
114 transformers >= 0.2,
115 mtl >= 2,
115 mtl >= 2,
116 parsec >= 3.1.1,
116 parsec >= 3.1.1,
117− blaze-html == 0.5.*,
117+ blaze-html == 0.5.* || == 0.6.*,
118 blaze-markup == 0.5.1.*,
118 blaze-markup == 0.5.1.*,
119 deepseq,
119 deepseq,
120 cmdargs,
120 cmdargs,
@@ -134,7 +134,7 @@ test-suite Main
134 transformers >= 0.2,
134 transformers >= 0.2,
135 mtl >= 2,
135 mtl >= 2,
136 parsec >= 3.1.1,
136 parsec >= 3.1.1,
137− blaze-html == 0.5.*,
137+ blaze-html == 0.5.* || == 0.6.*,
138 blaze-markup == 0.5.1.*,
138 blaze-markup == 0.5.1.*,
139 deepseq,
139 deepseq,
140 text,
140 text,