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

maintainers/maintainer-list.nix

+19 −0

Original line number	Diff line number	Diff line
		@@ -3536,6 +3536,12 @@
		github = "scaredmushroom";
		githubId = 45340040;
		};
		caperren = {
		name = "Corwin Perren";
		email = "caperren@gmail.com";
		github = "caperren";
		githubId = 4566591;
		};
		CaptainJawZ = {
		email = "CaptainJawZ@outlook.com";
		name = "Danilo Reyes";
		@@ -4763,6 +4769,12 @@
		githubId = 743057;
		name = "Danylo Hlynskyi";
		};
		danbulant = {
		name = "Daniel Bulant";
		email = "danbulant@gmail.com";
		github = "danbulant";
		githubId = 30036876;
		};
		danc86 = {
		name = "Dan Callaghan";
		email = "djc@djc.id.au";
		@@ -18765,6 +18777,13 @@
		githubId = 521306;
		name = "Rob Glossop";
		};
		robinkrahl = {
		email = "nix@ireas.org";
		github = "robinkrahl";
		githubId = 165115;
		keys = [ { fingerprint = "EC7E F0F9 B681 4C24 6236 3842 B755 6972 702A FD45"; } ];
		name = "Robin Krahl";
		};
		roblabla = {
		email = "robinlambertz+dev@gmail.com";
		github = "roblabla";

+2 −4

Original line number	Diff line number	Diff line
		@@ -11,14 +11,12 @@ in
		type = lib.types.bool;
		default = false;
		description = ''
		Enables udev rules for Nitrokey devices. By default grants access
		to users in the "nitrokey" group. You may want to install the
		nitrokey-app package, depending on your device and needs.
		Enables udev rules for Nitrokey devices.
		'';
		};
		};

		config = lib.mkIf cfg.enable {
		services.udev.packages = [ pkgs.libnitrokey ];
		services.udev.packages = [ pkgs.nitrokey-udev-rules ];
		};
		}

+6 −0

Original line number	Diff line number	Diff line
		@@ -334,6 +334,12 @@ in

		environment.etc."my.cnf".source = cfg.configFile;

		# The mysql_install_db binary will try to adjust the permissions, but fail to do so with a permission
		# denied error in some circumstances. Setting the permissions manually with tmpfiles is a workaround.
		systemd.tmpfiles.rules = [
		"d ${cfg.dataDir} 0755 ${cfg.user} ${cfg.group} - -"
		];

		systemd.services.mysql = {
		description = "MySQL Server";

+6 −1

Original line number	Diff line number	Diff line
		@@ -55,7 +55,12 @@ in
		default = "";
		};
		passwordFile = lib.mkOption {
		type = lib.types.str;
		type = lib.types.path;
		example = lib.literalExpression ''
		pkgs.writeText "roundcube-postgres-passwd.txt" '''
		hostname:port:database:username:password
		'''
		'';
		description = ''
		Password file for the postgresql connection.
		Must be formatted according to PostgreSQL .pgpass standard (see https://www.postgresql.org/docs/current/libpq-pgpass.html)

+10 −10

Original line number	Diff line number	Diff line
		{
		stable = {
		chromedriver = {
		hash_darwin = "sha256-4uE34f99fTiG5FJq0xnEodqQvNT2Aa8kesYOxY44xXA=";
		hash_darwin = "sha256-+Pcd++19/nJVsqGr2jzyjMTWYfb2U9wSgnNccDyGuGU=";
		hash_darwin_aarch64 =
		"sha256-gDrfR5EgBx3YRxf3/08gayOhmEqSw4G/QcuNtfHmRHk=";
		hash_linux = "sha256-qMlM6ilsIqm8G5KLE4uGVb/s2bNyZSyQmxsq+EHKX/c=";
		version = "130.0.6723.91";
		"sha256-vrbIpHrBwbzqars7D546eJ7zhEhAB0abq7MXiqlU4ts=";
		hash_linux = "sha256-NbZ1GULLWJ6L3kczz23HoUhGk6VgBOXcjZlL7t4Z6Ec=";
		version = "130.0.6723.116";
		};
		deps = {
		gn = {
		@@ -15,8 +15,8 @@
		version = "2024-09-09";
		};
		};
		hash = "sha256-qXCcHas3l3viszDtY5d5JEToPo2hHTaBmi+pJlKQr4M=";
		version = "130.0.6723.91";
		hash = "sha256-eOCUKhFv205MD1gEY1FQQNCwxyELNjIAxUlPcRn74Lk=";
		version = "130.0.6723.116";
		};
		ungoogled-chromium = {
		deps = {
		@@ -27,11 +27,11 @@
		version = "2024-09-09";
		};
		ungoogled-patches = {
		hash = "sha256-LhCrwOwPmEn5xlBLTgp2NMfQLxYbSg0pdZxshoqQAGw=";
		rev = "130.0.6723.91-1";
		hash = "sha256-+94tSSaOp6vzWkXN1qF3UXMm/Rs3pKmjf+U4x+af818=";
		rev = "130.0.6723.116-1";
		};
		};
		hash = "sha256-qXCcHas3l3viszDtY5d5JEToPo2hHTaBmi+pJlKQr4M=";
		version = "130.0.6723.91";
		hash = "sha256-eOCUKhFv205MD1gEY1FQQNCwxyELNjIAxUlPcRn74Lk=";
		version = "130.0.6723.116";
		};
		}