dev-haskell/hackage-security: fix tests and relax aeson upperbound

The tests were failing for two reasons: 1. Old aeson upperbound 2. Failing unit-test in upstream The failing test is addressed in this issue](haskell/hackage-security#247) upstream. The rest of the tests pass using the newer aeson. Signed-off-by: Wolfgang E. Sanyer <[email protected]>
ezzieyguywuf · Jan 7, 2021 · 93151b0 · 93151b0
1 parent 30fefe3
commit 93151b0
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/...ackage-security/files/hackage-security-0.6.0.1-disable-failing-aeson-canonical-test.patch b/...ackage-security/files/hackage-security-0.6.0.1-disable-failing-aeson-canonical-test.patch
@@ -0,0 +1,13 @@
+diff --git a/tests/TestSuite.hs b/tests/TestSuite.hs
+index 598e151..f62f1c5 100644
+--- a/tests/TestSuite.hs
++++ b/tests/TestSuite.hs
+@@ -70,7 +70,7 @@ tests = testGroup "hackage-security" [
+           testProperty "prop_roundtrip_canonical" JSON.prop_roundtrip_canonical
+         , testProperty "prop_roundtrip_pretty"    JSON.prop_roundtrip_pretty
+         , testProperty "prop_canonical_pretty"    JSON.prop_canonical_pretty
+-        , testProperty "prop_aeson_canonical"     JSON.prop_aeson_canonical
++        -- , testProperty "prop_aeson_canonical"     JSON.prop_aeson_canonical
+         ]
+   ]
+
diff --git a/dev-haskell/hackage-security/hackage-security-0.6.0.1.ebuild b/dev-haskell/hackage-security/hackage-security-0.6.0.1.ebuild
@@ -18,6 +18,9 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+# Upstream issue https://github.com/haskell/hackage-security/issues/247
+PATCHES="${FILESDIR}/${PN}-0.6.0.1-disable-failing-aeson-canonical-test.patch"
+
 RDEPEND=">=dev-haskell/base16-bytestring-0.1.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?]
 	>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.2:=[profile?]
 	>=dev-haskell/cryptohash-sha256-0.11:=[profile?] <dev-haskell/cryptohash-sha256-0.12:=[profile?]
@@ -35,8 +38,8 @@ RDEPEND=">=dev-haskell/base16-bytestring-0.1.1:=[profile?] <dev-haskell/base16-b
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/aeson-1.4 <dev-haskell/aeson-1.5
-		>=dev-haskell/quickcheck-2.11 <dev-haskell/quickcheck-2.14
+	test? ( >=dev-haskell/aeson-1.4
+		>=dev-haskell/quickcheck-2.11
 		>=dev-haskell/tasty-1.2 <dev-haskell/tasty-1.3
 		>=dev-haskell/tasty-hunit-0.10 <dev-haskell/tasty-hunit-0.11
 		>=dev-haskell/tasty-quickcheck-0.10 <dev-haskell/tasty-quickcheck-0.11
@@ -48,7 +51,8 @@ src_prepare() {
 	default
 
 	cabal_chdeps \
-		'QuickCheck       >= 2.11 && <2.14' 'QuickCheck >= 2.11'
+		'QuickCheck       >= 2.11 && <2.14' 'QuickCheck >= 2.11' \
+		'aeson            == 1.4.*' 'aeson >= 1.4'
 }
 
 src_configure() {