on master help sign in
Fixes for travis
commit14c8c28a4a3a7fffdf5761d2349a70b281101530 authorHamish Mackenzie <Hamish.K.Mackenzie@googlemail.com> dateMon 3 Oct 2016, 00:04 (10 years ago) parent98db965
2 files changed+30−27
.travis.yml+1−1 jsaddle.cabal+29−26
.travis.yml+1−1
@@ -16,7 +16,7 @@ cache:
1616before_install:
1717 - travis_retry sudo add-apt-repository -y ppa:hvr/ghc
1818 - travis_retry sudo apt-get update
19− - travis_retry sudo apt-get install -y cabal-install-$CABALVER ghc-$GHCVER happy-1.19.5 alex-3.1.7 nodejs
19+ - travis_retry sudo apt-get install -y cabal-install-$CABALVER ghc-$GHCVER happy-1.19.5 alex-3.1.7 nodejs node-ws
2020 - export PATH=$HOME/.cabal/bin:/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:/opt/alex/3.1.7/bin:/opt/happy/1.19.5/bin:$PATH
2121
2222install:
jsaddle.cabal+29−26
@@ -12,6 +12,9 @@ description:
1212 in the webkit-javascriptcore library <https://github.com/ghcjs/webkit-javascriptcore>.
1313category: Web, Javascript
1414author: Hamish Mackenzie
15+data-files:
16+ data/index.html
17+ data/jsaddle.js
1518
1619source-repository head
1720 type: git
@@ -29,18 +32,18 @@ library
2932 Language.Javascript.JSaddle.WebSockets.Files
3033 Language.Javascript.JSaddle.Test
3134 build-depends:
32− aeson >=1.0.0.0 && <1.1,
33− bytestring >=0.10.8.1 && <0.11,
34− containers >=0.5.7.1 && <0.6,
35− filepath >=1.4.1.0 && <1.5,
36− http-types >=0.9.1 && <0.10,
37− process >=1.4.2.0 && <1.5,
38− stm >=2.4.4.1 && <2.5,
39− wai >=3.2.1.1 && <3.3,
40− wai-app-static >=3.1.6.1 && <3.2,
41− wai-websockets >=3.0.1.1 && <3.1,
42− warp >=3.2.8 && <3.3,
43− websockets >=0.9.7.0 && <0.10
35+ aeson >=0.8.0.2 && <1.1,
36+ bytestring >=0.10.6.0 && <0.11,
37+ containers >=0.5.6.2 && <0.6,
38+ filepath >=1.4.0.0 && <1.5,
39+ http-types >=0.8.6 && <0.10,
40+ process >=1.2.3.0 && <1.5,
41+ stm >=2.4.4 && <2.5,
42+ wai >=3.0.3.0 && <3.3,
43+ wai-app-static >=3.1.1 && <3.2,
44+ wai-websockets >=3.0.0.6 && <3.1,
45+ warp >=3.1.2 && <3.3,
46+ websockets >=0.9.5.0 && <0.10
4447 exposed-modules:
4548 Language.Javascript.JSaddle
4649 Language.Javascript.JSaddle.Arguments
@@ -60,8 +63,8 @@ library
6063 lens >=3.8.5 && <4.15,
6164 primitive >=0.6.1.0 && <0.7,
6265 template-haskell -any,
63− text >=0.11.2.3 && <1.3,
64− transformers >=0.3.0.0 && <0.6
66+ text >=1.2.1.3 && <1.3,
67+ transformers >=0.4.2.0 && <0.6
6568 default-language: Haskell2010
6669 hs-source-dirs: src
6770 ghc-options: -ferror-spans
@@ -75,19 +78,19 @@ test-suite test-tool
7578 if !impl(ghcjs)
7679 build-depends:
7780 QuickCheck -any,
78− bytestring >=0.10.8.1 && <0.11,
79− doctest -any,
80− filepath >=1.4.1.0 && <1.5,
81− http-types >=0.9.1 && <0.10,
81+ bytestring >=0.10.6.0 && <0.11,
82+ doctest >=0.10.1 && <0.12,
83+ filepath >=1.4.0.0 && <1.5,
84+ http-types >=0.8.6 && <0.10,
8285 jsaddle -any,
83− process >=1.4.2.0 && <1.5,
84− text >=0.11.2.3 && <1.3,
85− vector >=0.11.0.0 && <0.12,
86− wai >=3.2.1.1 && <3.3,
87− wai-app-static >=3.1.6.1 && <3.2,
88− wai-websockets >=3.0.1.1 && <3.1,
89− warp >=3.2.8 && <3.3,
90− websockets >=0.9.7.0 && <0.10
86+ process >=1.2.3.0 && <1.5,
87+ text >=1.2.1.3 && <1.3,
88+ vector >=0.10.12.3 && <0.12,
89+ wai >=3.0.3.0 && <3.3,
90+ wai-app-static >=3.1.1 && <3.2,
91+ wai-websockets >=3.0.0.6 && <3.1,
92+ warp >=3.1.2 && <3.3,
93+ websockets >=0.9.5.0 && <0.10
9194 default-language: Haskell2010
9295 hs-source-dirs: tests
9396 ghc-options: -ferror-spans -threaded