Jonathan Ringer 09e494f4c2 Merge remote-tracking branch 'origin/master' into staging-next ... Conflicts: pkgs/applications/window-managers/sway/default.nix		2021-11-21 14:40:40 -08:00
..
config	nixos/swap: remove fallocate and use dd as the main swap creation method	2021-11-13 17:49:42 +02:00
hardware	treewide: refactor isi686 && isx86_64 -> isx86	2021-11-20 17:50:41 -08:00
i18n/input-method	nixos/doc: clean up defaults and examples	2021-10-04 12:47:20 +02:00
installer	treewide: refactor isi686 && isx86_64 -> isx86	2021-11-20 17:50:41 -08:00
misc	Merge pull request #146344 from SuperSandro2000/locate-prune-names	2021-11-18 21:02:37 +01:00
profiles	Merge pull request #146288 from Artturin/mtoolsandsuch	2021-11-19 00:21:08 +02:00
programs	Merge pull request #122995 from primeos/sway-install-default-wallpaper	2021-11-21 21:57:49 +01:00
security	nixos/pam: avoid extra lines in pam files	2021-11-16 19:26:43 +13:00
services	Merge pull request #137176 from GoldsteinE/clickhouse-package	2021-11-21 21:43:58 +01:00
system	Merge master into staging-next	2021-11-21 18:01:07 +00:00
tasks	Merge pull request #146709 from Artturin/underscorename	2021-11-21 03:12:31 +02:00
testing	nixos/lib/qemu-flags: rename to qemu-common	2021-09-18 16:58:16 +02:00
virtualisation	Merge pull request #146804 from Artturin/qemudefaultmem	2021-11-21 17:48:08 +02:00
module-list.nix	Merge pull request #145035 from pmeiyu/master	2021-11-19 17:05:50 +01:00
rename.nix	Merge pull request #140820 from VergeDX/kippo-remove	2021-10-11 17:19:11 +08:00