public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/snapserver: update available stream types for v0.21.0

Browse Source 
* Add 'librespot' (new name for 'spotify'), 'alsa', 'tcp'.
* Add a warning about the spotify -> librespot rename.
* Fix the deprecated example `mode = "listen"` for type 'pipe'.
* Update the tests to include a straightforward 'tcp' test.
This commit is contained in:
Alexandre Macabies 2020-09-27 20:49:23 +02:00
parent 5fd8747939
commit a36cc03d96
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
nixos/modules/services/audio/snapserver.nix
View File

@ -198,13 +198,14 @@ in {
type = with types; attrsOf (submodule { type = with types; attrsOf (submodule {
options = { options = {
location = mkOption { location = mkOption {
type = types.path; type = types.oneOf [ types.path types.str ];
description = '' description = ''
The location of the pipe. The location of the pipe, file, Librespot/Airplay/process binary, or a TCP address.
Use an empty string for alsa.
''; '';
}; };
type = mkOption { type = mkOption {
type = types.enum [ "pipe" "file" "process" "spotify" "airplay" ]; type = types.enum [ "pipe" "librespot" "airplay" "file" "process" "tcp" "alsa" "spotify" ];
default = "pipe"; default = "pipe";
description = '' description = ''
The type of input stream. The type of input stream.
@ -219,13 +220,21 @@ in {
example = literalExample '' example = literalExample ''
# for type == "pipe": # for type == "pipe":
{ {
mode = "listen"; mode = "create";
}; };
# for type == "process": # for type == "process":
{ {
params = "--param1 --param2"; params = "--param1 --param2";
logStderr = "true"; logStderr = "true";
}; };
# for type == "tcp":
{
mode = "client";
}
# for type == "alsa":
{
device = "hw:0,0";
}
''; '';
}; };
inherit sampleFormat; inherit sampleFormat;
@ -255,6 +264,11 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
# https://github.com/badaix/snapcast/blob/98ac8b2fb7305084376607b59173ce4097c620d8/server/streamreader/stream_manager.cpp#L85
warnings = filter (w: w != "") (mapAttrsToList (k: v: if v.type == "spotify" then ''
services.snapserver.streams.${k}.type = "spotify" is deprecated, use services.snapserver.streams.${k}.type = "librespot" instead.
'' else "") cfg.streams);
systemd.services.snapserver = { systemd.services.snapserver = {
after = [ "network.target" ]; after = [ "network.target" ];
description = "Snapserver"; description = "Snapserver";

7
nixos/tests/snapcast.nix
View File

@ -4,6 +4,7 @@ let
port = 10004; port = 10004;
tcpPort = 10005; tcpPort = 10005;
httpPort = 10080; httpPort = 10080;
tcpStreamPort = 10006;
in { in {
name = "snapcast"; name = "snapcast";
meta = with pkgs.lib.maintainers; { meta = with pkgs.lib.maintainers; {
@ -21,11 +22,16 @@ in {
mpd = { mpd = {
type = "pipe"; type = "pipe";
location = "/run/snapserver/mpd"; location = "/run/snapserver/mpd";
query.mode = "create";
}; };
bluetooth = { bluetooth = {
type = "pipe"; type = "pipe";
location = "/run/snapserver/bluetooth"; location = "/run/snapserver/bluetooth";
}; };
tcp = {
type = "tcp";
location = "127.0.0.1:${toString tcpStreamPort}";
};
}; };
}; };
}; };
@ -42,6 +48,7 @@ in {
server.wait_until_succeeds("ss -ntl | grep -q ${toString port}") server.wait_until_succeeds("ss -ntl | grep -q ${toString port}")
server.wait_until_succeeds("ss -ntl | grep -q ${toString tcpPort}") server.wait_until_succeeds("ss -ntl | grep -q ${toString tcpPort}")
server.wait_until_succeeds("ss -ntl | grep -q ${toString httpPort}") server.wait_until_succeeds("ss -ntl | grep -q ${toString httpPort}")
server.wait_until_succeeds("ss -ntl | grep -q ${toString tcpStreamPort}")
with subtest("check that pipes are created"): with subtest("check that pipes are created"):
server.succeed("test -p /run/snapserver/mpd") server.succeed("test -p /run/snapserver/mpd")