-
Aditya Bhimanavajjula authored
The interfaces for MonadTransControl, and MonadBaseControl has changed since 1.0.0.0 in monad-control. The associated types StT and StM are defined now using type instead of newtype which simplifies definitions and method signatures. With this patch monad-control 0.3.1.3 and later up til 1.1 are supported. Signed-off-by: BSRK Aditya <bsrk@google.com> Signed-off-by: Petr Pudlak <pudlak@google.com> Reviewed-by: Petr Pudlak <pudlak@google.com> Conflicts: cabal/ganeti.template.cabal src/Ganeti/BasicTypes.hs src/Ganeti/Logging/WriterLog.hs src/Ganeti/THH/HsRPC.hs src/Ganeti/WConfd/Monad.hs Resolution: - Remove the cabal template (present only in 2.14) - Remove Haskell language extensions needed only in later versions Cherry-picked-from: 890b08b7 Signed-off-by: Petr Pudlak <pudlak@google.com> Reviewed-by: Klaus Aehlig <aehlig@google.com>
7f038218