[Git][haskell-team/DHG_packages][master] aeson: Upgrading from 2.1.2.1 to 2.2.3.0
Scott Talbert (@swt2c)
gitlab at salsa.debian.org
Tue Feb 10 03:36:58 GMT 2026
Scott Talbert pushed to branch master at Debian Haskell Group / DHG_packages
Commits:
ea726693 by Scott Talbert at 2026-02-09T22:31:47-05:00
aeson: Upgrading from 2.1.2.1 to 2.2.3.0
- - - - -
7 changed files:
- p/haskell-aeson/debian/changelog
- p/haskell-aeson/debian/control
- − p/haskell-aeson/debian/patches/fix-quickcheck-2.14.3
- − p/haskell-aeson/debian/patches/fix-tests-32bit
- p/haskell-aeson/debian/patches/newer-deps
- p/haskell-aeson/debian/patches/no-generically
- p/haskell-aeson/debian/patches/series
Changes:
=====================================
p/haskell-aeson/debian/changelog
=====================================
@@ -1,8 +1,9 @@
-haskell-aeson (2.1.2.1-7) UNRELEASED; urgency=medium
+haskell-aeson (2.2.3.0-1) unstable; urgency=medium
* Build using dh-haskell
+ * New upstream release
- -- Scott Talbert <swt at techie.net> Sun, 09 Nov 2025 21:11:42 -0500
+ -- Scott Talbert <swt at techie.net> Thu, 05 Feb 2026 22:45:23 -0500
haskell-aeson (2.1.2.1-6) unstable; urgency=medium
=====================================
p/haskell-aeson/debian/control
=====================================
@@ -9,55 +9,63 @@ Build-Depends:
haskell-devscripts (>= 0.15),
dh-sequence-haskell,
debhelper-compat (= 13),
- ghc (>= 9.6),
+ ghc (>= 9.10),
ghc-prof,
- libghc-onetuple-dev (>= 0.3.1),
+ libghc-onetuple-dev (>= 0.4.1.1),
libghc-onetuple-dev (<< 0.5),
libghc-onetuple-prof,
- libghc-quickcheck2-dev (>= 2.14.2),
- libghc-quickcheck2-dev (<< 2.15),
+ libghc-quickcheck2-dev (>= 2.14.3),
+ libghc-quickcheck2-dev (<< 2.16),
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.14),
- libghc-base-compat-batteries-prof,
+ libghc-character-ps-dev (>= 0.1),
+ libghc-character-ps-dev (<< 0.2),
+ libghc-character-ps-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 (>= 1.0),
libghc-dlist-dev (<< 1.1),
libghc-dlist-prof,
- libghc-hashable-dev (>= 1.3.5.0),
- libghc-hashable-dev (<< 1.5),
+ libghc-hashable-dev (>= 1.4.6.0),
+ libghc-hashable-dev (<< 1.6),
libghc-hashable-prof,
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.9),
+ libghc-integer-conversion-dev (>= 0.1),
+ libghc-integer-conversion-dev (<< 0.2),
+ libghc-integer-conversion-prof,
+ libghc-integer-logarithms-dev (>= 1.0.3.1),
+ libghc-integer-logarithms-dev (<< 1.1),
+ libghc-integer-logarithms-prof,
+ libghc-network-uri-dev (>= 2.6.4.1),
+ libghc-network-uri-dev (<< 2.7),
+ libghc-network-uri-prof,
+ libghc-primitive-dev (>= 0.8.0.0),
+ libghc-primitive-dev (<< 0.10),
libghc-primitive-prof,
libghc-scientific-dev (>= 0.3.7.0),
libghc-scientific-dev (<< 0.4),
libghc-scientific-prof,
- libghc-semialign-dev (>= 1.2),
+ libghc-semialign-dev (>= 1.3),
libghc-semialign-dev (<< 1.4),
libghc-semialign-prof,
- libghc-strict-dev (>= 0.4),
+ libghc-strict-dev (>= 0.5),
libghc-strict-dev (<< 0.6),
libghc-strict-prof,
- libghc-tagged-dev (>= 0.8.6),
+ libghc-tagged-dev (>= 0.8.7),
libghc-tagged-dev (<< 0.9),
- libghc-tagged-dev (>= 0.8.3),
libghc-tagged-prof,
+ libghc-text-iso8601-dev (>= 0.1.1),
+ libghc-text-iso8601-dev (<< 0.2),
+ libghc-text-iso8601-prof,
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.6),
+ libghc-th-abstraction-dev (>= 0.5.0.0),
+ libghc-th-abstraction-dev (<< 0.8),
libghc-th-abstraction-prof,
- libghc-these-dev (>= 1.1.1.1),
+ libghc-these-dev (>= 1.2),
libghc-these-dev (<< 1.3),
libghc-these-prof,
libghc-time-compat-dev (>= 1.9.6),
@@ -69,14 +77,14 @@ Build-Depends:
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.0.0),
libghc-vector-dev (<< 0.14),
libghc-vector-prof,
libghc-witherable-dev (>= 0.4.2),
- libghc-witherable-dev (<< 0.5),
+ libghc-witherable-dev (<< 0.6),
libghc-witherable-prof,
- libghc-diff-dev (>= 0.4),
- libghc-diff-dev (<< 0.5),
+ libghc-diff-dev (>= 1.0.2),
+ libghc-diff-dev (<< 1.1),
libghc-diff-prof,
libghc-attoparsec-dev,
libghc-base-compat-dev,
@@ -119,17 +127,20 @@ Build-Depends:
Build-Depends-Indep: ghc-doc,
libghc-onetuple-doc,
libghc-quickcheck2-doc,
- libghc-attoparsec-doc,
- libghc-base-compat-batteries-doc,
+ libghc-character-ps-doc,
libghc-data-fix-doc,
libghc-dlist-doc,
libghc-hashable-doc,
libghc-indexed-traversable-doc,
+ libghc-integer-conversion-doc,
+ libghc-integer-logarithms-doc,
+ libghc-network-uri-doc,
libghc-primitive-doc,
libghc-scientific-doc,
libghc-semialign-doc,
libghc-strict-doc,
libghc-tagged-doc,
+ libghc-text-iso8601-doc,
libghc-text-short-doc,
libghc-th-abstraction-doc,
libghc-these-doc,
@@ -138,7 +149,7 @@ Build-Depends-Indep: ghc-doc,
libghc-uuid-types-doc,
libghc-vector-doc,
libghc-witherable-doc,
-Standards-Version: 4.7.0
+Standards-Version: 4.7.3
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-quickcheck-2.14.3 deleted
=====================================
@@ -1,22 +0,0 @@
-commit 58766a1916b4980792763bab74f0c86e2a7ebf20
-Author: Oleg Grenrus <oleg.grenrus at iki.fi>
-Date: Thu Jun 1 22:58:28 2023 +0300
-
- QC-2.14.3 Double generators generates infinite number too
-
-Index: b/tests/PropUtils.hs
-===================================================================
---- a/tests/PropUtils.hs
-+++ b/tests/PropUtils.hs
-@@ -51,8 +51,9 @@ import qualified Data.Aeson.Decoding as
-
- encodeDouble :: Double -> Double -> Property
- encodeDouble num denom
-- | isInfinite d || isNaN d = encode d === "null"
-- | otherwise = (read . L.unpack . encode) d === d
-+ | isNaN d = encode d === "null"
-+ | isInfinite d = if d > 0 then encode d === "\"+inf\"" else encode d === "\"-inf\""
-+ | otherwise = (read . L.unpack . encode) d === d
- where d = num / denom
-
- encodeInteger :: Integer -> Property
=====================================
p/haskell-aeson/debian/patches/fix-tests-32bit deleted
=====================================
@@ -1,88 +0,0 @@
-Description: Fix tests on 32bit systems
- Revert commit f089cdbf5dc5b0e396dcad7497871297770d08a5.
-Bug: https://github.com/haskell/aeson/issues/1060
-
-Index: b/tests/JSONTestSuite.hs
-===================================================================
---- a/tests/JSONTestSuite.hs
-+++ b/tests/JSONTestSuite.hs
-@@ -22,69 +22,19 @@ import qualified Data.Aeson.Decoding.Byt
-
-
- jsonTestSuiteTest :: FilePath -> TestTree
--jsonTestSuiteTest path = case take 2 fileName of
-- "n_" -> negative
-- "y_" -> positive
-- "i_" | fileName `HashSet.member` ignore_accepted -> positive
-- | otherwise -> negative
-- _ | fileName `HashSet.member` transform_rejected -> negative
-- | otherwise -> positive
-+jsonTestSuiteTest path = testCase fileName $ do
-+ payload <- L.readFile path
-+ let result = eitherDecode payload :: Either String Value
-+ assertBool (show result) $ case take 2 fileName of
-+ "n_" -> isLeft result
-+ "y_" -> isRight result
-+ "i_" | fileName `HashSet.member` ignore_accepted -> isRight result
-+ | otherwise -> isLeft result
-+ _ | fileName `HashSet.member` transform_rejected -> isLeft result
-+ | otherwise -> isRight result -- test_transform tests have inconsistent names
- where
- fileName = takeFileName path
-
-- diff ref new = ["diff", "-u", ref, new]
--
-- positive = testGroup fileName
-- [ goldenVsStringDiff "decode" diff ("tests" </> "JSONTestSuite" </> "results" </> fileName -<.> "txt") $ do
-- payload <- B.readFile path
-- let result = eitherDecodeStrict payload :: Either String Value
-- assertBool (show result) (isRight result)
-- return (LBS8.pack (show result ++ "\n"))
--
-- , goldenVsStringDiff "decode via tokens" diff ("tests" </> "JSONTestSuite" </> "results" </> fileName -<.> "txt") $ do
-- payload <- B.readFile path
-- let result = D.eitherDecodeStrict payload :: Either String Value
-- assertBool (show result) (isRight result)
-- return (LBS8.pack (show result ++ "\n"))
--
-- , goldenVsStringDiff "tokens bs" diff ("tests" </> "JSONTestSuite" </> "results" </> fileName -<.> "tok") $ do
-- payload <- B.readFile path
-- let result = D.bsToTokens payload
-- return (LBS8.pack (unlines (showTokens (const []) result)))
--
-- , goldenVsStringDiff "tokens lbs" diff ("tests" </> "JSONTestSuite" </> "results" </> fileName -<.> "tok") $ do
-- payload <- L.readFile path
-- let result = D.lbsToTokens payload
-- return (LBS8.pack (unlines (showTokens (const []) result)))
--
-- ]
--
-- negative = testGroup fileName
-- [ testCase "decode" $ do
-- payload <- B.readFile path
--
-- let result1 = eitherDecodeStrict payload :: Either String Value
-- assertBool ("decode:" ++ show result1) (isLeft result1)
--
-- let result2 = D.eitherDecodeStrict payload :: Either String Value
-- assertBool ("strict:" ++ show result2) (isLeft result2)
--
-- payloadL <- L.readFile path
--
-- let result3 = D.eitherDecode payloadL :: Either String Value
-- assertBool ("lazy:" ++ show result3) (isLeft result3)
--
-- , goldenVsStringDiff "tokens bs" diff ("tests" </> "JSONTestSuite" </> "results" </> fileName -<.> "tok") $ do
-- payload <- B.readFile path
-- let result = D.bsToTokens payload
-- return (LBS8.pack (unlines (showTokens (const []) result)))
--
-- , goldenVsStringDiff "tokens lbs" diff ("tests" </> "JSONTestSuite" </> "results" </> fileName -<.> "tok") $ do
-- payload <- L.readFile path
-- let result = D.lbsToTokens payload
-- return (LBS8.pack (unlines (showTokens (const []) result)))
--
-- ]
-
- showTokens :: Show e => (k -> [String]) -> Tokens k e -> [String]
- showTokens kont (TkLit l k) = ("TkLit " ++ show l) : kont k
=====================================
p/haskell-aeson/debian/patches/newer-deps
=====================================
@@ -2,51 +2,52 @@ Index: b/aeson.cabal
===================================================================
--- a/aeson.cabal
+++ b/aeson.cabal
-@@ -109,14 +109,14 @@ library
- , containers >=0.5.7.1 && <0.7
- , deepseq >=1.4.2.0 && <1.5
+@@ -97,10 +97,10 @@ library
+ , containers >=0.6.0.1 && <0.8
+ , deepseq >=1.4.4.0 && <1.6
, exceptions >=0.10.4 && <0.11
-- , ghc-prim >=0.5.0.0 && <0.10
-- , template-haskell >=2.11.0.0 && <2.20
-+ , ghc-prim >=0.5.0.0 && <0.11
-+ , template-haskell >=2.11.0.0 && <2.21
- , text >=1.2.3.0 && <1.3 || >=2.0 && <2.1
- , time >=1.6.0.1 && <1.13
+- , ghc-prim >=0.5.0.0 && <0.12
+- , template-haskell >=2.14.0.0 && <2.23
++ , ghc-prim >=0.5.0.0 && <0.14
++ , template-haskell >=2.14.0.0 && <2.24
+ , text >=1.2.3.0 && <1.3 || >=2.0 && <2.2
+- , time >=1.8.0.2 && <1.13
++ , time >=1.8.0.2 && <1.15
-- Compat
build-depends:
-- base-compat-batteries >=0.10.0 && <0.13
-+ base-compat-batteries >=0.10.0 && <0.14
- , time-compat >=1.9.6 && <1.10
-
- if !impl(ghc >=8.6)
-@@ -129,16 +129,16 @@ library
- , dlist >=0.8.0.4 && <1.1
- , hashable >=1.3.5.0 && <1.5
- , indexed-traversable >=0.1.2 && <0.2
-- , OneTuple >=0.3.1 && <0.4
-+ , OneTuple >=0.3.1 && <0.5
- , primitive >=0.7.3.0 && <0.9
- , QuickCheck >=2.14.2 && <2.15
- , scientific >=0.3.7.0 && <0.4
-- , semialign >=1.2 && <1.3
-- , strict >=0.4 && <0.5
-+ , semialign >=1.2 && <1.4
-+ , strict >=0.4 && <0.6
- , tagged >=0.8.6 && <0.9
- , text-short >=0.1.5 && <0.2
- , th-abstraction >=0.3.0.0 && <0.6
-- , these >=1.1.1.1 && <1.2
-+ , these >=1.1.1.1 && <1.3
- , unordered-containers >=0.2.10.0 && <0.3
- , uuid-types >=1.0.5 && <1.1
- , vector >=0.12.0.1 && <0.14
-@@ -196,7 +196,7 @@ test-suite aeson-tests
- , attoparsec
- , base
- , base-compat
-- , base-orphans >=0.5.3 && <0.9
-+ , base-orphans >=0.5.3 && <0.10
- , base16-bytestring
- , bytestring
+@@ -114,14 +114,14 @@ library
+ , character-ps ^>=0.1
+ , data-fix ^>=0.3.2
+ , dlist ^>=1.0
+- , hashable ^>=1.4.6.0
++ , hashable ^>=1.4.6.0 || ^>=1.5.0.0
+ , indexed-traversable ^>=0.1.2
+ , integer-conversion ^>=0.1
+ , integer-logarithms ^>=1.0.3.1
+ , network-uri ^>=2.6.4.1
+ , OneTuple ^>=0.4.1.1
+ , primitive ^>=0.8.0.0 || ^>=0.9.0.0
+- , QuickCheck ^>=2.14.3 || ^>=2.15
++ , QuickCheck ^>=2.14.3 || ^>=2.15 || ^>=2.16.0.0
+ , scientific ^>=0.3.7.0
+ , semialign ^>=1.3
+ , strict ^>=0.5
+@@ -201,7 +201,7 @@ test-suite aeson-tests
, containers
+ , data-fix
+ , deepseq
+- , Diff >=0.4 && <0.6
++ , Diff >=0.4 && <0.6 || ^>=1.0.2
+ , directory
+ , dlist
+ , filepath
+@@ -213,7 +213,7 @@ test-suite aeson-tests
+ , network-uri
+ , OneTuple
+ , primitive
+- , QuickCheck >=2.14.2 && <2.16
++ , QuickCheck
+ , quickcheck-instances >=0.3.29 && <0.4
+ , scientific
+ , strict
=====================================
p/haskell-aeson/debian/patches/no-generically
=====================================
@@ -2,18 +2,18 @@ Index: b/aeson.cabal
===================================================================
--- a/aeson.cabal
+++ b/aeson.cabal
-@@ -117,7 +117,6 @@ library
+@@ -104,7 +104,6 @@ library
+
-- Compat
build-depends:
- base-compat-batteries >=0.10.0 && <0.13
-- , generically >=0.1 && <0.2
- , time-compat >=1.9.6 && <1.10
+- , generically >=0.1 && <0.2
+ , time-compat >=1.9.6 && <1.10
- if !impl(ghc >=8.6)
+ if !impl(ghc >=9.0)
@@ -207,7 +206,6 @@ test-suite aeson-tests
, dlist
, filepath
- , generic-deriving >=1.10 && <1.15
+ , generic-deriving >=1.10 && <1.15
- , generically
, ghc-prim >=0.2
, hashable
@@ -22,12 +22,14 @@ Index: b/tests/UnitTests.hs
===================================================================
--- a/tests/UnitTests.hs
+++ b/tests/UnitTests.hs
-@@ -58,8 +58,7 @@ import Data.Tagged (Tagged(..))
- import Data.Text (Text)
- import Data.Time (UTCTime)
- import Data.Time.Format.Compat (parseTimeM, defaultTimeLocale)
+@@ -42,10 +42,7 @@ import Data.HashMap.Strict (HashMap)
+ import Data.Kind (Type)
+ import Data.List (isSuffixOf)
+ import Data.Scientific (Scientific, scientific)
-import GHC.Generics (Generic)
+-#if __GLASGOW_HASKELL__ >= 806
-import GHC.Generics.Generically (Generically (..))
+-#endif
+import GHC.Generics (Generic, Generically(..))
import Instances ()
import Numeric.Natural (Natural)
=====================================
p/haskell-aeson/debian/patches/series
=====================================
@@ -1,4 +1,2 @@
no-generically
newer-deps
-fix-quickcheck-2.14.3
-fix-tests-32bit
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/ea7266930c11fbe11b375c603da7ea4f307df783
--
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/ea7266930c11fbe11b375c603da7ea4f307df783
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/20260210/2759e9e6/attachment-0001.htm>
More information about the Pkg-haskell-commits
mailing list