Merge master into staging-next (3dddb78e) · Commits · nix / nixpkgs

maintainers/maintainer-list.nix

+6 −0

Original line number	Diff line number	Diff line
		@@ -21571,6 +21571,12 @@
		github = "i-am-logger";
		githubId = 1440852;
		};
		rebmit = {
		name = "Lu Wang";
		email = "rebmit@rebmit.moe";
		github = "rebmit";
		githubId = 188659765;
		};
		reckenrode = {
		name = "Randy Eckenrode";
		email = "randy@largeandhighquality.com";

+2 −2

Original line number	Diff line number	Diff line
		@@ -268,8 +268,8 @@ in
		message = "You cannot use both services.ddclient.passwordFile and services.ddclient.secretsFile at the same time.";
		}
		{
		assertion = !(cfg.protocol == "nsupdate") \|\| (cfg.passwordFile == null && cfg.secretsFile == null);
		message = "You cannot use services.ddclient.passwordFile and or services.ddclient.secretsFile when services.ddclient.protocol is \"nsupdate\".";
		assertion = (cfg.protocol != "nsupdate") \|\| (cfg.secretsFile == null);
		message = "You cannot use services.ddclient.secretsFile when services.ddclient.protocol is \"nsupdate\". Use services.ddclient.passwordFile instead.";
		}
		];

+16 −4

Original line number	Diff line number	Diff line
		@@ -178,8 +178,20 @@ let
		in

		{
		options.boot.bcachefs.package = lib.mkPackageOption pkgs "bcachefs-tools" { } // {
		description = "Configured Bcachefs userspace package.";
		options.boot.bcachefs = {
		package = lib.mkPackageOption pkgs "bcachefs-tools" {
		extraDescription = ''
		This package should also provide a passthru 'kernelModule'
		attribute to build the out-of-tree kernel module.
		'';
		};

		modulePackage = lib.mkOption {
		type = lib.types.package;
		# See NOTE in linux-kernels.nix
		default = config.boot.kernelPackages.callPackage cfg.package.kernelModule { };
		internal = true;
		};
		};

		options.services.bcachefs.autoScrub = {
		@@ -245,8 +257,8 @@ in
		system.fsPackages = [ cfg.package ];
		services.udev.packages = [ cfg.package ];

		boot.extraModulePackages = lib.optionals (!config.boot.kernelPackages.bcachefs.meta.broken) [
		config.boot.kernelPackages.bcachefs
		boot.extraModulePackages = lib.optionals (!cfg.modulePackage.meta.broken) [
		cfg.modulePackage
		];

		systemd = {

+7 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,9 @@
		aixlog,
		popl,
		pulseaudioSupport ? false,
		pipewireSupport ? stdenv.hostPlatform.isLinux,
		libpulseaudio,
		pipewire,
		nixosTests,
		openssl,
		}:
		@@ -54,11 +56,15 @@ stdenv.mkDerivation rec {
		openssl
		]
		++ lib.optional pulseaudioSupport libpulseaudio
		++ lib.optional pipewireSupport pipewire
		++ lib.optional stdenv.hostPlatform.isLinux alsa-lib;

		TARGET = lib.optionalString stdenv.hostPlatform.isDarwin "MACOS";

		cmakeFlags = [ (lib.cmakeBool "BUILD_WITH_PULSE" pulseaudioSupport) ];
		cmakeFlags = [
		(lib.cmakeBool "BUILD_WITH_PULSE" pulseaudioSupport)
		(lib.cmakeBool "BUILD_WITH_PIPEWIRE" pipewireSupport)
		];

		# Upstream systemd unit files are pretty awful, so we provide our own in a
		# NixOS module. It might make sense to get that upstreamed...

+1 −1