[Git][haskell-team/DHG_packages][master] aeson: Upgrading from 1.4.7.1 to 2.0.3.0
Clint Adams (@clint)
gitlab at salsa.debian.org
Sat Jul 23 15:04:39 BST 2022
Clint Adams pushed to branch master at Debian Haskell Group / DHG_packages
Commits:
f103e7f3 by Clint Adams at 2022-07-23T10:04:30-04:00
aeson: Upgrading from 1.4.7.1 to 2.0.3.0
- - - - -
4 changed files:
- p/haskell-aeson/debian/changelog
- p/haskell-aeson/debian/control
- − p/haskell-aeson/debian/patches/fix-rejectUnknownFields
- − p/haskell-aeson/debian/patches/series
Changes:
=====================================
p/haskell-aeson/debian/changelog
=====================================
@@ -1,8 +1,12 @@
-haskell-aeson (1.4.7.1-3) UNRELEASED; urgency=medium
+haskell-aeson (2.0.3.0-1) unstable; urgency=medium
+ [ Ilias Tsitsimpis ]
* Declare compliance with Debian policy 4.6.1
- -- Ilias Tsitsimpis <iliastsi at debian.org> Tue, 28 Jun 2022 15:32:00 +0300
+ [ Clint Adams ]
+ * New upstream version.
+
+ -- Clint Adams <clint at debian.org> Sat, 23 Jul 2022 08:09:52 -0400
haskell-aeson (1.4.7.1-2) unstable; urgency=medium
=====================================
p/haskell-aeson/debian/control
=====================================
@@ -6,58 +6,79 @@ Priority: optional
Section: haskell
Rules-Requires-Root: no
Build-Depends:
+ haskell-devscripts (>= 0.15),
cdbs,
debhelper (>= 10),
ghc (>= 8.4.3),
ghc-prof,
- haskell-devscripts (>= 0.15),
- libghc-attoparsec-dev (>= 0.13.2.2),
- libghc-attoparsec-dev (<< 0.14),
+ libghc-onetuple-dev (>= 0.3.1),
+ libghc-onetuple-dev (<< 0.4),
+ libghc-onetuple-prof,
+ libghc-quickcheck2-dev (>= 2.14.2),
+ libghc-quickcheck2-dev (<< 2.15),
+ libghc-quickcheck2-prof,
+ libghc-attoparsec-dev (>= 0.14.2),
+ libghc-attoparsec-dev (<< 0.15),
libghc-attoparsec-prof,
libghc-base-compat-batteries-dev (>= 0.10.0),
- libghc-base-compat-batteries-dev (<< 0.12),
+ libghc-base-compat-batteries-dev (<< 0.13),
libghc-base-compat-batteries-prof,
- libghc-contravariant-dev (>= 1.4.1),
- libghc-contravariant-dev (<< 1.6),
- libghc-contravariant-prof,
+ libghc-data-fix-dev (>= 0.3.2),
+ libghc-data-fix-dev (<< 0.4),
+ libghc-data-fix-prof,
libghc-dlist-dev (>= 0.8.0.4),
- libghc-dlist-dev (<< 0.9),
+ libghc-dlist-dev (<< 1.1),
libghc-dlist-prof,
- libghc-hashable-dev (>= 1.2.7.0),
- libghc-hashable-dev (<< 1.4),
+ libghc-hashable-dev (>= 1.3.5.0),
+ libghc-hashable-dev (<< 1.5),
libghc-hashable-prof,
- libghc-primitive-dev (>= 0.6.3.0),
+ libghc-indexed-traversable-dev (>= 0.1.2),
+ libghc-indexed-traversable-dev (<< 0.2),
+ libghc-indexed-traversable-prof,
+ libghc-primitive-dev (>= 0.7.3.0),
libghc-primitive-dev (<< 0.8),
libghc-primitive-prof,
- libghc-scientific-dev (>= 0.3.6.2),
+ libghc-scientific-dev (>= 0.3.7.0),
libghc-scientific-dev (<< 0.4),
libghc-scientific-prof,
- libghc-tagged-dev (>= 0.8.5),
+ libghc-semialign-dev (>= 1.2),
+ libghc-semialign-dev (<< 1.3),
+ libghc-semialign-prof,
+ libghc-strict-dev (>= 0.4),
+ libghc-strict-dev (<< 0.5),
+ libghc-strict-prof,
+ libghc-tagged-dev (>= 0.8.6),
libghc-tagged-dev (<< 0.9),
libghc-tagged-dev (>= 0.8.3),
libghc-tagged-prof,
- libghc-th-abstraction-dev (>= 0.2.8.0),
- libghc-th-abstraction-dev (<< 0.4),
+ libghc-text-short-dev (>= 0.1.5),
+ libghc-text-short-dev (<< 0.2),
+ libghc-text-short-prof,
+ libghc-th-abstraction-dev (>= 0.3.0.0),
+ libghc-th-abstraction-dev (<< 0.5),
libghc-th-abstraction-prof,
- libghc-time-compat-dev (>= 1.9.2.2),
+ libghc-these-dev (>= 1.1.1.1),
+ libghc-these-dev (<< 1.2),
+ libghc-these-prof,
+ libghc-time-compat-dev (>= 1.9.6),
libghc-time-compat-dev (<< 1.10),
libghc-time-compat-prof,
- libghc-unordered-containers-dev (>= 0.2.8.0),
+ libghc-unordered-containers-dev (>= 0.2.10.0),
libghc-unordered-containers-dev (<< 0.3),
libghc-unordered-containers-prof,
- libghc-vector-dev (>= 0.8),
- libghc-uuid-types-dev (>= 1.0.3),
+ libghc-uuid-types-dev (>= 1.0.5),
libghc-uuid-types-dev (<< 1.1),
libghc-uuid-types-prof,
libghc-vector-dev (>= 0.12.0.1),
libghc-vector-dev (<< 0.13),
libghc-vector-prof,
+ libghc-witherable-dev (>= 0.4.2),
+ libghc-witherable-dev (<< 0.5),
+ libghc-witherable-prof,
libghc-diff-dev (>= 0.4),
libghc-diff-dev (<< 0.5),
libghc-diff-prof,
- libghc-quickcheck2-dev (>= 2.10.0.1),
- libghc-quickcheck2-dev (<< 2.14),
- libghc-quickcheck2-prof,
+ libghc-onetuple-dev,
libghc-attoparsec-dev,
libghc-base-compat-dev,
libghc-base-compat-prof,
@@ -66,21 +87,22 @@ Build-Depends:
libghc-base-orphans-prof,
libghc-base16-bytestring-dev,
libghc-base16-bytestring-prof,
+ libghc-data-fix-dev,
libghc-dlist-dev,
libghc-generic-deriving-dev (>= 1.10),
- libghc-generic-deriving-dev (<< 1.14),
+ libghc-generic-deriving-dev (<< 1.15),
libghc-generic-deriving-prof,
- libghc-hashable-dev (>= 1.2.4.0),
- libghc-hashable-time-dev (>= 0.2),
- libghc-hashable-time-dev (<< 0.3),
- libghc-hashable-time-prof,
+ libghc-hashable-dev,
+ libghc-indexed-traversable-dev,
libghc-integer-logarithms-dev (>= 1),
libghc-integer-logarithms-dev (<< 1.1),
libghc-integer-logarithms-prof,
- libghc-quickcheck-instances-dev (>= 0.3.21),
+ libghc-primitive-dev,
+ libghc-quickcheck-instances-dev (>= 0.3.26.1),
libghc-quickcheck-instances-dev (<< 0.4),
libghc-quickcheck-instances-prof,
libghc-scientific-dev,
+ libghc-strict-dev,
libghc-tagged-dev,
libghc-tasty-dev,
libghc-tasty-prof,
@@ -90,26 +112,36 @@ Build-Depends:
libghc-tasty-hunit-prof,
libghc-tasty-quickcheck-dev,
libghc-tasty-quickcheck-prof,
+ libghc-text-short-dev,
+ libghc-these-dev,
libghc-time-compat-dev,
libghc-unordered-containers-dev,
libghc-uuid-types-dev,
libghc-vector-dev,
Build-Depends-Indep: ghc-doc,
+ libghc-onetuple-doc,
+ libghc-quickcheck2-doc,
libghc-attoparsec-doc,
libghc-base-compat-batteries-doc,
- libghc-contravariant-doc,
+ libghc-data-fix-doc,
libghc-dlist-doc,
libghc-hashable-doc,
+ libghc-indexed-traversable-doc,
libghc-primitive-doc,
libghc-scientific-doc,
+ libghc-semialign-doc,
+ libghc-strict-doc,
libghc-tagged-doc,
+ libghc-text-short-doc,
libghc-th-abstraction-doc,
+ libghc-these-doc,
libghc-time-compat-doc,
libghc-unordered-containers-doc,
libghc-uuid-types-doc,
libghc-vector-doc,
+ libghc-witherable-doc,
Standards-Version: 4.6.1
-Homepage: https://github.com/bos/aeson
+Homepage: https://github.com/haskell/aeson
Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/haskell-aeson
Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git [p/haskell-aeson]
=====================================
p/haskell-aeson/debian/patches/fix-rejectUnknownFields deleted
=====================================
@@ -1,103 +0,0 @@
-commit 143da4ee9328941863ff2eca2490cfce66e055bd
-Author: Markus Schirp <mbj at schirp-dso.com>
-Date: Sun May 3 02:53:30 2020 +0000
-
- Fix `rejectUnknownFields` to respect `fieldLabelModifier`
-
- * Apply `fieldLabelModifier` to known fields reflected from the
- `FieldName` class. While NOT applying the `fieldLabelModofier` to the
- encoding tags.
- * Change the intermediary type returned by the `FieldName` class from
- `Text` to `String` to reduce `{un,}pack` calls to a minimum.
- * Update tests which specified the problem before to assert the fixed
- semantics.
-
- [fix #773]
-
-Index: b/Data/Aeson/TH.hs
-===================================================================
---- a/Data/Aeson/TH.hs
-+++ b/Data/Aeson/TH.hs
-@@ -939,7 +939,7 @@ parseRecord jc tvMap argTys opts tName c
- if inTaggedObject then (tagFieldName (sumEncoding opts) :) else id
- knownFields = appE [|H.fromList|] $ listE $
- map (\knownName -> tupE [appE [|T.pack|] $ litE $ stringL knownName, [|()|]]) $
-- tagFieldNameAppender $ map nameBase fields
-+ tagFieldNameAppender $ map (fieldLabel opts) fields
- checkUnknownRecords =
- caseE (appE [|H.keys|] $ infixApp (varE obj) [|H.difference|] knownFields)
- [ match (listP []) (normalB [|return ()|]) []
-Index: b/Data/Aeson/Types/FromJSON.hs
-===================================================================
---- a/Data/Aeson/Types/FromJSON.hs
-+++ b/Data/Aeson/Types/FromJSON.hs
-@@ -1274,7 +1274,7 @@ instance (ProductFromJSON arity f, Produ
- --------------------------------------------------------------------------------
-
- class FieldNames f where
-- fieldNames :: f a -> [Text] -> [Text]
-+ fieldNames :: f a -> [String] -> [String]
-
- instance (FieldNames a, FieldNames b) => FieldNames (a :*: b) where
- fieldNames _ =
-@@ -1282,7 +1282,7 @@ instance (FieldNames a, FieldNames b) =>
- fieldNames (undefined :: b y)
-
- instance (Selector s) => FieldNames (S1 s f) where
-- fieldNames _ = (pack (selName (undefined :: M1 _i s _f _p)) :)
-+ fieldNames _ = (selName (undefined :: M1 _i s _f _p) :)
-
- class RecordFromJSON arity f where
- recordParseJSON
-@@ -1296,9 +1296,10 @@ instance ( FieldNames f
- \obj -> checkUnknown obj >> recordParseJSON' p obj
- where
- knownFields :: H.HashMap Text ()
-- knownFields = H.fromList $ map (,()) $
-- fieldNames (undefined :: f a)
-- [pack (tagFieldName (sumEncoding opts)) | fromTaggedSum]
-+ knownFields = H.fromList $ map ((,()) . pack) $
-+ [tagFieldName (sumEncoding opts) | fromTaggedSum] <>
-+ (fieldLabelModifier opts <$> fieldNames (undefined :: f a) [])
-+
- checkUnknown =
- if not (rejectUnknownFields opts)
- then \_ -> return ()
-Index: b/changelog.md
-===================================================================
---- a/changelog.md
-+++ b/changelog.md
-@@ -3,6 +3,7 @@ For the latest version of this document,
- #### 1.4.7.1
-
- * GHC 8.10 compatibility, thanks to Ryan Scott.
-+* Fix bug in `rejectUnknownFields` not respecting `fieldLabelModifier`.
-
- ### 1.4.7.0
-
-Index: b/tests/ErrorMessages.hs
-===================================================================
---- a/tests/ErrorMessages.hs
-+++ b/tests/ErrorMessages.hs
-@@ -140,7 +140,7 @@ outputGeneric choice = concat
- (select
- thSomeTypeParseJSONRejectUnknownFields
- gSomeTypeParseJSONRejectUnknownFields)
-- [ "{\"tag\": \"record\", \"testOne\": 1.0, \"testZero\": 1}"
-+ [ "{\"tag\": \"record\", \"testone\": 1.0, \"testZero\": 1}"
- , "{\"testZero\": 1}"
- , "{\"tag\": \"record\", \"testone\": true, \"testtwo\": null, \"testthree\": null}"
- ]
-Index: b/tests/golden/generic.expected
-===================================================================
---- a/tests/golden/generic.expected
-+++ b/tests/golden/generic.expected
-@@ -34,7 +34,7 @@ Error in $: not enough input. Expecting
- SomeType (reject unknown fields)
- Error in $: parsing Types.SomeType(Record) failed, unknown fields: ["testZero"]
- Error in $: parsing Types.SomeType failed, expected Object with key "tag" containing one of ["nullary","unary","product","record","list"], key "tag" not found
--Error in $: parsing Types.SomeType(Record) failed, unknown fields: ["testtwo","testone","testthree"]
-+Error in $.testone: parsing Double failed, unexpected Boolean
- Foo (reject unknown fields)
- Error in $: parsing Types.Foo(Foo) failed, unknown fields: ["tag"]
- Foo (reject unknown fields, tagged single)
=====================================
p/haskell-aeson/debian/patches/series deleted
=====================================
@@ -1 +0,0 @@
-fix-rejectUnknownFields
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/f103e7f382f77bd95695f5fb6618e8fcd38e4c81
--
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/f103e7f382f77bd95695f5fb6618e8fcd38e4c81
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20220723/b81ef0ce/attachment-0001.htm>
More information about the Pkg-haskell-commits
mailing list