Commit 227413b8 authored by Clint Adams's avatar Clint Adams

haxr: patch for newer base-compat and newer base

parent 74f0ede5
haskell-haxr (3000.11.2-7) unstable; urgency=medium
* Patch for newer base-compat and newer base.
-- Clint Adams <clint@debian.org> Mon, 05 Nov 2018 20:20:17 -0500
haskell-haxr (3000.11.2-6) unstable; urgency=medium
* Remove build dependency on libghc-mtl-dev (provided by ghc-8.4.3)
......
......@@ -12,8 +12,8 @@ Build-Depends:
ghc-ghci,
ghc-prof,
haskell-devscripts (>= 0.13),
libghc-base-compat-dev (<< 0.10),
libghc-base-compat-dev (>= 0.8),
libghc-base-compat-dev (<< 0.11),
libghc-base-compat-prof,
libghc-base64-bytestring-dev,
libghc-base64-bytestring-prof,
......@@ -57,7 +57,7 @@ Build-Depends-Indep:
libghc-old-locale-doc,
libghc-old-time-doc,
libghc-utf8-string-doc,
Standards-Version: 4.1.4
Standards-Version: 4.2.1
Homepage: http://www.haskell.org/haskellwiki/HaXR
Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/haskell-haxr
Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git [p/haskell-haxr]
......
--- 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
--- a/haxr.cabal
+++ b/haxr.cabal
@@ -34,7 +34,7 @@
Library
Build-depends: base < 5,
- base-compat >= 0.8 && < 0.10,
+ base-compat >= 0.8 && < 0.11,
mtl >= 2.2.1,
network < 2.7,
http-streams,
no-mtl-compat
newer-base-compat
newer-base
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment