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

lib/licenses.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -1416,7 +1416,7 @@ lib.mapAttrs mkLicense (

		tsl = {
		shortName = "TSL";
		fullName = "Timescale License Agreegment";
		fullName = "Timescale License Agreement";
		url = "https://github.com/timescale/timescaledb/blob/main/tsl/LICENSE-TIMESCALE";
		free = false;
		};

+5 −6

Original line number	Diff line number	Diff line
		@@ -5799,12 +5799,6 @@
		name = "Daniil Berendeev";
		keys = [ { fingerprint = "60D7 0EE0 3BD4 A415 B255 1938 6556 0668 006B 4906"; } ];
		};
		danbst = {
		email = "abcz2.uprola@gmail.com";
		github = "danbst";
		githubId = 743057;
		name = "Danylo Hlynskyi";
		};
		danbulant = {
		name = "Daniel Bulant";
		email = "danbulant@gmail.com";
		@@ -25294,6 +25288,11 @@
		githubId = 20484159;
		keys = [ { fingerprint = "F246 425A 7650 6F37 0552 BA8D DEA9 C405 09D9 65F5"; } ];
		};
		squishykid = {
		github = "squishykid";
		githubId = 2177912;
		name = "squishykid";
		};
		srgom = {
		github = "SRGOM";
		githubId = 8103619;

+4 −1

Original line number	Diff line number	Diff line
		@@ -23,6 +23,8 @@ in
		services.spotifyd = {
		enable = lib.mkEnableOption "spotifyd, a Spotify playing daemon";

		package = lib.mkPackageOption pkgs "spotifyd" { };

		config = lib.mkOption {
		default = "";
		type = lib.types.lines;
		@@ -43,6 +45,7 @@ in
		<https://docs.spotifyd.rs/configuration/index.html#config-file>.
		'';
		};

		};
		};

		@@ -64,7 +67,7 @@ in
		description = "spotifyd, a Spotify playing daemon";
		environment.SHELL = "/bin/sh";
		serviceConfig = {
		ExecStart = "${pkgs.spotifyd}/bin/spotifyd --no-daemon --cache-path /var/cache/spotifyd --config-path ${spotifydConf}";
		ExecStart = "${cfg.package}/bin/spotifyd --no-daemon --cache-path /var/cache/spotifyd --config-path ${spotifydConf}";
		Restart = "always";
		RestartSec = 12;
		DynamicUser = true;

+0 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,6 @@ in
		{
		meta = {
		maintainers = with lib.maintainers; [
		danbst
		anthonyroussel
		];
		};

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		{
		name = "containers-reloadable";
		meta = {
		maintainers = with lib.maintainers; [ danbst ];
		maintainers = [ ];
		};

		nodes = {