git.iko.soy/typeable/servant-reflex
on master help sign in
Bring servant git repo back in as submodule dependency, update readme to suggest using overrides.nix
commit763d10df1da49a36c23989ef0866a59e2776ac63 authorGreg Hale <imalsogreg@gmail.com> dateSat 23 Apr 2016, 16:21 (10 years ago) parent56970bc
4 files changed+8−4
.gitmodules+3 README.md+3−3 deps/servant+1 servant-reflex.cabal+1−1
.gitmodules+3
@@ -13,3 +13,6 @@
1313[submodule "deps/reflex-platform"]
1414 path = deps/reflex-platform
1515 url = https://github.com/reflex-frp/reflex-platform.git
16+[submodule "deps/servant"]
17+ path = deps/servant
18+ url = https://github.com/haskell-servant/servant
README.md+3−3
@@ -9,7 +9,7 @@ This library lets you automatically derive [`reflex-dom`](https://github.com/ref
99You will need a recent [GHCJS installation](https://github.com/ghcjs/ghcjs), or use the [reflex-platform](https://github.com/reflex-frp/reflex-platform). A [snap](https://github.com/snapframework) server using [servant-snap](https://github.com/haskell-servant/servant-snap) is provided for serving the api. `Snap 1.0` is not yet on Hackage (and servant-snap is still experimental), but we bundle the sources as a git submodule. To install everything with cabal:
1010
1111```
12−git clone https://github.com/mightybyte/servant-reflex
12+git clone https://github.com/imalsogreg/servant-reflex
1313cd servant-reflex
1414git submodule update --init --recursive
1515./init-sandbox.sh
@@ -24,12 +24,12 @@ The final script copies the ghcjs-generated files into the server's static direc
2424To install with `reflex-platform`:
2525
2626```
27−git clone https://github.com/mightybyte/servant-reflex
27+git clone https://github.com/imalsogreg/servant-reflex
2828cd servant-reflex
2929git submodule update --init --recursive
3030./init-sandbox.sh
3131cd testserver && cabal install --only-dep && cabal build && cd ..
32−path/to/reflex-platform/work-on ghcjs ./.
32+path/to/reflex-platform/work-on ./overrides.nix ./.
3333cabal build
3434./toSite.sh
3535```
deps/servantnew file+1

Submodule changed.

servant-reflex.cabal+1−1
@@ -37,7 +37,7 @@ library
3737 reflex,
3838 reflex-dom,
3939 safe,
40− servant >= 0.5 && < 0.6,
40+ servant >= 0.5 && < 0.8,
4141 string-conversions,
4242 text,
4343 transformers >= 0.4 && < 0.5