From 0c68925e930102686ca795970d2f1fe654acbec4 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 25 Feb 2016 21:16:11 +0000 Subject: Catch early death of server thread during testing --- server/thermoprint-server.nix | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'server/thermoprint-server.nix') 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 @@ -{ mkDerivation, base, binary, bytestring, conduit, containers -, data-default-class, deepseq, dyre, either, encoding, exceptions -, extended-reals, filelock, hspec, mmorph, monad-control -, monad-logger, mtl, network-uri, persistent, persistent-sqlite -, persistent-template, QuickCheck, quickcheck-instances, resourcet -, servant, servant-server, stdenv, stm, temporary, text -, thermoprint-client, thermoprint-spec, time, transformers, wai -, wai-websockets, warp, websockets +{ mkDerivation, async, base, binary, bytestring, conduit +, containers, data-default-class, deepseq, dyre, either, encoding +, exceptions, extended-reals, filelock, hspec, mmorph +, monad-control, monad-logger, mtl, network-uri, persistent +, persistent-sqlite, persistent-template, QuickCheck +, quickcheck-instances, resourcet, servant, servant-server, stdenv +, stm, temporary, text, thermoprint-client, thermoprint-spec, time +, transformers, wai, wai-websockets, warp, websockets }: mkDerivation { pname = "thermoprint-server"; @@ -25,9 +25,10 @@ mkDerivation { base monad-logger mtl persistent-sqlite resourcet ]; testHaskellDepends = [ - base containers exceptions hspec monad-logger mtl persistent-sqlite - QuickCheck quickcheck-instances resourcet stm temporary text - thermoprint-client thermoprint-spec transformers warp + async base containers exceptions hspec monad-logger mtl + persistent-sqlite QuickCheck quickcheck-instances resourcet stm + temporary text thermoprint-client thermoprint-spec transformers + warp ]; homepage = "http://dirty-haskell.org/tags/thermoprint.html"; description = "Server for thermoprint-spec"; -- cgit v1.2.3