| 1 |
commit: 98e9e54d46b8ff5a00be53ce8f4df5e947ff063c |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 15 12:30:04 2019 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 15 12:50:17 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98e9e54d |
| 7 |
|
| 8 |
dev-haskell/tasty: tweak against unbounded-delays-0.1.1.0 |
| 9 |
|
| 10 |
The patch fixes the following build failure: |
| 11 |
|
| 12 |
``` |
| 13 |
Test/Tasty/Run.hs:80:6: error: |
| 14 |
Ambiguous occurrence ‘Timeout’ |
| 15 |
It could refer to either ‘Control.Concurrent.Timeout.Timeout’, |
| 16 |
imported from ‘Control.Concurrent.Timeout’ at Test/Tasty/Run.hs:18:1-33 |
| 17 |
or ‘Test.Tasty.Options.Core.Timeout’, |
| 18 |
imported from ‘Test.Tasty.Options.Core’ at Test/Tasty/Run.hs:29:1-30 |
| 19 |
(and originally defined |
| 20 |
at Test/Tasty/Options/Core.hs:(54,1)-(60,27)) |
| 21 |
``` |
| 22 |
|
| 23 |
Reported-by: Toralf Förster |
| 24 |
Closes: https://bugs.gentoo.org/702906 |
| 25 |
Package-Manager: Portage-2.3.81, Repoman-2.3.20 |
| 26 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 27 |
|
| 28 |
.../files/tasty-0.11.0.4-unbounded-delays.patch | 26 ++++++++++++++++++++++ |
| 29 |
dev-haskell/tasty/tasty-0.11.0.4.ebuild | 2 ++ |
| 30 |
2 files changed, 28 insertions(+) |
| 31 |
|
| 32 |
diff --git a/dev-haskell/tasty/files/tasty-0.11.0.4-unbounded-delays.patch b/dev-haskell/tasty/files/tasty-0.11.0.4-unbounded-delays.patch |
| 33 |
new file mode 100644 |
| 34 |
index 00000000000..ad265fdff29 |
| 35 |
--- /dev/null |
| 36 |
+++ b/dev-haskell/tasty/files/tasty-0.11.0.4-unbounded-delays.patch |
| 37 |
@@ -0,0 +1,26 @@ |
| 38 |
+https://bugs.gentoo.org/702906 |
| 39 |
+ |
| 40 |
+From 74e87fff6a4a830dc64d59f4baa1a5f6759c007c Mon Sep 17 00:00:00 2001 |
| 41 |
+From: Roman Cheplyaka <roma@××××××.info> |
| 42 |
+Date: Fri, 5 May 2017 08:54:28 +0300 |
| 43 |
+Subject: [PATCH] Fix compatibility with the latest unbounded-delays |
| 44 |
+ |
| 45 |
+Fixes #166 |
| 46 |
+--- |
| 47 |
+ core/Test/Tasty/Run.hs | 2 +- |
| 48 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 49 |
+ |
| 50 |
+--- a/Test/Tasty/Run.hs |
| 51 |
++++ b/Test/Tasty/Run.hs |
| 52 |
+@@ -15,7 +15,7 @@ import Control.Monad.State |
| 53 |
+ import Control.Monad.Writer |
| 54 |
+ import Control.Monad.Reader |
| 55 |
+ import Control.Concurrent.STM |
| 56 |
+-import Control.Concurrent.Timeout |
| 57 |
++import Control.Concurrent.Timeout (timeout) |
| 58 |
+ import Control.Concurrent.Async |
| 59 |
+ import Control.Exception as E |
| 60 |
+ import Control.Applicative |
| 61 |
+-- |
| 62 |
+2.24.1 |
| 63 |
+ |
| 64 |
|
| 65 |
diff --git a/dev-haskell/tasty/tasty-0.11.0.4.ebuild b/dev-haskell/tasty/tasty-0.11.0.4.ebuild |
| 66 |
index 9c138e80dd2..4de53058744 100644 |
| 67 |
--- a/dev-haskell/tasty/tasty-0.11.0.4.ebuild |
| 68 |
+++ b/dev-haskell/tasty/tasty-0.11.0.4.ebuild |
| 69 |
@@ -17,6 +17,8 @@ SLOT="0/${PV}" |
| 70 |
KEYWORDS="amd64 x86" |
| 71 |
IUSE="" |
| 72 |
|
| 73 |
+PATCHES=("${FILESDIR}"/${P}-unbounded-delays.patch) |
| 74 |
+ |
| 75 |
RDEPEND=">=dev-haskell/ansi-terminal-0.6.2:=[profile?] |
| 76 |
>=dev-haskell/async-2.0:=[profile?] |
| 77 |
>=dev-haskell/clock-0.4.4.0:=[profile?] |
Archives