commit ce7da7dfef66a915d89f66a3531a430b07d24ff3 · pyrox.dev/nixpkgs

+19 -5

nixos/modules/services/audio/snapserver.nix

···

       198
       198
        
               type = with types; attrsOf (submodule {

     

       199
       199
        
                 options = {

     

       200
       200
        
                   location = mkOption {

     

       201
       201
       -
                     type = types.path;

     

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

     

       202
       202
        
                     description = ''

     

       203
       203
       -
                       The location of the pipe.

     

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

     

       204
       204
       +
                       Use an empty string for alsa.

     

       204
       205
        
                     '';

     

       205
       206
        
                   };

     

       206
       207
        
                   type = mkOption {

     

       207
       207
       -
                     type = types.enum [ "pipe" "file" "process" "spotify" "airplay" ];

     

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

     

       208
       209
        
                     default = "pipe";

     

       209
       210
        
                     description = ''

     

       210
       211
        
                       The type of input stream.

     
···

       219
       220
        
                     example = literalExample ''

     

       220
       221
        
                       # for type == "pipe":

     

       221
       222
        
                       {

     

       222
       222
       -
                         mode = "listen";

     

       223
       223
       +
                         mode = "create";

     

       223
       224
        
                       };

     

       224
       225
        
                       # for type == "process":

     

       225
       226
        
                       {

     

       226
       227
        
                         params = "--param1 --param2";

     

       227
       228
        
                         logStderr = "true";

     

       228
       229
        
                       };

     

       230
       230
       +
                       # for type == "tcp":

     

       231
       231
       +
                       {

     

       232
       232
       +
                         mode = "client";

     

       233
       233
       +
                       }

     

       234
       234
       +
                       # for type == "alsa":

     

       235
       235
       +
                       {

     

       236
       236
       +
                         device = "hw:0,0";

     

       237
       237
       +
                       }

     

       229
       238
        
                     '';

     

       230
       239
        
                   };

     

       231
       240
        
                   inherit sampleFormat;

     
···

       255
       264
        
       

     

       256
       265
        
         config = mkIf cfg.enable {

     

       257
       266
        
       

     

       267
       267
       +
           # https://github.com/badaix/snapcast/blob/98ac8b2fb7305084376607b59173ce4097c620d8/server/streamreader/stream_manager.cpp#L85

     

       268
       268
       +
           warnings = filter (w: w != "") (mapAttrsToList (k: v: if v.type == "spotify" then ''

     

       269
       269
       +
             services.snapserver.streams.${k}.type = "spotify" is deprecated, use services.snapserver.streams.${k}.type = "librespot" instead.

     

       270
       270
       +
           '' else "") cfg.streams);

     

       271
       271
       +
       

     

       258
       272
        
           systemd.services.snapserver = {

     

       259
       273
        
             after = [ "network.target" ];

     

       260
       274
        
             description = "Snapserver";

     
···

       272
       286
        
               ProtectKernelTunables = true;

     

       273
       287
        
               ProtectControlGroups = true;

     

       274
       288
        
               ProtectKernelModules = true;

     

       275
       275
       -
               RestrictAddressFamilies = "AF_INET AF_INET6 AF_UNIX";

     

       289
       289
       +
               RestrictAddressFamilies = "AF_INET AF_INET6 AF_UNIX AF_NETLINK";

     

       276
       290
        
               RestrictNamespaces = true;

     

       277
       291
        
               RuntimeDirectory = name;

     

       278
       292
        
               StateDirectory = name;

nixos/tests/snapcast.nix

···

       4
       4
        
         port = 10004;

     

       5
       5
        
         tcpPort = 10005;

     

       6
       6
        
         httpPort = 10080;

     

       7
       7
       +
         tcpStreamPort = 10006;

     

       7
       8
        
       in {

     

       8
       9
        
         name = "snapcast";

     

       9
       10
        
         meta = with pkgs.lib.maintainers; {

     
···

       21
       22
        
                 mpd = {

     

       22
       23
        
                   type = "pipe";

     

       23
       24
        
                   location = "/run/snapserver/mpd";

     

       25
       25
       +
                   query.mode = "create";

     

       24
       26
        
                 };

     

       25
       27
        
                 bluetooth = {

     

       26
       28
        
                   type = "pipe";

     

       27
       29
        
                   location = "/run/snapserver/bluetooth";

     

       28
       30
        
                 };

     

       31
       31
       +
                 tcp = {

     

       32
       32
       +
                   type = "tcp";

     

       33
       33
       +
                   location = "127.0.0.1:${toString tcpStreamPort}";

     

       34
       34
       +
                 };

     

       29
       35
        
               };

     

       30
       36
        
             };

     

       31
       37
        
           };

     
···

       42
       48
        
           server.wait_until_succeeds("ss -ntl | grep -q ${toString port}")

     

       43
       49
        
           server.wait_until_succeeds("ss -ntl | grep -q ${toString tcpPort}")

     

       44
       50
        
           server.wait_until_succeeds("ss -ntl | grep -q ${toString httpPort}")

     

       51
       51
       +
           server.wait_until_succeeds("ss -ntl | grep -q ${toString tcpStreamPort}")

     

       45
       52
        
       

     

       46
       53
        
           with subtest("check that pipes are created"):

     

       47
       54
        
               server.succeed("test -p /run/snapserver/mpd")

+4 -4

pkgs/applications/audio/snapcast/default.nix

···

       20
       20
        
       

     

       21
       21
        
         aixlog = dependency {

     

       22
       22
        
           name    = "aixlog";

     

       23
       23
       -
           version = "1.2.1";

     

       24
       24
       -
           sha256  = "1rh4jib5g41b85bqrxkl5g74hk5ryf187y9fw0am76g59xlymfpr";

     

       23
       23
       +
           version = "1.4.0";

     

       24
       24
       +
           sha256  = "0f2bs5j1jjajcpa251dslnwkgglaam3b0cm6wdx5l7mbwvnmib2g";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         popl = dependency {

     
···

       34
       34
        
       

     

       35
       35
        
       stdenv.mkDerivation rec {

     

       36
       36
        
         pname = "snapcast";

     

       37
       37
       -
         version = "0.20.0";

     

       37
       37
       +
         version = "0.23.0";

     

       38
       38
        
       

     

       39
       39
        
         src = fetchFromGitHub {

     

       40
       40
        
           owner  = "badaix";

     

       41
       41
        
           repo   = "snapcast";

     

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

     

       43
       43
       -
           sha256 = "152ic8hlyawcmj9pykb33xc6yx7il6yb9ilmsy6m9nlh40m8yxls";

     

       43
       43
       +
           sha256 = "0183hhghzn0fhw2qzc1s009q7miabpcf0pxaqjdscsl8iivxqknd";

     

       44
       44
        
         };

     

       45
       45
        
       

     

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