guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch core-updates updated: gnu: ghc-9.0: Make testsuite compatible wit


From: guix-commits
Subject: branch core-updates updated: gnu: ghc-9.0: Make testsuite compatible with Python 3.10.
Date: Fri, 21 Apr 2023 14:29:00 -0400

This is an automated email from the git hooks/post-receive script.

lbraun pushed a commit to branch core-updates
in repository guix.

The following commit(s) were added to refs/heads/core-updates by this push:
     new dc9c09023a gnu: ghc-9.0: Make testsuite compatible with Python 3.10.
dc9c09023a is described below

commit dc9c09023a5258de035424169b8e804acfd38cb2
Author: Lars-Dominik Braun <lars@6xq.net>
AuthorDate: Fri Apr 21 20:25:33 2023 +0200

    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(-)

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 @@ interactive environment for the functional language 
Haskell.")
                   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)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]