Unverified Commit d12a5a36 authored Apr 08, 2026 by Paul Haerle Committed by GitHub Apr 08, 2026

nixos/{stage-1,journald}: move option renames to defining modules (#507667)

parents 8824e633 9c32386c

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -786,6 +786,5 @@ in
		};

		imports = [
		(mkRenamedOptionModule [ "boot" "initrd" "mdadmConf" ] [ "boot" "swraid" "mdadmConf" ])
		];
		}

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

+7 −0

Original line number	Diff line number	Diff line
		@@ -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

+0 −4

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

		options = {

nixos/modules/tasks/swraid.nix

+1 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ in
		[ "boot" "initrd" "services" "swraid" "mdadmConf" ]
		[ "boot" "swraid" "mdadmConf" ]
		)
		(lib.mkRenamedOptionModule [ "boot" "initrd" "mdadmConf" ] [ "boot" "swraid" "mdadmConf" ])
		];

		options.boot.swraid = {