Merge master into staging-next (9fb545e5) · Commits · nix / nixpkgs

lib/modules.nix

+3 −0

Original line number	Diff line number	Diff line
		@@ -1147,6 +1147,9 @@ let
		instead of:

		baseType // { check = value: /* your check */; }

		Alternatively, this message may also occur as false positive when mixing Nixpkgs
		versions, if one Nixpkgs is between 83fed2e6..58696117 (Aug 28 - Oct 28 2025)
		'';

		# Merge definitions of a value of a given type.

+6 −0

Original line number	Diff line number	Diff line
		@@ -23255,6 +23255,12 @@
		github = "scd31";
		githubId = 57571338;
		};
		SchahinRohani = {
		email = "schahin@rouhanizadeh.de";
		github = "SchahinRohani";
		githubId = 24507823;
		name = "Schahin Rouhanizadeh";
		};
		schinmai-akamai = {
		email = "schinmai@akamai.com";
		github = "tchinmai7";

+1 −0

Original line number	Diff line number	Diff line
		@@ -126,6 +126,7 @@ let
		with config.boot;
		[
		kernelPackages.kernel
		(lib.getOutput "modules" kernelPackages.kernel)
		kernelPackages.${pkgs.zfs.kernelModuleAttribute}
		]
		);

+1 −0

Original line number	Diff line number	Diff line
		@@ -114,6 +114,7 @@ let
		with config.boot;
		[
		kernelPackages.kernel
		(lib.getOutput "modules" kernelPackages.kernel)
		kernelPackages.${pkgs.zfs.kernelModuleAttribute}
		]
		);

+7 −0

Original line number	Diff line number	Diff line
		@@ -57,6 +57,12 @@ in
		'';
		};

		virtualisation.googleComputeImage.buildMemSize = mkOption {
		type = types.int;
		default = 1024;
		description = "Memory size (in MiB) for the temporary VM used to build the image.";
		};

		virtualisation.googleComputeImage.contents = mkOption {
		type = with types; listOf attrs;
		default = [ ];
		@@ -129,6 +135,7 @@ in
		inherit (cfg) contents;
		partitionTableType = if cfg.efi then "efi" else "legacy";
		inherit (config.virtualisation) diskSize;
		memSize = cfg.buildMemSize;
		inherit config lib pkgs;
		};