Jan Tojnar 01a4d350c7 Merge branch 'master' into staging-next ... Reverted https://github.com/NixOS/nixpkgs/pull/115228 for kodi to avoid conflict. It does not look like unzip would be used but not investigating now to speed up merge conflict resolution.		2021-03-13 19:16:43 +01:00
..
config	Merge pull request #113804 from rnhmjoj/no-udev-settle-2	2021-02-22 23:22:04 +01:00
hardware	nixos/ksm: remove udev-settle dependency	2021-02-26 22:10:10 +01:00
i18n/input-method
installer
misc
profiles
programs	Merge pull request #113714 from ilian/steam-firewall	2021-03-07 14:22:16 +01:00
security	Merge pull request #111635 from xaverdh/hide-pid-broken	2021-02-23 00:20:29 +01:00
services	Merge branch 'master' into staging-next	2021-03-13 19:16:43 +01:00
system	Merge pull request #90065 from wizeman/u/fix-config-merge	2021-03-08 21:34:59 +01:00
tasks
testing
virtualisation	Merge pull request #112332 from urbas/amazon-init-options	2021-03-07 18:39:05 +01:00
module-list.nix	Merge pull request #93629 from ju1m/croc	2021-03-12 20:34:33 -05:00
rename.nix