Merge staging-next into staging

Author: nixpkgs-ci[bot]

nixos/modules/hardware/video/nvidia.nix

@@ -329,13 +329,9 @@ in
           '';
         };
 
-      videoAcceleration =
-        (lib.mkEnableOption ''
-          Whether video acceleration (VA-API) should be enabled.
-        '')
-        // {
-          default = true;
-        };
+      videoAcceleration = lib.mkEnableOption "video acceleration (VA-API)" // {
+        default = true;
+      };
     };
   };
 

nixos/modules/system/boot/stage-1.nix

@@ -786,6 +786,5 @@ in
   };
 
   imports = [
-    (mkRenamedOptionModule [ "boot" "initrd" "mdadmConf" ] [ "boot" "swraid" "mdadmConf" ])
   ];
 }

nixos/modules/system/boot/systemd/journald-gateway.nix

@@ -21,6 +21,13 @@ let
   };
 in
 {
+  imports = [
+    (lib.mkRenamedOptionModule
+      [ "services" "journald" "enableHttpGateway" ]
+      [ "services" "journald" "gateway" "enable" ]
+    )
+  ];
+
   meta.maintainers = [ lib.maintainers.raitobezarius ];
   options.services.journald.gateway = {
     enable = lib.mkEnableOption "the HTTP gateway to the journal";

nixos/modules/system/boot/systemd/journald.nix

@@ -10,10 +10,6 @@ let
 in
 {
   imports = [
-    (lib.mkRenamedOptionModule
-      [ "services" "journald" "enableHttpGateway" ]
-      [ "services" "journald" "gateway" "enable" ]
-    )
   ];
 
   options = {

nixos/modules/tasks/swraid.nix

@@ -26,6 +26,7 @@ in
       [ "boot" "initrd" "services" "swraid" "mdadmConf" ]
       [ "boot" "swraid" "mdadmConf" ]
     )
+    (lib.mkRenamedOptionModule [ "boot" "initrd" "mdadmConf" ] [ "boot" "swraid" "mdadmConf" ])
   ];
 
   options.boot.swraid = {