John Ericson a3e54cb582 Merge remote-tracking branch 'upstream/staging-next' into staging		2021-05-06 15:48:25 -04:00
..
config	Merge pull request #101071 from ju1m/apparmor	2021-04-24 11:24:26 +00:00
hardware	Merge pull request #119706 from nyanotech/master	2021-04-24 03:49:09 +02:00
i18n/input-method	input methods: add kime	2021-04-19 03:05:07 +09:00
installer	iso-image: Hide rEFInd from menu in known non-working situations	2021-05-01 19:53:14 -04:00
misc	nixos/misc/ids: reclaim uid for disnix	2021-03-28 21:40:44 +02:00
profiles	nixos/apparmor: disable killUnconfinedConfinables by default	2021-04-23 07:20:20 +02:00
programs	Merge pull request #120800 from MetaDark/undistract-me	2021-05-03 20:22:04 +01:00
security	nixos/apparmor: disable killUnconfinedConfinables by default	2021-04-23 07:20:20 +02:00
services	Merge remote-tracking branch 'upstream/staging-next' into staging	2021-05-06 15:48:25 -04:00
system	Merge pull request #114637 from KaiHa/pr/fix-systemd-boot-builder	2021-04-25 11:35:00 +01:00
tasks	Revert "Revert "apparmor: fix and improve the service""	2021-04-23 07:17:55 +02:00
testing	treewide: use perl.withPackages when possible	2021-03-31 21:35:37 +02:00
virtualisation	Merge staging-next into staging	2021-05-04 06:20:26 +00:00
module-list.nix	Merge staging-next into staging	2021-05-04 00:49:43 +00:00
rename.nix	quagga: remove	2021-04-22 12:48:48 +02:00