commit 68995c09692523ee5b3bac3ce88896b87a6df1a2 · pyrox.dev/nixpkgs

+8 -2

nixos/tests/all-tests.nix

···

       187
       187
        
         authelia = runTest ./authelia.nix;

     

       188
       188
        
         auto-cpufreq = runTest ./auto-cpufreq.nix;

     

       189
       189
        
         autobrr = runTest ./autobrr.nix;

     

       190
       190
       -
         avahi = handleTest ./avahi.nix {};

     

       191
       191
       -
         avahi-with-resolved = handleTest ./avahi.nix { networkd = true; };

     

       190
       190
       +
         avahi = runTest {

     

       191
       191
       +
           imports = [ ./avahi.nix ];

     

       192
       192
       +
           _module.args.networkd = false;

     

       193
       193
       +
         };

     

       194
       194
       +
         avahi-with-resolved = runTest {

     

       195
       195
       +
           imports = [ ./avahi.nix ];

     

       196
       196
       +
           _module.args.networkd = true;

     

       197
       197
       +
         };

     

       192
       198
        
         ayatana-indicators = runTest ./ayatana-indicators.nix;

     

       193
       199
        
         babeld = runTest ./babeld.nix;

     

       194
       200
        
         bazarr = handleTest ./bazarr.nix {};

+7 -10

nixos/tests/avahi.nix

···

       1
       1
        
       {

     

       2
       2
       -
         system ? builtins.currentSystem,

     

       3
       3
       -
         config ? { },

     

       4
       4
       -
         pkgs ? import ../.. { inherit system config; },

     

       2
       2
       +
         pkgs,

     

       5
       3
        
         # bool: whether to use networkd in the tests

     

       6
       4
        
         networkd ? false,

     

       7
       7
       -
       }@args:

     

       5
       5
       +
         ...

     

       6
       6
       +
       }:

     

       8
       7
        
       

     

       9
       8
        
       # Test whether `avahi-daemon' and `libnss-mdns' work as expected.

     

       10
       10
       -
       import ./make-test-python.nix {

     

       9
       9
       +
       {

     

       11
       10
        
         name = "avahi";

     

       12
       12
       -
         meta = with pkgs.lib.maintainers; {

     

       13
       13
       -
           maintainers = [ ];

     

       14
       14
       -
         };

     

       11
       11
       +
         meta.maintainers = [ ];

     

       15
       12
        
       

     

       16
       13
        
         nodes =

     

       17
       14
        
           let

     
···

       29
       26
        
                   extraServiceFiles.ssh = "${pkgs.avahi}/etc/avahi/services/ssh.service";

     

       30
       27
        
                 };

     

       31
       28
        
               }

     

       32
       32
       -
               // pkgs.lib.optionalAttrs (networkd) {

     

       29
       29
       +
               // pkgs.lib.optionalAttrs networkd {

     

       33
       30
        
                 networking = {

     

       34
       31
        
                   useNetworkd = true;

     

       35
       32
        
                   useDHCP = false;

     
···

       84
       81
        
       

     

       85
       82
        
           one.log(one.execute("systemd-analyze security avahi-daemon.service | grep -v ✓")[1])

     

       86
       83
        
         '';

     

       87
       87
       -
       } args

     

       84
       84
       +
       }