Dmitry Kalinkin ac40a963c9 Merge branch 'master' into staging-next ... Conflicts: pkgs/applications/editors/vim/common.nix pkgs/development/python-modules/jellyfin-apiclient-python/default.nix pkgs/development/python-modules/pymavlink/default.nix		2021-12-20 12:09:28 -05:00
..
drivers	Merge pull request #151200 from Enzime/add/spotify-tray	2021-12-20 00:06:02 +01: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: Only apply patch for appropriate version	2021-11-24 15:17:13 -08:00
filters.nix