Commit d8598ea9 authored by Clint Adams's avatar Clint Adams
Browse files

haxr: Upgrading from 3000.11.2 to 3000.11.3

parent 14a47aa1
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
haskell-haxr (3000.11.3-1) unstable; urgency=medium

  * New upstream release

 -- Clint Adams <clint@debian.org>  Sun, 28 Jul 2019 14:35:37 -0400

haskell-haxr (3000.11.2-7) unstable; urgency=medium

  * Patch for newer base-compat and newer base.
+0 −27
Original line number Diff line number Diff line
--- a/Network/XmlRpc/Pretty.hs
+++ b/Network/XmlRpc/Pretty.hs
@@ -9,7 +9,7 @@
 module Network.XmlRpc.Pretty (document, content, element, 
                               doctypedecl, prolog, cp) where
 
-import Prelude hiding (maybe, elem, concat, null, head)
+import Prelude hiding (maybe, elem, concat, null, head, (<>))
 import qualified Prelude as P
 import Data.ByteString.Lazy.Char8 (ByteString(), elem, empty)
 import qualified Data.ByteString.Lazy.UTF8 as BU
@@ -21,7 +21,7 @@
 import qualified GHC.Exts as Ext
 
 -- |A 'Builder' with a recognizable empty value.
-newtype MBuilder = MBuilder { unMB :: Maybe Builder } deriving Monoid
+newtype MBuilder = MBuilder { unMB :: Maybe Builder } deriving (Monoid, Semigroup)
 
 -- |'Maybe' eliminator specialized for 'MBuilder'.
 maybe :: (t -> MBuilder) -> Maybe t -> MBuilder
@@ -338,4 +338,4 @@
 containsDoubleQuote :: [EV] -> Bool
 containsDoubleQuote evs = any csq evs
     where csq (EVString s) = '"' `elem` BU.fromString s
-          csq _            = False
\ No newline at end of file
+          csq _            = False
+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@
@@ -34,7 +34,7 @@
 
 Library
   Build-depends: base < 5,
   Build-depends: base >= 4.9 && < 4.13,
-                 base-compat >= 0.8 && < 0.10,
+                 base-compat >= 0.8 && < 0.11,
                  mtl >= 2.2.1,
+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@
+++ b/haxr.cabal
@@ -35,8 +35,7 @@
 Library
   Build-depends: base < 5,
   Build-depends: base >= 4.9 && < 4.13,
                  base-compat >= 0.8 && < 0.10,
-                 mtl,
-                 mtl-compat,
+0 −1
Original line number Diff line number Diff line
no-mtl-compat
newer-base-compat
newer-base
Loading