From dc9c09023a5258de035424169b8e804acfd38cb2 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Fri, 21 Apr 2023 20:25:33 +0200 Subject: gnu: ghc-9.0: Make testsuite compatible with Python 3.10. * gnu/packages/haskell.scm (ghc-9.0)[native-inputs]: Add patch and snippet to ghc-testsuite input. --- gnu/packages/haskell.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu/packages/haskell.scm') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 1d8b05bc8a..5f2e36b9ba 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1294,7 +1294,14 @@ (define-public ghc-9.0 version "/ghc-" version "-testsuite.tar.xz")) (sha256 (base32 - "1m5fzhr4gjn9ni8gxx7ag3fkbw1rspjzgv39mnfb0nkm5mw70v3s")))) + "1m5fzhr4gjn9ni8gxx7ag3fkbw1rspjzgv39mnfb0nkm5mw70v3s")) + (patches (search-patches "ghc-9.2-grep-warnings.patch")) + (modules '((guix build utils))) + (snippet + ;; collections.Iterable was moved to collections.abc in Python 3.10. + '(substitute* "testsuite/driver/testlib.py" + (("collections\\.Iterable") + "collections.abc.Iterable"))))) ,@(filter (match-lambda (("ghc-bootstrap" . _) #f) (("ghc-testsuite" . _) #f) -- cgit v1.2.3