aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2016-02-19 14:21:19 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2016-02-19 14:21:19 +0100
commita6fafcc31f81b12bcffebec77cbba80aa422671d (patch)
treefc6b39b0cc83f59e3e958f254f36d44a9af6089a
parente109d7c997960718707e6e74a776890a97e54a9f (diff)
downloadthermoprint-a6fafcc31f81b12bcffebec77cbba80aa422671d.tar
thermoprint-a6fafcc31f81b12bcffebec77cbba80aa422671d.tar.gz
thermoprint-a6fafcc31f81b12bcffebec77cbba80aa422671d.tar.bz2
thermoprint-a6fafcc31f81b12bcffebec77cbba80aa422671d.tar.xz
thermoprint-a6fafcc31f81b12bcffebec77cbba80aa422671d.zip
Revert "Revert "Removed extraneous instance""
This reverts commit e109d7c997960718707e6e74a776890a97e54a9f.
-rw-r--r--server/src/Thermoprint/Server/Queue.hs3
-rw-r--r--server/thermoprint-server.cabal2
2 files changed, 1 insertions, 4 deletions
diff --git a/server/src/Thermoprint/Server/Queue.hs b/server/src/Thermoprint/Server/Queue.hs
index c6a7903..3c8fb9e 100644
--- a/server/src/Thermoprint/Server/Queue.hs
+++ b/server/src/Thermoprint/Server/Queue.hs
@@ -144,9 +144,6 @@ toZipper = Set.foldl' (flip insert) def
144type QueueManager t = QueueManagerM t (Extended Micro) 144type QueueManager t = QueueManagerM t (Extended Micro)
145type QueueManagerM t = ComposeT (StateT Queue) t STM 145type QueueManagerM t = ComposeT (StateT Queue) t STM
146 146
147instance (Monad (StateT s (g m)), Monad (g m)) => MonadState s (ComposeT (StateT s) g m) where
148 state = ComposeT . state
149
150runQM :: ( HasQueue q 147runQM :: ( HasQueue q
151 , MFunctor t 148 , MFunctor t
152 , MonadTrans t 149 , MonadTrans t
diff --git a/server/thermoprint-server.cabal b/server/thermoprint-server.cabal
index 7afcb55..6a53cd5 100644
--- a/server/thermoprint-server.cabal
+++ b/server/thermoprint-server.cabal
@@ -49,7 +49,7 @@ library
49 , time >=1.5.0 && <2 49 , time >=1.5.0 && <2
50 , wai >=3.0.4 && <4 50 , wai >=3.0.4 && <4
51 , warp >=3.1.9 && <4 51 , warp >=3.1.9 && <4
52 , mmorph >=1.0.4 && <2 52 , mmorph >=1.0.6 && <2
53 , extended-reals >=0.2.1 && <1 53 , extended-reals >=0.2.1 && <1
54 , filelock >=0.1.0 && <1 54 , filelock >=0.1.0 && <1
55 , bytestring >=0.10.6 && <1 55 , bytestring >=0.10.6 && <1