Merge master into staging-next
commite21fb16f9a9073f6eba5e250ad13d94eca968df2
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Sat, 8 May 2021 06:20:05 +0000 (8 06:20 +0000)
committerGitHub <noreply@github.com>
Sat, 8 May 2021 06:20:05 +0000 (8 06:20 +0000)
tree1619ab18b58eb9028a31128147377e9073b9cb3c
parent01bf14784925e99944d198154007489a823ddfb3
parent2af2325cf7ff4ca1ee53d5ab4068172a0b6066f2
Merge master into staging-next
pkgs/misc/vim-plugins/overrides.nix
pkgs/os-specific/linux/apparmor/default.nix
pkgs/os-specific/linux/systemd/default.nix