Alyssa Ross 926765c5e3 Merge remote-tracking branch 'nixpkgs/staging-next' into staging ... Conflicts: pkgs/servers/http/apache-httpd/2.4.nix		2021-06-11 02:05:00 +00:00
..
config	nixos/*: replace alsa* aliases	2021-06-10 09:46:55 +02:00
hardware	nixos/nvidia: fix hardware.nvidia.package example	2021-06-08 19:40:27 -07:00
i18n/input-method	nixos/fcitx5: autostart with xserver	2021-06-05 09:22:58 +08:00
installer	iso-image: Improve disk detection	2021-05-22 20:04:05 -07:00
misc	nixos/gale: remove	2021-06-10 02:33:10 +02:00
profiles	Merge pull request #85073 from hyperfekt/systemd-pstore	2021-05-17 00:00:52 +02:00
programs	nixos/gamemode: add module	2021-06-01 21:03:34 -04:00
security	nixos/pam_mount: add support for FUSE-filesystems (#126069)	2021-06-08 22:06:28 +02:00
services	Merge remote-tracking branch 'nixpkgs/staging-next' into staging	2021-06-11 02:05:00 +00:00
system	nixos/luksroot: add bypassWorkqueues (#118114)	2021-05-26 09:43:38 -04:00
tasks	nixos/filesystems: condition mount-pstore.service on unmounted /sys/fs/pstore	2021-05-21 17:49:23 +02:00
testing	treewide: use perl.withPackages when possible	2021-03-31 21:35:37 +02:00
virtualisation	nixos/libvirtd: add assertion requiring polkit to be enabled	2021-06-07 15:12:21 +02:00
module-list.nix	Merge branch 'staging-next' into staging	2021-06-10 14:07:45 +02:00
rename.nix	quagga: remove	2021-04-22 12:48:48 +02:00