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
..
applications	Merge branch 'master' into staging-next	2021-12-20 12:09:28 -05:00
build-support	Merge branch 'master' into staging-next	2021-12-20 12:09:28 -05:00
common-updater
data	Merge master into staging-next	2021-12-19 06:01:16 +00:00
desktops	Merge pull request #150382 from r-ryantm/auto-update/xreader	2021-12-20 03:18:55 +01:00
development	Merge branch 'master' into staging-next	2021-12-20 12:09:28 -05:00
games	Merge branch 'master' into staging-next	2021-12-20 12:09:28 -05:00
misc	Merge branch 'master' into staging-next	2021-12-20 12:09:28 -05:00
os-specific	Merge branch 'master' into staging-next	2021-12-20 12:09:28 -05:00
pkgs-lib
servers	Merge branch 'master' into staging-next	2021-12-20 12:09:28 -05:00
shells
stdenv
test
tools	Merge branch 'master' into staging-next	2021-12-20 12:09:28 -05:00
top-level	Merge branch 'master' into staging-next	2021-12-20 12:09:28 -05:00