Alyssa Ross e2bb7997c4 Merge remote-tracking branch 'nixpkgs/master' into staging-next ... Conflicts: nixos/doc/manual/release-notes/rl-2111.section.md		2021-09-19 17:08:00 +00:00
..
config	Merge pull request #138207 from rnhmjoj/layouts	2021-09-19 01:10:55 +02:00
hardware	nixos/nvidia: remove extra space	2021-09-01 08:57:33 -04:00
i18n/input-method	nixos/fcitx5: autostart with xserver	2021-06-05 09:22:58 +08:00
installer	Merge master into staging-next	2021-09-14 18:01:05 +00:00
misc	nixos/nntp-proxy: define group, fix after #133166	2021-09-18 14:42:08 +02:00
profiles	NixOS AWS AMI: enable the serial console on ttyS0	2021-08-20 12:42:02 -04:00
programs	Merge pull request #138428 from bobby285271/pantheon-tweaks	2021-09-19 02:47:37 +02:00
security	Merge pull request #126289 from rnhmjoj/wrappers	2021-09-18 15:28:49 +00:00
services	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2021-09-19 17:08:00 +00:00
system	Merge pull request #113241 from chkno/user-activation-scripts	2021-09-18 05:25:06 +03:00
tasks	nixos: explicitely set security.wrappers ownership	2021-09-13 13:48:13 +02:00
testing	treewide: use perl.withPackages when possible	2021-03-31 21:35:37 +02:00
virtualisation	vmware-guest: Use vmware-vmblock-fuse for drag-and-drop synchronization (#131278)	2021-09-19 18:15:41 +03:00
module-list.nix	Merge pull request #132319 from onny/opensnitch	2021-09-19 11:31:21 -04:00
rename.nix	treewide: yank wicd as it is abandoned	2021-09-11 23:46:52 +02:00