diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2016-02-25 21:16:11 +0000 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2016-02-25 21:16:11 +0000 |
commit | 0c68925e930102686ca795970d2f1fe654acbec4 (patch) | |
tree | 695331a6740e5a4ae55a0646eea226c76a237638 /server/thermoprint-server.nix | |
parent | b080366f035d24ec481ec6fc46e18f552508d22c (diff) | |
download | thermoprint-0c68925e930102686ca795970d2f1fe654acbec4.tar thermoprint-0c68925e930102686ca795970d2f1fe654acbec4.tar.gz thermoprint-0c68925e930102686ca795970d2f1fe654acbec4.tar.bz2 thermoprint-0c68925e930102686ca795970d2f1fe654acbec4.tar.xz thermoprint-0c68925e930102686ca795970d2f1fe654acbec4.zip |
Catch early death of server thread during testing
Diffstat (limited to 'server/thermoprint-server.nix')
-rw-r--r-- | server/thermoprint-server.nix | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/server/thermoprint-server.nix b/server/thermoprint-server.nix index 69ecd2f..6ff8b10 100644 --- a/server/thermoprint-server.nix +++ b/server/thermoprint-server.nix | |||
@@ -1,11 +1,11 @@ | |||
1 | { mkDerivation, base, binary, bytestring, conduit, containers | 1 | { mkDerivation, async, base, binary, bytestring, conduit |
2 | , data-default-class, deepseq, dyre, either, encoding, exceptions | 2 | , containers, data-default-class, deepseq, dyre, either, encoding |
3 | , extended-reals, filelock, hspec, mmorph, monad-control | 3 | , exceptions, extended-reals, filelock, hspec, mmorph |
4 | , monad-logger, mtl, network-uri, persistent, persistent-sqlite | 4 | , monad-control, monad-logger, mtl, network-uri, persistent |
5 | , persistent-template, QuickCheck, quickcheck-instances, resourcet | 5 | , persistent-sqlite, persistent-template, QuickCheck |
6 | , servant, servant-server, stdenv, stm, temporary, text | 6 | , quickcheck-instances, resourcet, servant, servant-server, stdenv |
7 | , thermoprint-client, thermoprint-spec, time, transformers, wai | 7 | , stm, temporary, text, thermoprint-client, thermoprint-spec, time |
8 | , wai-websockets, warp, websockets | 8 | , transformers, wai, wai-websockets, warp, websockets |
9 | }: | 9 | }: |
10 | mkDerivation { | 10 | mkDerivation { |
11 | pname = "thermoprint-server"; | 11 | pname = "thermoprint-server"; |
@@ -25,9 +25,10 @@ mkDerivation { | |||
25 | base monad-logger mtl persistent-sqlite resourcet | 25 | base monad-logger mtl persistent-sqlite resourcet |
26 | ]; | 26 | ]; |
27 | testHaskellDepends = [ | 27 | testHaskellDepends = [ |
28 | base containers exceptions hspec monad-logger mtl persistent-sqlite | 28 | async base containers exceptions hspec monad-logger mtl |
29 | QuickCheck quickcheck-instances resourcet stm temporary text | 29 | persistent-sqlite QuickCheck quickcheck-instances resourcet stm |
30 | thermoprint-client thermoprint-spec transformers warp | 30 | temporary text thermoprint-client thermoprint-spec transformers |
31 | warp | ||
31 | ]; | 32 | ]; |
32 | homepage = "http://dirty-haskell.org/tags/thermoprint.html"; | 33 | homepage = "http://dirty-haskell.org/tags/thermoprint.html"; |
33 | description = "Server for thermoprint-spec"; | 34 | description = "Server for thermoprint-spec"; |