Merge master into staging-next

This commit is contained in:
github-actions[bot]
2023-10-18 12:01:25 +00:00
committed by GitHub
44 changed files with 2774 additions and 771 deletions
@@ -327,7 +327,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
'' + optionalString mimetypesSupport ''
substituteInPlace Lib/mimetypes.py \
--replace "@mime-types@" "${mailcap}"
'' + optionalString (x11Support && (tix != null)) ''
'' + optionalString (pythonOlder "3.13" && x11Support && (tix != null)) ''
substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
'';