commit 15a7cb4502989f9bd2f4f85e1cb95e4ace096f7d · pyrox.dev/nixpkgs

+1 -1

nixos/modules/services/hardware/lirc.nix

···

       42
       42
        
       

     

       43
       43
        
         config = lib.mkIf cfg.enable {

     

       44
       44
        
       

     

       45
       45
       -
           # Note: LIRC executables raises a warning, if lirc_options.conf do not exists

     

       45
       45
       +
           # Note: LIRC executables raises a warning, if lirc_options.conf does not exist

     

       46
       46
        
           environment.etc."lirc/lirc_options.conf".text = cfg.options;

     

       47
       47
        
       

     

       48
       48
        
           passthru.lirc.socket = "/run/lirc/lircd";

+1 -1

nixos/modules/virtualisation/qemu-vm.nix

···

       129
       129
        
           NIX_DISK_IMAGE=$(readlink -f "''${NIX_DISK_IMAGE:-${toString config.virtualisation.diskImage}}") || test -z "$NIX_DISK_IMAGE"

     

       130
       130
        
       

     

       131
       131
        
           if test -n "$NIX_DISK_IMAGE" && ! test -e "$NIX_DISK_IMAGE"; then

     

       132
       132
       -
               echo "Disk image do not exist, creating the virtualisation disk image..."

     

       132
       132
       +
               echo "Disk image does not exist, creating the virtualisation disk image..."

     

       133
       133
        
       

     

       134
       134
        
               ${

     

       135
       135
        
                 if (cfg.useBootLoader && cfg.useDefaultFilesystems) then

+1 -1

nixos/tests/bird.nix

···

       124
       124
        
               host1.wait_until_succeeds("ip --json -6 r | jq -e 'map(select(.dst == \"fdff::2\")) | any'")

     

       125
       125
        
               host2.wait_until_succeeds("ip --json -6 r | jq -e 'map(select(.dst == \"fdff::1\")) | any'")

     

       126
       126
        
       

     

       127
       127
       -
             with subtest("Check fake routes in preCheckConfig do not exists"):

     

       127
       127
       +
             with subtest("Check fake routes in preCheckConfig do not exist"):

     

       128
       128
        
               host1.fail("ip --json r | jq -e 'map(select(.dst == \"1.2.3.4\")) | any'")

     

       129
       129
        
               host2.fail("ip --json r | jq -e 'map(select(.dst == \"1.2.3.4\")) | any'")

     

       130
       130

+1 -1

nixos/tests/containers-tmpfs.nix

···

       79
       79
        
           with subtest(

     

       80
       80
        
               "files created in the hosts container dir in a path where a tmpfs "

     

       81
       81
        
               + "file system has been mounted are not visible to the container as "

     

       82
       82
       -
               + "the do not exist in the tmpfs"

     

       82
       82
       +
               + "they do not exist in the tmpfs"

     

       83
       83
        
           ):

     

       84
       84
        
               machine.succeed(

     

       85
       85
        
                   "touch /var/lib/nixos-containers/tmpfs/var/test.file",