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

maintainers/maintainer-list.nix

+10 −0

Original line number	Diff line number	Diff line
		@@ -4856,6 +4856,16 @@
		githubId = 12491746;
		name = "Masato Yonekawa";
		};
		hyshka = {
		name = "Bryan Hyshka";
		email = "bryan@hyshka.com";
		github = "hyshka";
		githubId = 2090758;
		keys = [{
		longkeyid = "rsa2048/0xDB2D93D1BFAAA6EA";
		fingerprint = "24F4 1925 28C4 8797 E539 F247 DB2D 93D1 BFAA A6EA";
		}];
		};
		hyzual = {
		email = "hyzual@gmail.com";
		github = "Hyzual";

+1 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@ containers.database =
		{ config =
		{ config, pkgs, ... }:
		{ services.postgresql.enable = true;
		services.postgresql.package = pkgs.postgresql_9_6;
		services.postgresql.package = pkgs.postgresql_10;
		};
		};
		```

+1 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@ containers.database =
		{ config =
		{ config, pkgs, ... }:
		{ services.postgresql.enable = true;
		services.postgresql.package = pkgs.postgresql_9_6;
		services.postgresql.package = pkgs.postgresql_10;
		};
		};
		</programlisting>

+5 −3

Original line number	Diff line number	Diff line
		@@ -289,14 +289,16 @@ in
		port = cfg.port;
		};

		services.postgresql.package =
		services.postgresql.package = let
		mkThrow = ver: throw "postgresql_${ver} was removed, please upgrade your postgresql version.";
		in
		# Note: when changing the default, make it conditional on
		# ‘system.stateVersion’ to maintain compatibility with existing
		# systems!
		mkDefault (if versionAtLeast config.system.stateVersion "21.11" then pkgs.postgresql_13
		else if versionAtLeast config.system.stateVersion "20.03" then pkgs.postgresql_11
		else if versionAtLeast config.system.stateVersion "17.09" then pkgs.postgresql_9_6
		else throw "postgresql_9_5 was removed, please upgrade your postgresql version.");
		else if versionAtLeast config.system.stateVersion "17.09" then mkThrow "9_6"
		else mkThrow "9_5");

		services.postgresql.dataDir = mkDefault "/var/lib/postgresql/${cfg.package.psqlSchema}";

+4 −7

Original line number	Diff line number	Diff line
		@@ -22,13 +22,9 @@ in

		package = mkOption {
		description = "Zigbee2mqtt package to use";
		default = pkgs.zigbee2mqtt.override {
		dataDir = cfg.dataDir;
		};
		default = pkgs.zigbee2mqtt;
		defaultText = literalExpression ''
		pkgs.zigbee2mqtt {
		dataDir = services.zigbee2mqtt.dataDir
		}
		pkgs.zigbee2mqtt
		'';
		type = types.package;
		};
		@@ -83,6 +79,7 @@ in
		serviceConfig = {
		ExecStart = "${cfg.package}/bin/zigbee2mqtt";
		User = "zigbee2mqtt";
		Group = "zigbee2mqtt";
		WorkingDirectory = cfg.dataDir;
		Restart = "on-failure";