Fix building hedgewars-server 0.9.21 0.9.21-release
authorkoda
Tue, 02 Jun 2015 19:51:04 +0100
branch0.9.21
changeset 10765 7e55468ffe38
parent 10762 a017ec64f675
child 10767 124f9450ccde
Fix building hedgewars-server
gameServer/CoreTypes.hs
gameServer/hedgewars-server.cabal
--- a/gameServer/CoreTypes.hs	Tue Jun 02 18:37:40 2015 +0100
+++ b/gameServer/CoreTypes.hs	Tue Jun 02 19:51:04 2015 +0100
@@ -38,7 +38,7 @@
 instance NFData B.ByteString
 #endif
 
-instance NFData (Chan a)
+instance NFData (Chan a) where rnf a  = ()
 
 instance NFData Action where
     rnf (AnswerClients chans msg) = chans `deepseq` msg `deepseq` ()
--- a/gameServer/hedgewars-server.cabal	Tue Jun 02 18:37:40 2015 +0100
+++ b/gameServer/hedgewars-server.cabal	Tue Jun 02 19:51:04 2015 +0100
@@ -33,7 +33,7 @@
     utf8-string,
     SHA,
     entropy,
-    zlib
+    zlib >= 0.5.3 && < 0.6
 
   if !os(windows)
     build-depends: unix