From 871b2b573f01c1b3176a0f65458b3d281b41c437 Mon Sep 17 00:00:00 2001 From: davidovski Date: Tue, 31 May 2022 11:04:17 +0100 Subject: added pandoc and qt5 --- .../tests-use-iterable-from-collections-abc.patch | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 skip/ghc/tests-use-iterable-from-collections-abc.patch (limited to 'skip/ghc/tests-use-iterable-from-collections-abc.patch') diff --git a/skip/ghc/tests-use-iterable-from-collections-abc.patch b/skip/ghc/tests-use-iterable-from-collections-abc.patch new file mode 100644 index 0000000..cf77555 --- /dev/null +++ b/skip/ghc/tests-use-iterable-from-collections-abc.patch @@ -0,0 +1,23 @@ +Iterable has been moved to collections.abc +diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py +index e899d61b..2f967666 100644 +--- a/testsuite/driver/testlib.py ++++ b/testsuite/driver/testlib.py +@@ -15,7 +15,7 @@ import glob + import sys + from math import ceil, trunc + from pathlib import Path, PurePath +-import collections ++import collections.abc + import subprocess + + from testglobals import config, ghc_env, default_testopts, brokens, t, \ +@@ -809,7 +809,7 @@ def join_normalisers(*a): + Taken from http://stackoverflow.com/a/2158532/946226 + """ + for el in l: +- if (isinstance(el, collections.Iterable) ++ if (isinstance(el, collections.abc.Iterable) + and not isinstance(el, (bytes, str))): + for sub in flatten(el): + yield sub -- cgit v1.2.1