[DHG_packages] 01/01: lambdabot-core: patch for newer dependent-{map, sum}
Clint Adams
clint at moszumanska.debian.org
Mon Mar 14 05:18:34 UTC 2016
This is an automated email from the git hooks/post-receive script.
clint pushed a commit to branch master
in repository DHG_packages.
commit 3c3276d9c3bf1885fcc264ccd4e75f6e909369e1
Author: Clint Adams <clint at debian.org>
Date: Sun Mar 13 21:01:01 2016 -0400
lambdabot-core: patch for newer dependent-{map,sum}
---
p/haskell-lambdabot-core/debian/changelog | 6 ++
p/haskell-lambdabot-core/debian/control | 8 +--
.../debian/patches/newer-dependent-map | 79 ++++++++++++++++++++++
p/haskell-lambdabot-core/debian/patches/series | 1 +
4 files changed, 90 insertions(+), 4 deletions(-)
diff --git a/p/haskell-lambdabot-core/debian/changelog b/p/haskell-lambdabot-core/debian/changelog
index 0ed1eae..a1d63a4 100644
--- a/p/haskell-lambdabot-core/debian/changelog
+++ b/p/haskell-lambdabot-core/debian/changelog
@@ -1,3 +1,9 @@
+haskell-lambdabot-core (5.0.3-4) unstable; urgency=medium
+
+ * Patch for newer dependent-{map,sum}.
+
+ -- Clint Adams <clint at debian.org> Sun, 13 Mar 2016 20:55:40 -0400
+
haskell-lambdabot-core (5.0.3-3) unstable; urgency=medium
* Set a human Uploader
diff --git a/p/haskell-lambdabot-core/debian/control b/p/haskell-lambdabot-core/debian/control
index afccf11..06beb0b 100644
--- a/p/haskell-lambdabot-core/debian/control
+++ b/p/haskell-lambdabot-core/debian/control
@@ -12,11 +12,11 @@ Build-Depends: debhelper (>= 9),
libghc-http-prof,
libghc-safesemaphore-dev (>= 0.9),
libghc-safesemaphore-prof,
- libghc-dependent-map-dev (>= 0.1),
- libghc-dependent-map-dev (<< 0.2),
+ libghc-dependent-map-dev (>= 0.2),
+ libghc-dependent-map-dev (<< 0.3),
libghc-dependent-map-prof,
- libghc-dependent-sum-dev (>= 0.2),
- libghc-dependent-sum-dev (<< 0.3),
+ libghc-dependent-sum-dev (>= 0.3),
+ libghc-dependent-sum-dev (<< 0.4),
libghc-dependent-sum-prof,
libghc-dependent-sum-template-dev (>= 0.0.0.1),
libghc-dependent-sum-template-prof,
diff --git a/p/haskell-lambdabot-core/debian/patches/newer-dependent-map b/p/haskell-lambdabot-core/debian/patches/newer-dependent-map
new file mode 100644
index 0000000..c1766f1
--- /dev/null
+++ b/p/haskell-lambdabot-core/debian/patches/newer-dependent-map
@@ -0,0 +1,79 @@
+--- a/lambdabot-core.cabal
++++ b/lambdabot-core.cabal
+@@ -67,12 +67,12 @@
+ Lambdabot.Util.Serial
+ Lambdabot.Util.Signals
+
+- build-depends: base >= 4.4 && < 5,
++ build-depends: base >= 4.8 && < 5,
+ binary >= 0.5,
+ bytestring >= 0.9,
+ containers >= 0.4,
+- dependent-map == 0.1.*,
+- dependent-sum == 0.2.*,
++ dependent-map == 0.2.*,
++ dependent-sum == 0.3.*,
+ dependent-sum-template >= 0.0.0.1,
+ directory >= 1.1,
+ edit-distance >= 0.2,
+--- a/src/Lambdabot/Monad.hs
++++ b/src/Lambdabot/Monad.hs
+@@ -55,6 +55,7 @@
+ import Control.Monad.State
+ import Control.Monad.Trans.Control
+ import qualified Data.Dependent.Map as D
++import Data.Functor.Identity (Identity(..))
+ import Data.IORef
+ import qualified Data.Map as M
+ import qualified Data.Set as S
+@@ -69,11 +70,11 @@
+ data IRCRState = IRCRState
+ { ircInitDoneMVar :: MVar ()
+ , ircQuitMVar :: MVar ()
+- , ircConfig :: D.DMap Config
++ , ircConfig :: D.DMap Config Identity
+ }
+
+ -- | Default ro state
+-initRoState :: [D.DSum Config] -> IO IRCRState
++initRoState :: [D.DSum Config Identity] -> IO IRCRState
+ initRoState configuration = do
+ quitMVar <- newEmptyMVar
+ initDoneMVar <- newEmptyMVar
+@@ -81,7 +82,7 @@
+ return IRCRState
+ { ircQuitMVar = quitMVar
+ , ircInitDoneMVar = initDoneMVar
+- , ircConfig = D.fromListWithKey (flip . mergeConfig) configuration
++ , ircConfig = D.fromListWithKey (liftA2 . flip . mergeConfig) configuration
+ }
+
+ reportInitDone :: MonadIO m => IRCRState -> m ()
+@@ -225,7 +226,7 @@
+ lift $ writeIORef ref x
+
+ instance MonadConfig LB where
+- getConfig k = liftM (maybe (getConfigDefault k) id . D.lookup k) (lb (askLB ircConfig))
++ getConfig k = liftM (maybe (getConfigDefault k) id . fmap runIdentity . D.lookup k) (lb (askLB ircConfig))
+
+ instance MonadLogging LB where
+ getCurrentLogger = getConfig lbRootLoggerPath
+--- a/src/Lambdabot/Main.hs
++++ b/src/Lambdabot/Main.hs
+@@ -25,6 +25,7 @@
+
+ import Control.Exception.Lifted as E
+ import Data.Dependent.Sum
++import Data.Functor.Identity (Identity)
+ import Data.List
+ import Data.Typeable
+ import Data.Version
+@@ -63,7 +64,7 @@
+ -- Also, handle any fatal exceptions (such as non-recoverable signals),
+ -- (i.e. print a message and exit). Non-fatal exceptions should be dealt
+ -- with in the mainLoop or further down.
+-lambdabotMain :: LB () -> [DSum Config] -> IO ExitCode
++lambdabotMain :: LB () -> [DSum Config Identity] -> IO ExitCode
+ lambdabotMain initialise cfg = withSocketsDo . withIrcSignalCatch $ do
+ rost <- initRoState cfg
+ r <- try $ evalLB (do setupLogging
diff --git a/p/haskell-lambdabot-core/debian/patches/series b/p/haskell-lambdabot-core/debian/patches/series
new file mode 100644
index 0000000..b4c4258
--- /dev/null
+++ b/p/haskell-lambdabot-core/debian/patches/series
@@ -0,0 +1 @@
+newer-dependent-map
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git
More information about the Pkg-haskell-commits
mailing list