From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 759BF158094 for ; Mon, 25 Jul 2022 03:03:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 57DF7E109F; Mon, 25 Jul 2022 03:03:42 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 30D15E109E for ; Mon, 25 Jul 2022 03:03:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 86655340F14 for ; Mon, 25 Jul 2022 03:03:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0D6DE565 for ; Mon, 25 Jul 2022 03:03:37 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1658718204.0506547ce0525301be171bbe49ad9672f8824d34.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-haskell/hackage-security/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-haskell/hackage-security/files/hackage-security-0.5.3.0-ghc-8.8.patch dev-haskell/hackage-security/files/hackage-security-0.6.0.1-disable-failing-aeson-canonical-test.patch X-VCS-Directories: dev-haskell/hackage-security/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 0506547ce0525301be171bbe49ad9672f8824d34 X-VCS-Branch: master Date: Mon, 25 Jul 2022 03:03:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9b3ffbc8-5314-4ed3-aa99-9a356d57f0ea X-Archives-Hash: dd173aec7d58d5eba100219bb2543354 commit: 0506547ce0525301be171bbe49ad9672f8824d34 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Sun Jul 24 17:53:49 2022 +0000 Commit: Sam James gentoo 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 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 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 - ] - ] -