Alyssa Ross a838aa244f Merge remote-tracking branch 'origin/master' into staging-next ... The hash for pytensor is not correct, but that's also the case in master, so a merge commit isn't the place to fix it. Conflicts: pkgs/development/python-modules/faadelays/default.nix pkgs/development/python-modules/pytensor/default.nix pkgs/tools/admin/rset/default.nix		2023-10-05 08:02:48 +00:00
..
quartz-wm	quartz-wm: --enable-xplugin-dock-support	2022-12-21 22:39:49 +00:00
xorg	Merge master into staging-next	2023-10-04 06:00:56 +00:00
xquartz	treewide: remove cstrahan from meta.maintainers - part 1	2023-10-04 22:20:58 -03:00