Merge master into staging-next

2021-05-08 06:20:05 +00:00
parent 01bf147849 2af2325cf7
commit e21fb16f9a
26 changed files with 442 additions and 317 deletions
@@ -1,7 +1,7 @@
 { pkgs, lib, ... }:

 {
-  config = lib.mkIf (lib.any (lib.meta.platformMatch pkgs.stdenv.hostPlatform) pkgs.kexectools.meta.platforms) {
+  config = lib.mkIf (lib.meta.availableOn pkgs.stdenv.hostPlatform pkgs.kexectools) {
    environment.systemPackages = [ pkgs.kexectools ];

    systemd.services.prepare-kexec =