commit d9f9a4a9760ef3cf3df63771cebefacd1b0178b4 · pyrox.dev/nixpkgs

+13 -4

nixos/modules/services/audio/snapserver.nix

···

       65
       65
        
       

     

       66
       66
        
       in {

     

       67
       67
        
         imports = [

     

       68
       68
       -
           (mkRenamedOptionModule [ "services" "snapserver" "controlPort"] [ "services" "snapserver" "tcp" "port" ])

     

       68
       68
       +
           (mkRenamedOptionModule [ "services" "snapserver" "controlPort" ] [ "services" "snapserver" "tcp" "port" ])

     

       69
       69
        
         ];

     

       70
       70
        
       

     

       71
       71
        
         ###### interface

     
···

       200
       200
        
                   location = mkOption {

     

       201
       201
        
                     type = types.oneOf [ types.path types.str ];

     

       202
       202
        
                     description = ''

     

       203
       203
       -
                       The location of the pipe, file, Librespot/Airplay/process binary, or a TCP address.

     

       204
       204
       -
                       Use an empty string for alsa.

     

       203
       203
       +
                       For type <literal>pipe</literal> or <literal>file</literal>, the path to the pipe or file.

     

       204
       204
       +
                       For type <literal>librespot</literal>, <literal>airplay</literal> or <literal>process</literal>, the path to the corresponding binary.

     

       205
       205
       +
                       For type <literal>tcp</literal>, the <literal>host:port</literal> address to connect to or listen on.

     

       206
       206
       +
                       For type <literal>meta</literal>, a list of stream names in the form <literal>/one/two/...</literal>. Don't forget the leading slash.

     

       207
       207
       +
                       For type <literal>alsa</literal>, use an empty string.

     

       208
       208
       +
                     '';

     

       209
       209
       +
                     example = literalExample ''

     

       210
       210
       +
                       "/path/to/pipe"

     

       211
       211
       +
                       "/path/to/librespot"

     

       212
       212
       +
                       "192.168.1.2:4444"

     

       213
       213
       +
                       "/MyTCP/Spotify/MyPipe"

     

       205
       214
        
                     '';

     

       206
       215
        
                   };

     

       207
       216
        
                   type = mkOption {

     

       208
       208
       -
                     type = types.enum [ "pipe" "librespot" "airplay" "file" "process" "tcp" "alsa" "spotify" ];

     

       217
       217
       +
                     type = types.enum [ "pipe" "librespot" "airplay" "file" "process" "tcp" "alsa" "spotify" "meta" ];

     

       209
       218
        
                     default = "pipe";

     

       210
       219
        
                     description = ''

     

       211
       220
        
                       The type of input stream.

+4

nixos/tests/snapcast.nix

···

       34
       34
        
                   type = "tcp";

     

       35
       35
        
                   location = "127.0.0.1:${toString tcpStreamPort}";

     

       36
       36
        
                 };

     

       37
       37
       +
                 meta = {

     

       38
       38
       +
                   type = "meta";

     

       39
       39
       +
                   location = "/mpd/bluetooth/tcp";

     

       40
       40
       +
                 };

     

       37
       41
        
               };

     

       38
       42
        
             };

     

       39
       43
        
           };

+5 -5

pkgs/applications/audio/snapcast/default.nix

···

       20
       20
        
       

     

       21
       21
        
         aixlog = dependency {

     

       22
       22
        
           name    = "aixlog";

     

       23
       23
       -
           version = "1.4.0";

     

       24
       24
       -
           sha256  = "0f2bs5j1jjajcpa251dslnwkgglaam3b0cm6wdx5l7mbwvnmib2g";

     

       23
       23
       +
           version = "1.5.0";

     

       24
       24
       +
           sha256  = "09mnkrans9zmwfxsiwgkm0rba66c11kg5zby9x3rjic34gnmw6ay";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         popl = dependency {

     
···

       34
       34
        
       

     

       35
       35
        
       stdenv.mkDerivation rec {

     

       36
       36
        
         pname = "snapcast";

     

       37
       37
       -
         version = "0.23.0";

     

       37
       37
       +
         version = "0.24.0";

     

       38
       38
        
       

     

       39
       39
        
         src = fetchFromGitHub {

     

       40
       40
        
           owner  = "badaix";

     

       41
       41
        
           repo   = "snapcast";

     

       42
       42
        
           rev    = "v${version}";

     

       43
       43
       -
           sha256 = "0183hhghzn0fhw2qzc1s009q7miabpcf0pxaqjdscsl8iivxqknd";

     

       43
       43
       +
           sha256 = "13yz8alplnqwkcns3mcli01qbyy6l3h62xx0v71ygcrz371l4g9g";

     

       44
       44
        
         };

     

       45
       45
        
       

     

       46
       46
        
         nativeBuildInputs = [ cmake pkg-config boost170.dev ];

     
···

       64
       64
        
           description = "Synchronous multi-room audio player";

     

       65
       65
        
           homepage = "https://github.com/badaix/snapcast";

     

       66
       66
        
           maintainers = with maintainers; [ fpletz ];

     

       67
       67
       -
           license = licenses.gpl3;

     

       67
       67
       +
           license = licenses.gpl3Plus;

     

       68
       68
        
         };

     

       69
       69
        
       }