Merge master into staging-nixos (a4dc2309) · Commits · nix / nixpkgs

maintainers/maintainer-list.nix

+5 −0

Original line number	Diff line number	Diff line
		@@ -16024,6 +16024,11 @@
		githubId = 401263;
		keys = [ { fingerprint = "1147 43F1 E707 6F3E 6F4B 2C96 B9A8 B592 F126 F8E8"; } ];
		};
		macbucheron = {
		name = "Nathan Deprat";
		github = "Macbucheron1";
		githubId = 95475157;
		};
		macronova = {
		name = "Sicheng Pan";
		email = "trivial@invariantspace.com";

nixos/modules/hardware/video/nvidia.nix

+28 −2

Original line number	Diff line number	Diff line
		@@ -93,6 +93,20 @@ in
		the NVIDIA docs, on Chapter 22. PCI-Express Runtime D3 (RTD3) Power Management
		'';

		powerManagement.kernelSuspendNotifier =
		lib.mkEnableOption ''
		NVIDIA driver support for kernel suspend notifiers, which allows the driver
		to be notified of suspend and resume events by the kernel, rather than
		relying on systemd services.
		Requires NVIDIA driver version 595 or newer, and the open source kernel modules.
		''
		// {
		default = useOpenModules && lib.versionAtLeast nvidia_x11.version "595";
		defaultText = lib.literalExpression ''
		config.hardware.nvidia.open == true && lib.versionAtLeast config.hardware.nvidia.package.version "595"
		'';
		};

		dynamicBoost.enable = lib.mkEnableOption ''
		dynamic Boost balances power between the CPU and the GPU for improved
		performance on supported laptops using the nvidia-powerd daemon. For more
		@@ -465,6 +479,13 @@ in
		assertion = cfg.dynamicBoost.enable -> lib.versionAtLeast nvidia_x11.version "510.39.01";
		message = "NVIDIA's Dynamic Boost feature only exists on versions >= 510.39.01";
		}

		{
		assertion =
		cfg.powerManagement.kernelSuspendNotifier
		-> (useOpenModules && lib.versionAtLeast nvidia_x11.version "595");
		message = "NVIDIA driver support for kernel suspend notifiers requires NVIDIA driver version 595 or newer, and the open source kernel modules.";
		}
		];

		# If Optimus/PRIME is enabled, we:
		@@ -576,7 +597,9 @@ in
		''
		);

		systemd.packages = lib.optional cfg.powerManagement.enable nvidia_x11.out;
		systemd.packages = lib.optional (
		cfg.powerManagement.enable && !cfg.powerManagement.kernelSuspendNotifier
		) nvidia_x11.out;

		systemd.services =
		let
		@@ -592,7 +615,7 @@ in
		};
		in
		lib.mkMerge [
		(lib.mkIf cfg.powerManagement.enable {
		(lib.mkIf (cfg.powerManagement.enable && !cfg.powerManagement.kernelSuspendNotifier) {
		nvidia-suspend = nvidiaService "suspend";
		nvidia-hibernate = nvidiaService "hibernate";
		nvidia-resume = (nvidiaService "resume") // {
		@@ -669,6 +692,9 @@ in
		++ lib.optional (
		(offloadCfg.enable \|\| cfg.modesetting.enable) && lib.versionAtLeast nvidia_x11.version "545"
		) "nvidia-drm.fbdev=1"
		++ lib.optional (
		cfg.powerManagement.enable && cfg.powerManagement.kernelSuspendNotifier
		) "nvidia.NVreg_UseKernelSuspendNotifiers=1"
		++ lib.optional cfg.powerManagement.enable "nvidia.NVreg_PreserveVideoMemoryAllocations=1"
		++ lib.optional useOpenModules "nvidia.NVreg_OpenRmEnableUnsupportedGpus=1"
		++ lib.optional (config.boot.kernelPackages.kernel.kernelAtLeast "6.2" && !ibtSupport) "ibt=off";

nixos/modules/services/development/zammad.nix

+2 −0

Original line number	Diff line number	Diff line
		@@ -279,6 +279,7 @@ in
		locations = {
		"/" = {
		proxyPass = "http://127.0.0.1:${toString config.services.zammad.port}";
		recommendedProxySettings = true;
		root = "${config.services.zammad.package}/public/";
		extraConfig = # nginx
		''
		@@ -422,5 +423,6 @@ in
		meta.maintainers = with lib.maintainers; [
		taeer
		netali
		meenzen
		];
		}

nixos/modules/services/mail/tlsrpt.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -244,12 +244,12 @@ in
		type = with types; nullOr str;
		default =
		if config.services.postfix.enable && config.services.postfix.setSendmail then
		"/run/wrappers/bin/sendmail -i -t"
		"/run/wrappers/bin/sendmail -i -t -f ${cfg.reportd.settings.sender_address}"
		else
		null;
		defaultText = lib.literalExpression ''
		if config.services.postfix.enable && config.services.postfix.setSendmail then
		"/run/wrappers/bin/sendmail -i -t"
		"/run/wrappers/bin/sendmail -i -t -f $${cfg.reportd.settings.sender_address}"
		else
		null
		'';

nixos/modules/services/networking/prosody.nix

+9 −2

Original line number	Diff line number	Diff line
		@@ -8,6 +8,13 @@
		with lib;
		let
		cfg = config.services.prosody;
		communityModulesToEnable =
		let
		componentSpecificModules = [ "muc_notifications" ];
		in
		lib.concatMap (
		mod: lib.optional (!(lib.elem mod componentSpecificModules)) "${toLua mod};"
		) cfg.package.communityModules;

		sslOpts = _: {
		options = {
		@@ -546,7 +553,7 @@ let
		${lib.concatStringsSep "\n " (
		lib.mapAttrsToList (name: val: optionalString val "${toLua name};") cfg.modules
		)}
		${lib.concatStringsSep "\n" (map (x: "${toLua x};") cfg.package.communityModules)}
		${lib.concatStringsSep "\n" communityModulesToEnable}
		${lib.concatStringsSep "\n" (map (x: "${toLua x};") cfg.extraModules)}
		};

		@@ -577,7 +584,7 @@ let

		${lib.concatMapStrings (muc: ''
		Component ${toLua muc.domain} "muc"
		modules_enabled = {${optionalString cfg.modules.mam ''"muc_mam",''}${optionalString muc.allowners_muc ''"muc_allowners",''}${optionalString muc.moderation ''"muc_moderation",''} }
		modules_enabled = {${optionalString cfg.modules.mam ''"muc_mam",''}${optionalString muc.allowners_muc ''"muc_allowners",''}${optionalString muc.moderation ''"muc_moderation",''}${optionalString (lib.elem "muc_notifications" cfg.package.communityModules) ''"muc_notifications",''} }
		name = ${toLua muc.name}
		restrict_room_creation = ${toLua muc.restrictRoomCreation}
		max_history_messages = ${toLua muc.maxHistoryMessages}