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

Merge pull request #117554 from Zopieux/snapcast-meta

Browse Source
This commit is contained in:
Sandro 2021-04-07 10:30:32 +02:00 committed by GitHub
commit d9f9a4a976
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,7 +65,7 @@ let
in { in {
imports = [ imports = [
(mkRenamedOptionModule [ "services" "snapserver" "controlPort"] [ "services" "snapserver" "tcp" "port" ]) (mkRenamedOptionModule [ "services" "snapserver" "controlPort" ] [ "services" "snapserver" "tcp" "port" ])
]; ];
###### interface ###### interface
@ -200,12 +200,21 @@ in {
location = mkOption { location = mkOption {
type = types.oneOf [ types.path types.str ]; type = types.oneOf [ types.path types.str ];
description = '' description = ''
The location of the pipe, file, Librespot/Airplay/process binary, or a TCP address. For type <literal>pipe</literal> or <literal>file</literal>, the path to the pipe or file.
Use an empty string for alsa. For type <literal>librespot</literal>, <literal>airplay</literal> or <literal>process</literal>, the path to the corresponding binary.
For type <literal>tcp</literal>, the <literal>host:port</literal> address to connect to or listen on.
For type <literal>meta</literal>, a list of stream names in the form <literal>/one/two/...</literal>. Don't forget the leading slash.
For type <literal>alsa</literal>, use an empty string.
'';
example = literalExample ''
"/path/to/pipe"
"/path/to/librespot"
"192.168.1.2:4444"
"/MyTCP/Spotify/MyPipe"
''; '';
}; };
type = mkOption { type = mkOption {
type = types.enum [ "pipe" "librespot" "airplay" "file" "process" "tcp" "alsa" "spotify" ]; type = types.enum [ "pipe" "librespot" "airplay" "file" "process" "tcp" "alsa" "spotify" "meta" ];
default = "pipe"; default = "pipe";
description = '' description = ''
The type of input stream. The type of input stream.

4
nixos/tests/snapcast.nix
View File

@ -34,6 +34,10 @@ in {
type = "tcp"; type = "tcp";
location = "127.0.0.1:${toString tcpStreamPort}"; location = "127.0.0.1:${toString tcpStreamPort}";
}; };
meta = {
type = "meta";
location = "/mpd/bluetooth/tcp";
};
}; };
}; };
}; };

10
pkgs/applications/audio/snapcast/default.nix
View File

@ -20,8 +20,8 @@ let
aixlog = dependency { aixlog = dependency {
name = "aixlog"; name = "aixlog";
version = "1.4.0"; version = "1.5.0";
sha256 = "0f2bs5j1jjajcpa251dslnwkgglaam3b0cm6wdx5l7mbwvnmib2g"; sha256 = "09mnkrans9zmwfxsiwgkm0rba66c11kg5zby9x3rjic34gnmw6ay";
}; };
popl = dependency { popl = dependency {
@ -34,13 +34,13 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "snapcast"; pname = "snapcast";
version = "0.23.0"; version = "0.24.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "badaix"; owner = "badaix";
repo = "snapcast"; repo = "snapcast";
rev = "v${version}"; rev = "v${version}";
sha256 = "0183hhghzn0fhw2qzc1s009q7miabpcf0pxaqjdscsl8iivxqknd"; sha256 = "13yz8alplnqwkcns3mcli01qbyy6l3h62xx0v71ygcrz371l4g9g";
}; };
nativeBuildInputs = [ cmake pkg-config boost170.dev ]; nativeBuildInputs = [ cmake pkg-config boost170.dev ];
@ -64,6 +64,6 @@ stdenv.mkDerivation rec {
description = "Synchronous multi-room audio player"; description = "Synchronous multi-room audio player";
homepage = "https://github.com/badaix/snapcast"; homepage = "https://github.com/badaix/snapcast";
maintainers = with maintainers; [ fpletz ]; maintainers = with maintainers; [ fpletz ];
license = licenses.gpl3; license = licenses.gpl3Plus;
}; };
} }