From 642b13c03554b5c329275c0ca5953e8c9b63667a Mon Sep 17 00:00:00 2001 From: Abhinav Sarkar Date: Mon, 7 Sep 2015 22:42:25 +0530 Subject: [PATCH] Extends dependency versions for compilation with new library versions. --- hask-irc-core/Network/IRC/Bot.hs | 2 +- hask-irc-core/Network/IRC/Client.hs | 2 +- hask-irc-core/hask-irc-core.cabal | 6 +++--- hask-irc-handlers/hask-irc-handlers.cabal | 10 +++++----- hask-irc-runner/Network/IRC/Config.hs | 4 ---- hask-irc-runner/hask-irc-runner.cabal | 2 +- 6 files changed, 11 insertions(+), 15 deletions(-) diff --git a/hask-irc-core/Network/IRC/Bot.hs b/hask-irc-core/Network/IRC/Bot.hs index 4789f98..f59ff4b 100644 --- a/hask-irc-core/Network/IRC/Bot.hs +++ b/hask-irc-core/Network/IRC/Bot.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE FlexibleContexts, TemplateHaskell #-} +{-# LANGUAGE FlexibleContexts, TemplateHaskell, TypeFamilies #-} module Network.IRC.Bot ( In diff --git a/hask-irc-core/Network/IRC/Client.hs b/hask-irc-core/Network/IRC/Client.hs index 412cb90..d4c9da5 100644 --- a/hask-irc-core/Network/IRC/Client.hs +++ b/hask-irc-core/Network/IRC/Client.hs @@ -10,7 +10,7 @@ Portability : POSIX The IRC bot client used to create and run a bot. -} -{-# LANGUAGE TemplateHaskell #-} +{-# LANGUAGE TemplateHaskell, TypeFamilies #-} module Network.IRC.Client (runBot, Priority (..)) where diff --git a/hask-irc-core/hask-irc-core.cabal b/hask-irc-core/hask-irc-core.cabal index 664ecc0..4c5bc1c 100644 --- a/hask-irc-core/hask-irc-core.cabal +++ b/hask-irc-core/hask-irc-core.cabal @@ -60,11 +60,11 @@ library hslogger-template >=2.0 && <2.1, lifted-base >=0.2 && <0.3, mtl >=2.1 && <2.3, - network >=2.5 && <2.6, + network >=2.5 && <2.7, safecopy >=0.8 && <0.9, - text >=1.1 && <1.2, + text >=1.1 && <1.3, text-format >=0.3 && <0.4, - time >=1.4 && <1.5, + time >=1.4 && <1.6, transformers-base >=0.4 && <0.5, unix >=2.7 && <2.8 diff --git a/hask-irc-handlers/hask-irc-handlers.cabal b/hask-irc-handlers/hask-irc-handlers.cabal index eaf71ad..363e92d 100644 --- a/hask-irc-handlers/hask-irc-handlers.cabal +++ b/hask-irc-handlers/hask-irc-handlers.cabal @@ -55,13 +55,13 @@ library build-depends: base >=4.5 && <4.9, hask-irc-core ==0.1.0, - acid-state >=0.12 && <0.13, - aeson >=0.7 && <0.8, + acid-state >=0.12 && <0.14, + aeson >=0.7 && <0.10, classy-prelude >=0.10 && <1.0, convertible >=1.1 && <1.2, curl-aeson >=0.0.3 && <0.1, directory >=1.2 && <1.3, - filepath >=1.3 && <1.4, + filepath >=1.3 && <1.5, hslogger >=1.2 && <1.3, hslogger-template >=2.0 && <2.1, HTTP >=4000 && <5000, @@ -69,9 +69,9 @@ library lifted-base >=0.2 && <0.3, mtl >=2.1 && <2.3, safecopy >=0.8 && <0.9, - text >=1.1 && <1.2, + text >=1.1 && <1.3, text-format >=0.3 && <0.4, - time >=1.4 && <1.5, + time >=1.4 && <1.6, uuid >=1.3 && <1.4 exposed-modules: Network.IRC.Handlers, diff --git a/hask-irc-runner/Network/IRC/Config.hs b/hask-irc-runner/Network/IRC/Config.hs index dbf315d..a6bd3d8 100644 --- a/hask-irc-runner/Network/IRC/Config.hs +++ b/hask-irc-runner/Network/IRC/Config.hs @@ -14,10 +14,6 @@ import Network.IRC import Network.IRC.Configuration import Network.IRC.Handlers -instance Configured a => Configured [a] where - convert (CFT.List xs) = Just . mapMaybe convert $ xs - convert _ = Nothing - instance Configurable CFT.Value where fromValue (String a) = Just $ CFT.String a fromValue (Number a) = Just $ CFT.Number (a R.% 1) diff --git a/hask-irc-runner/hask-irc-runner.cabal b/hask-irc-runner/hask-irc-runner.cabal index c8c7ad3..72b0685 100644 --- a/hask-irc-runner/hask-irc-runner.cabal +++ b/hask-irc-runner/hask-irc-runner.cabal @@ -64,7 +64,7 @@ executable hask-irc hask-irc-core ==0.1.0, hask-irc-handlers ==0.1.0, classy-prelude >=0.10 && <1.0, - configurator >=0.2 && <0.3 + configurator >=0.2 && <0.4 -- Directories containing source files. -- hs-source-dirs: