commit f391cba8413982d1e033e85d47b282caefef7e4f · pyrox.dev/nixpkgs

+1 -1

nixos/tests/all-tests.nix

···

       1528
       1528
        
         virtualbox = handleTestOn [ "x86_64-linux" ] ./virtualbox.nix { };

     

       1529
       1529
        
         vm-variant = handleTest ./vm-variant.nix { };

     

       1530
       1530
        
         vscode-remote-ssh = handleTestOn [ "x86_64-linux" ] ./vscode-remote-ssh.nix { };

     

       1531
       1531
       -
         vscodium = discoverTests (import ./vscodium.nix);

     

       1531
       1531
       +
         vscodium = import ./vscodium.nix { inherit runTest; };

     

       1532
       1532
        
         vsftpd = runTest ./vsftpd.nix;

     

       1533
       1533
        
         waagent = runTest ./waagent.nix;

     

       1534
       1534
        
         wakapi = runTest ./wakapi.nix;

+14 -17

nixos/tests/vscodium.nix

···

       1
       1
       +
       { runTest }:

     

       1
       2
        
       let

     

       2
       3
        
         tests = {

     

       3
       4
        
           wayland =

     

       4
       4
       -
             { pkgs, ... }:

     

       5
       5
       +
             { lib, pkgs, ... }:

     

       5
       6
        
             {

     

       6
       7
        
               imports = [ ./common/wayland-cage.nix ];

     

       7
       8
        
       

     

       8
       9
        
               # We scale vscodium to help OCR find the small "Untitled" text.

     

       9
       9
       -
               services.cage.program = "${pkgs.vscodium}/bin/codium --force-device-scale-factor=2";

     

       10
       10
       +
               services.cage.program = "${lib.getExe pkgs.vscodium} --force-device-scale-factor=2";

     

       10
       11
        
       

     

       11
       12
        
               environment.variables.NIXOS_OZONE_WL = "1";

     

       12
       13
        
               environment.variables.DISPLAY = "do not use";

     
···

       14
       15
        
               fonts.packages = with pkgs; [ dejavu_fonts ];

     

       15
       16
        
             };

     

       16
       17
        
           xorg =

     

       17
       17
       -
             { pkgs, ... }:

     

       18
       18
       +
             { lib, pkgs, ... }:

     

       18
       19
        
             {

     

       19
       20
        
               imports = [

     

       20
       21
        
                 ./common/user-account.nix

     
···

       24
       25
        
               virtualisation.memorySize = 2047;

     

       25
       26
        
               services.xserver.enable = true;

     

       26
       27
        
               services.xserver.displayManager.sessionCommands = ''

     

       27
       27
       -
                 ${pkgs.vscodium}/bin/codium --force-device-scale-factor=2

     

       28
       28
       +
                 ${lib.getExe pkgs.vscodium} --force-device-scale-factor=2

     

       28
       29
        
               '';

     

       29
       30
        
               test-support.displayManager.auto.user = "alice";

     

       30
       31
        
             };

     
···

       32
       33
        
       

     

       33
       34
        
         mkTest =

     

       34
       35
        
           name: machine:

     

       35
       35
       -
           import ./make-test-python.nix (

     

       36
       36
       -
             { pkgs, ... }:

     

       36
       36
       +
           runTest (

     

       37
       37
       +
             { lib, ... }:

     

       37
       38
        
             {

     

       38
       39
        
               inherit name;

     

       39
       40
        
       

     

       40
       40
       -
               nodes = {

     

       41
       41
       -
                 "${name}" = machine;

     

       42
       42
       -
               };

     

       41
       41
       +
               nodes."${name}" = machine;

     

       42
       42
       +
       

     

       43
       43
       +
               meta.maintainers = with lib.maintainers; [

     

       44
       44
       +
                 synthetica

     

       45
       45
       +
                 turion

     

       46
       46
       +
               ];

     

       43
       47
        
       

     

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

     

       45
       45
       -
                 maintainers = [

     

       46
       46
       -
                   synthetica

     

       47
       47
       -
                   turion

     

       48
       48
       -
                 ];

     

       49
       49
       -
               };

     

       50
       48
        
               enableOCR = true;

     

       51
       49
        
       

     

       52
       50
        
               testScript = ''

     
···

       91
       89
        
               '';

     

       92
       90
        
             }

     

       93
       91
        
           );

     

       94
       94
       -
       

     

       95
       92
        
       in

     

       96
       96
       -
       builtins.mapAttrs (k: v: mkTest k v) tests

     

       93
       93
       +
       builtins.mapAttrs mkTest tests