Alyssa Ross b898e958da Merge remote-tracking branch 'nixpkgs/master' into staging-next ... Conflicts: pkgs/os-specific/linux/libfabric/default.nix pkgs/tools/filesystems/btrfs-progs/default.nix		2021-09-22 10:07:27 +00:00
..
config	Merge pull request #125966 from ju1m/apparmor	2021-09-21 22:10:10 +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/tpm2: remove tss static gid	2021-09-20 16:24:33 +00:00
profiles	NixOS AWS AMI: enable the serial console on ttyS0	2021-08-20 12:42:02 -04:00
programs	Merge pull request #135284 from legendofmiracles/weylus	2021-09-21 22:04:38 +02:00
security	Merge pull request #138600 from austinbutler/tpm2-tss-group	2021-09-20 18:34:39 +02:00
services	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2021-09-22 10:07:27 +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	nixos/vmware-guest: fix setuid wrapper	2021-09-20 23:49:46 +02:00
module-list.nix	Merge pull request #135284 from legendofmiracles/weylus	2021-09-21 22:04:38 +02:00
rename.nix	treewide: yank wicd as it is abandoned	2021-09-11 23:46:52 +02:00