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
..
drivers	treewide: remove cstrahan from meta.maintainers - part 1	2023-10-04 22:20:58 -03:00
0001-TargetConditionals.patch	cups: Include TargetConditionals.h on Darwin	2021-11-24 15:17:13 -08:00
cups-pk-helper.nix
default.nix	cups: 2.4.6 -> 2.4.7	2023-09-20 21:00:09 +00:00
filters.nix	cups-filters: 1.28.15 -> 1.28.17	2023-05-26 21:58:03 +03:00