Bring servant git repo back in as submodule dependency, update readme to suggest using overrides.nix

This commit is contained in:
Greg Hale 2016-04-23 16:21:23 -04:00
parent 56970bc3ef
commit 763d10df1d
4 changed files with 8 additions and 4 deletions

3
.gitmodules vendored
View File

@ -13,3 +13,6 @@
[submodule "deps/reflex-platform"]
path = deps/reflex-platform
url = https://github.com/reflex-frp/reflex-platform.git
[submodule "deps/servant"]
path = deps/servant
url = https://github.com/haskell-servant/servant

View File

@ -9,7 +9,7 @@ This library lets you automatically derive [`reflex-dom`](https://github.com/ref
You 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:
```
git clone https://github.com/mightybyte/servant-reflex
git clone https://github.com/imalsogreg/servant-reflex
cd servant-reflex
git submodule update --init --recursive
./init-sandbox.sh
@ -24,12 +24,12 @@ The final script copies the ghcjs-generated files into the server's static direc
To install with `reflex-platform`:
```
git clone https://github.com/mightybyte/servant-reflex
git clone https://github.com/imalsogreg/servant-reflex
cd servant-reflex
git submodule update --init --recursive
./init-sandbox.sh
cd testserver && cabal install --only-dep && cabal build && cd ..
path/to/reflex-platform/work-on ghcjs ./.
path/to/reflex-platform/work-on ./overrides.nix ./.
cabal build
./toSite.sh
```

1
deps/servant vendored Submodule

@ -0,0 +1 @@
Subproject commit 4f4ca696724a5246b0dbcdc33be73496cd3a052a

View File

@ -37,7 +37,7 @@ library
reflex,
reflex-dom,
safe,
servant >= 0.5 && < 0.6,
servant >= 0.5 && < 0.8,
string-conversions,
text,
transformers >= 0.4 && < 0.5