From a6fafcc31f81b12bcffebec77cbba80aa422671d Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Fri, 19 Feb 2016 14:21:19 +0100 Subject: Revert "Revert "Removed extraneous instance"" This reverts commit e109d7c997960718707e6e74a776890a97e54a9f. --- server/src/Thermoprint/Server/Queue.hs | 3 --- server/thermoprint-server.cabal | 2 +- 2 files changed, 1 insertion(+), 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 type QueueManager t = QueueManagerM t (Extended Micro) type QueueManagerM t = ComposeT (StateT Queue) t STM -instance (Monad (StateT s (g m)), Monad (g m)) => MonadState s (ComposeT (StateT s) g m) where - state = ComposeT . state - runQM :: ( HasQueue q , MFunctor t , 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 , time >=1.5.0 && <2 , wai >=3.0.4 && <4 , warp >=3.1.9 && <4 - , mmorph >=1.0.4 && <2 + , mmorph >=1.0.6 && <2 , extended-reals >=0.2.1 && <1 , filelock >=0.1.0 && <1 , bytestring >=0.10.6 && <1 -- cgit v1.2.3