[gentoo-commits] repo/gentoo:master commit in: dev-haskell/hackage-security/files/

[gentoo-commits] repo/gentoo:master commit in: dev-haskell/hackage-security/files/

[Sam James]

commit:     0506547ce0525301be171bbe49ad9672f8824d34
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Jul 24 17:53:49 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 25 03:03:24 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0506547c

dev-haskell/hackage-security: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Portage 3.0.34 / pkgdev 0.2.1 / pkgcheck 0.10.11
Closes: https://github.com/gentoo/gentoo/pull/26570
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/hackage-security-0.5.3.0-ghc-8.8.patch            | 12 ------------
 ...urity-0.6.0.1-disable-failing-aeson-canonical-test.patch | 13 -------------
 2 files changed, 25 deletions(-)

diff --git a/dev-haskell/hackage-security/files/hackage-security-0.5.3.0-ghc-8.8.patch b/dev-haskell/hackage-security/files/hackage-security-0.5.3.0-ghc-8.8.patch
deleted file mode 100644
index 7c30961a4b4d..000000000000
--- a/dev-haskell/hackage-security/files/hackage-security-0.5.3.0-ghc-8.8.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru hackage-security-0.5.3.0.orig/src/Hackage/Security/TUF/FileMap.hs hackage-security-0.5.3.0/src/Hackage/Security/TUF/FileMap.hs
---- hackage-security-0.5.3.0.orig/src/Hackage/Security/TUF/FileMap.hs	2018-03-25 19:39:07.000000000 -0400
-+++ hackage-security-0.5.3.0/src/Hackage/Security/TUF/FileMap.hs	2019-03-16 08:29:08.347456951 -0400
-@@ -78,7 +78,7 @@
- lookupM :: Monad m => FileMap -> TargetPath -> m FileInfo
- lookupM m fp =
-     case lookup fp m of
--      Nothing  -> fail $ "No entry for " ++ pretty fp ++ " in filemap"
-+      Nothing  -> error $ "No entry for " ++ pretty fp ++ " in filemap"
-       Just nfo -> return nfo
- 
- {-------------------------------------------------------------------------------

diff --git a/dev-haskell/hackage-security/files/hackage-security-0.6.0.1-disable-failing-aeson-canonical-test.patch b/dev-haskell/hackage-security/files/hackage-security-0.6.0.1-disable-failing-aeson-canonical-test.patch
deleted file mode 100644
index fd83a5113c56..000000000000
--- a/dev-haskell/hackage-security/files/hackage-security-0.6.0.1-disable-failing-aeson-canonical-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
-         ]
-   ]
-