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

maintainers/maintainer-list.nix

+5 −0

Original line number	Diff line number	Diff line
		@@ -7215,6 +7215,11 @@
		name = "Tom van Dijk";
		keys = [ { fingerprint = "D044 F07B 8863 B681 26BD 79FE 7A98 4C82 07AD BA51"; } ];
		};
		dtvillafana = {
		github = "dtvillafana";
		githubId = 82293276;
		name = "David Villafaña";
		};
		dudeofawesome = {
		email = "tourist-04.iced@icloud.com";
		github = "dudeofawesome";

+10 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,16 @@ in
		'';

		default = { };
		example = {
		charger = {
		governor = "performance";
		turbo = "auto";
		};
		battery = {
		governor = "powersave";
		turbo = "never";
		};
		};
		type = lib.types.submodule { freeformType = format.type; };
		};
		};

+7 −1

Original line number	Diff line number	Diff line
		@@ -10,6 +10,10 @@ let
		localDB = cfg.database.host == "localhost";
		user = cfg.database.username;
		phpWithPspell = pkgs.php83.withExtensions ({ enabled, all }: [ all.pspell ] ++ enabled);

		env = {
		ASPELL_CONF = "dict-dir ${pkgs.aspellWithDicts (_: cfg.dicts)}/lib/aspell";
		};
		in
		{
		options.services.roundcube = {
		@@ -263,7 +267,7 @@ in
		"catch_workers_output" = true;
		};
		phpPackage = phpWithPspell;
		phpEnv.ASPELL_CONF = "dict-dir ${pkgs.aspellWithDicts (_: cfg.dicts)}/lib/aspell";
		phpEnv = env;
		};
		systemd.services.phpfpm-roundcube.after = [ "roundcube-setup.service" ];

		@@ -282,6 +286,8 @@ in
		after = [ "network-online.target" ];
		wantedBy = [ "multi-user.target" ];

		environment = env;

		path = [
		(if localDB then config.services.postgresql.package else pkgs.postgresql)
		];

+1 −1

Original line number	Diff line number	Diff line
		@@ -73,7 +73,7 @@
		services.caddy = {
		package = pkgs.caddy.withPlugins {
		plugins = [ "github.com/caddyserver/replace-response@v0.0.0-20241211194404-3865845790a7" ];
		hash = "sha256-RrB0/qXL0mCvkxKaz8zhj5GWKEtOqItXP2ASYz7VdMU=";
		hash = "sha256-P6rYPJeJcKZgH/d29YQrPf68uWWuav2tQq/2+sVT3tg=";
		};
		configFile = pkgs.writeText "Caddyfile" ''
		{

+1 −1

Original line number	Diff line number	Diff line
		@@ -57,7 +57,7 @@
		# Still on main page
		machine.succeed("xdotool mousemove 500 740 click 1")
		machine.sleep(2)
		machine.wait_for_text(r"(Date\|Monday\|Tuesday\|Wednesday\|Thursday\|Friday\|Saturday\|Sunday\|All day\|Name\|Details\|More)")
		machine.wait_for_text(r"(Date\|January\|February\|March\|April\|May\|June\|July\|August\|September\|October\|November\|December\|Monday\|Tuesday\|Wednesday\|Thursday\|Friday\|Saturday\|Sunday\|All day\|Name\|Details\|More)")
		machine.screenshot("lomiri-calendar_newevent")

		# On New Event page