HaXml 1.25.7 → 1.25.8
raw patch · 4 files changed
+16/−11 lines, 4 filesdep ~basedep ~bytestringPVP ok
version bump matches the API change (PVP)
Dependency ranges changed: base, bytestring
API changes (from Hackage documentation)
Files
- Changelog.md +4/−0
- HaXml.cabal +6/−5
- src/Text/XML/HaXml/Schema/PrettyHaskell.hs +3/−3
- src/Text/XML/HaXml/Schema/PrettyHsBoot.hs +3/−3
Changelog.md view
@@ -1,3 +1,7 @@+## 1.25.8 (2021-11-22)+- version the License tag in HaXml.cabal as LGPL-2.1 (#3)+- allow building with ghc 9.2 (#4)+ ## 1.25.7 (2021-10-15) - many hlint fixes - fix the rendering of time durations (#1)
HaXml.cabal view
@@ -1,8 +1,8 @@ cabal-version: >= 1.10 name: HaXml-version: 1.25.7+version: 1.25.8 -license: LGPL+license: LGPL-2.1 license-files: COPYRIGHT, LICENCE-GPL, LICENCE-LGPL author: Malcolm Wallace <Malcolm.Wallace@me.com> maintainer: Jens Petersen <juhpetersen@gmail.com>@@ -17,7 +17,8 @@ extra-source-files: Changelog.md tested-with:- GHC ==9.0.1+ GHC ==9.2.1+ || ==9.0.1 || ==8.10.7 || ==8.8.4 || ==8.6.5@@ -85,8 +86,8 @@ Text.XML.HaXml.Schema.Schema hs-source-dirs: src build-depends:- base >= 4.3.1.0 && < 4.16,- bytestring >= 0.9.1.10 && < 0.11,+ base >= 4.3.1.0 && < 4.17,+ bytestring >= 0.9.1.10 && < 0.12, containers >= 0.4.0.0 && <0.7, filepath >= 1.2.0.0 && <1.5, pretty >= 1.0.1.2 && <1.2,
src/Text/XML/HaXml/Schema/PrettyHaskell.hs view
@@ -758,9 +758,9 @@ -- | Generate a single named field (no type sig) from an element. ppFieldName :: NameConverter -> XName -> Element -> Int -> Doc ppFieldName nx t e@Element{} _ = ppFieldId nx t (elem_name e)-ppFieldName nx t e@OneOf{} i = ppFieldId nx t (XName $ N $"choice"++show i)-ppFieldName nx t e@AnyElem{} i = ppFieldId nx t (XName $ N $"any"++show i)-ppFieldName nx t e@Text{} i = ppFieldId nx t (XName $ N $"text"++show i)+ppFieldName nx t e@OneOf{} i = ppFieldId nx t (XName $ N $ "choice"++show i)+ppFieldName nx t e@AnyElem{} i = ppFieldId nx t (XName $ N $ "any"++show i)+ppFieldName nx t e@Text{} i = ppFieldId nx t (XName $ N $ "text"++show i) -- | What is the name of the type for an Element (or choice of Elements)? ppElemTypeName :: NameConverter -> (Doc->Doc) -> Element -> Doc
src/Text/XML/HaXml/Schema/PrettyHsBoot.hs view
@@ -369,13 +369,13 @@ ppFieldElement nx t e@Element{} _ = ppFieldId nx t (elem_name e) <+> text "::" <+> ppElemTypeName nx id e $$ ppComment After (elem_comment e)-ppFieldElement nx t e@OneOf{} i = ppFieldId nx t (XName $ N $"choice"++show i)+ppFieldElement nx t e@OneOf{} i = ppFieldId nx t (XName $ N $ "choice"++show i) <+> text "::" <+> ppElemTypeName nx id e $$ ppComment After (elem_comment e)-ppFieldElement nx t e@AnyElem{} i = ppFieldId nx t (XName $ N $"any"++show i)+ppFieldElement nx t e@AnyElem{} i = ppFieldId nx t (XName $ N $ "any"++show i) <+> text "::" <+> ppElemTypeName nx id e $$ ppComment After (elem_comment e)-ppFieldElement nx t e@Text{} i = ppFieldId nx t (XName $ N $"text"++show i)+ppFieldElement nx t e@Text{} i = ppFieldId nx t (XName $ N $ "text"++show i) <+> text "::" <+> ppElemTypeName nx id e -- | What is the name of the type for an Element (or choice of Elements)?