Alyssa Ross 97fc6f36d0
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/by-name/ez/eza/package.nix
	pkgs/by-name/re/rewatch/package.nix
	pkgs/by-name/rq/rqbit/package.nix
	pkgs/development/python-modules/diffusers/default.nix
	pkgs/development/python-modules/manga-ocr/default.nix
	pkgs/development/tools/misc/texlab/default.nix
2025-01-30 15:02:26 +01:00
..