Merge master into staging-next

2023-07-10 00:02:30 +00:00
parent a61c7c58e4 d705d71c03
commit 09bdd38107
46 changed files with 382 additions and 284 deletions
@@ -3,6 +3,7 @@
 , fetchPypi
 , writeText
 , buildPythonPackage
+, isPyPy
 , pythonOlder

 # https://github.com/matplotlib/matplotlib/blob/main/doc/devel/dependencies.rst
@@ -40,7 +41,8 @@
 , pygobject3

 # Tk
-, enableTk ? !stdenv.isDarwin # darwin has its own "MacOSX" backend
+# Darwin has its own "MacOSX" backend, PyPy has tkagg backend and does not support tkinter
+, enableTk ? (!stdenv.isDarwin && !isPyPy)
 , tcl
 , tk
 , tkinter