[Git][haskell-team/DHG_packages][master] 2 commits: aeson: Fix compatibility with QuickCheck 2.14.3
Ilias Tsitsimpis (@iliastsi)
gitlab at salsa.debian.org
Thu Oct 5 18:43:48 BST 2023
Ilias Tsitsimpis pushed to branch master at Debian Haskell Group / DHG_packages
Commits:
974945b9 by Ilias Tsitsimpis at 2023-10-05T20:35:40+03:00
aeson: Fix compatibility with QuickCheck 2.14.3
- - - - -
b5923363 by Ilias Tsitsimpis at 2023-10-05T20:36:46+03:00
binary-orphans: Update build dependencies
- - - - -
9 changed files:
- p/haskell-aeson/debian/changelog
- + p/haskell-aeson/debian/patches/fix-quickcheck-2.14.3
- p/haskell-aeson/debian/patches/newer-deps
- p/haskell-aeson/debian/patches/no-generically
- p/haskell-aeson/debian/patches/series
- p/haskell-binary-orphans/debian/changelog
- p/haskell-binary-orphans/debian/control
- + p/haskell-binary-orphans/debian/patches/newer-deps
- + p/haskell-binary-orphans/debian/patches/series
Changes:
=====================================
p/haskell-aeson/debian/changelog
=====================================
@@ -1,3 +1,10 @@
+haskell-aeson (2.1.2.1-4) unstable; urgency=medium
+
+ * Backport upstream patch to fix compatibility with QuickCheck 2.14.3
+ (Closes: #1053304, #1053208)
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org> Thu, 05 Oct 2023 20:35:30 +0300
+
haskell-aeson (2.1.2.1-3) unstable; urgency=medium
* Patch testsuite bug.
=====================================
p/haskell-aeson/debian/patches/fix-quickcheck-2.14.3
=====================================
@@ -0,0 +1,22 @@
+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/newer-deps
=====================================
@@ -1,3 +1,5 @@
+Index: b/aeson.cabal
+===================================================================
--- a/aeson.cabal
+++ b/aeson.cabal
@@ -109,14 +109,14 @@ library
=====================================
p/haskell-aeson/debian/patches/no-generically
=====================================
@@ -1,3 +1,5 @@
+Index: b/aeson.cabal
+===================================================================
--- a/aeson.cabal
+++ b/aeson.cabal
@@ -117,7 +117,6 @@ library
@@ -16,6 +18,8 @@
, ghc-prim >=0.2
, hashable
, indexed-traversable
+Index: b/tests/UnitTests.hs
+===================================================================
--- a/tests/UnitTests.hs
+++ b/tests/UnitTests.hs
@@ -58,8 +58,7 @@ import Data.Tagged (Tagged(..))
=====================================
p/haskell-aeson/debian/patches/series
=====================================
@@ -1,2 +1,3 @@
no-generically
newer-deps
+fix-quickcheck-2.14.3
=====================================
p/haskell-binary-orphans/debian/changelog
=====================================
@@ -1,3 +1,9 @@
+haskell-binary-orphans (1.0.4.1-2) unstable; urgency=medium
+
+ * Update build dependencies
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org> Thu, 05 Oct 2023 20:36:29 +0300
+
haskell-binary-orphans (1.0.4.1-1) unstable; urgency=medium
[ Ilias Tsitsimpis ]
=====================================
p/haskell-binary-orphans/debian/control
=====================================
@@ -21,7 +21,7 @@ Build-Depends:
libghc-quickcheck-instances-dev (<< 0.4),
libghc-quickcheck-instances-prof,
libghc-tagged-dev (>= 0.8.6),
- libghc-tagged-dev (<< 0.8.7),
+ libghc-tagged-dev (<< 0.9),
libghc-tagged-prof,
libghc-tasty-dev (>= 0.10.1.2),
libghc-tasty-dev (<< 1.5),
=====================================
p/haskell-binary-orphans/debian/patches/newer-deps
=====================================
@@ -0,0 +1,39 @@
+Index: b/binary-orphans.cabal
+===================================================================
+--- a/binary-orphans.cabal
++++ b/binary-orphans.cabal
+@@ -1,6 +1,7 @@
+ cabal-version: 1.12
+ name: binary-orphans
+ version: 1.0.4.1
++x-revision: 2
+ synopsis: Compatibility package for binary; provides instances
+ category: Data, Binary, Parsing, Compatibility
+ description:
+@@ -34,7 +35,7 @@ extra-source-files: CHANGELOG.md
+
+ source-repository head
+ type: git
+- location: git://github.com/phadej/binary-orphans.git
++ location: https://github.com/phadej/binary-orphans.git
+
+ library
+ default-language: Haskell2010
+@@ -43,7 +44,7 @@ library
+ exposed-modules: Data.Binary.Orphans
+ other-extensions: CPP
+ build-depends:
+- base >=4.5 && <4.18
++ base >=4.5 && <4.19
+ , binary >=0.5.1.0 && <0.6 || >=0.7.1.0 && <0.8 || >=0.8.3.0 && <0.8.10
+ , transformers >=0.3.0.0 && <0.7
+
+@@ -74,7 +75,7 @@ test-suite binary-orphans-test
+ , OneTuple >=0.3 && <0.5
+ , QuickCheck >=2.13.1 && <2.15
+ , quickcheck-instances >=0.3.28 && <0.4
+- , tagged >=0.8.6 && <0.8.7
++ , tagged >=0.8.6 && <0.9
+ , tasty >=0.10.1.2 && <1.5
+ , tasty-quickcheck >=0.8.3.2 && <0.11
+
=====================================
p/haskell-binary-orphans/debian/patches/series
=====================================
@@ -0,0 +1 @@
+newer-deps
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/6216f3104dac5df21d5ea5989c36444aa9e4cd89...b5923363284276a4533c28f7e7feff3c21359923
--
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/6216f3104dac5df21d5ea5989c36444aa9e4cd89...b5923363284276a4533c28f7e7feff3c21359923
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/20231005/c72fca55/attachment-0001.htm>
More information about the Pkg-haskell-commits
mailing list