commit 9200c874c54a477c6e5060f67de7dff3d56f5405 · pyrox.dev/nixpkgs

+2 -1

nixos/tests/all-tests.nix

···

       1250
       1250
        
         qgis = handleTest ./qgis.nix { package = pkgs.qgis; };

     

       1251
       1251
        
         qgis-ltr = handleTest ./qgis.nix { package = pkgs.qgis-ltr; };

     

       1252
       1252
        
         qownnotes = runTest ./qownnotes.nix;

     

       1253
       1253
       -
         qtile = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./qtile/default.nix;

     

       1253
       1253
       +
         qtile = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./qtile.nix;

     

       1254
       1254
       +
         qtile-extras = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./qtile-extras/default.nix;

     

       1254
       1255
        
         quake3 = runTest ./quake3.nix;

     

       1255
       1256
        
         quicktun = runTest ./quicktun.nix;

     

       1256
       1257
        
         quickwit = runTest ./quickwit.nix;

+46

nixos/tests/qtile.nix

···

       1
       1
       +
       { lib, ... }:

     

       2
       2
       +
       {

     

       3
       3
       +
         name = "qtile";

     

       4
       4
       +
       

     

       5
       5
       +
         meta = {

     

       6
       6
       +
           maintainers = with lib.maintainers; [

     

       7
       7
       +
             sigmanificient

     

       8
       8
       +
             gurjaka

     

       9
       9
       +
           ];

     

       10
       10
       +
         };

     

       11
       11
       +
       

     

       12
       12
       +
         nodes.machine =

     

       13
       13
       +
           {

     

       14
       14
       +
             pkgs,

     

       15
       15
       +
             lib,

     

       16
       16
       +
             ...

     

       17
       17
       +
           }:

     

       18
       18
       +
           {

     

       19
       19
       +
             imports = [

     

       20
       20
       +
               ./common/x11.nix

     

       21
       21
       +
               ./common/user-account.nix

     

       22
       22
       +
             ];

     

       23
       23
       +
             test-support.displayManager.auto.user = "alice";

     

       24
       24
       +
       

     

       25
       25
       +
             services.xserver.windowManager.qtile.enable = true;

     

       26
       26
       +
       

     

       27
       27
       +
             services.displayManager.defaultSession = lib.mkForce "qtile";

     

       28
       28
       +
       

     

       29
       29
       +
             environment.systemPackages = [ pkgs.kitty ];

     

       30
       30
       +
           };

     

       31
       31
       +
       

     

       32
       32
       +
         testScript = ''

     

       33
       33
       +
           with subtest("ensure x starts"):

     

       34
       34
       +
               machine.wait_for_x()

     

       35
       35
       +
               machine.wait_for_file("/home/alice/.Xauthority")

     

       36
       36
       +
               machine.succeed("xauth merge ~alice/.Xauthority")

     

       37
       37
       +
       

     

       38
       38
       +
           with subtest("ensure client is available"):

     

       39
       39
       +
               machine.succeed("qtile --version")

     

       40
       40
       +
       

     

       41
       41
       +
           with subtest("ensure we can open a new terminal"):

     

       42
       42
       +
               machine.send_key("meta_l-ret")

     

       43
       43
       +
               machine.wait_for_window(r"alice.*?machine")

     

       44
       44
       +
               machine.screenshot("terminal")

     

       45
       45
       +
         '';

     

       46
       46
       +
       }

nixos/tests/qtile/add-widget.patch nixos/tests/qtile-extras/add-widget.patch

+5 -2

nixos/tests/qtile/config.nix nixos/tests/qtile-extras/config.nix

···

       1
       1
       -
       { stdenvNoCC, fetchurl }:

     

       1
       1
       +
       {

     

       2
       2
       +
         stdenvNoCC,

     

       3
       3
       +
         fetchurl,

     

       4
       4
       +
       }:

     

       2
       5
        
       stdenvNoCC.mkDerivation {

     

       3
       3
       -
         name = "qtile-config";

     

       6
       6
       +
         name = "qtile-extras-config";

     

       4
       7
        
         version = "0.0.1";

     

       5
       8
        
       

     

       6
       9
        
         src = fetchurl {

+10 -6

nixos/tests/qtile/default.nix nixos/tests/qtile-extras/default.nix

···

       1
       1
        
       { lib, ... }:

     

       2
       2
        
       {

     

       3
       3
       -
         name = "qtile";

     

       3
       3
       +
         name = "qtile-extras";

     

       4
       4
        
       

     

       5
       5
        
         meta = {

     

       6
       6
       -
           maintainers = with lib.maintainers; [ sigmanificient ];

     

       6
       6
       +
           maintainers = with lib.maintainers; [

     

       7
       7
       +
             sigmanificient

     

       8
       8
       +
             gurjaka

     

       9
       9
       +
           ];

     

       7
       10
        
         };

     

       8
       11
        
       

     

       9
       12
        
         nodes.machine =

     

       10
       10
       -
           { pkgs, lib, ... }:

     

       13
       13
       +
           {

     

       14
       14
       +
             pkgs,

     

       15
       15
       +
             lib,

     

       16
       16
       +
             ...

     

       17
       17
       +
           }:

     

       11
       18
        
           let

     

       12
       19
        
             # We create a custom Qtile configuration file that adds a widget from

     

       13
       20
        
             # qtile-extras to the bar. This ensure that the qtile-extras package

     

       14
       21
        
             # also works, and that extraPackages behave as expected.

     

       15
       15
       -
       

     

       16
       22
        
             config-deriv = pkgs.callPackage ./config.nix { };

     

       17
       23
        
           in

     

       18
       24
        
           {

     
···

       43
       49
        
               machine.succeed("qtile --version")

     

       44
       50
        
       

     

       45
       51
        
           with subtest("ensure we can open a new terminal"):

     

       46
       46
       -
               machine.sleep(2)

     

       47
       52
        
               machine.send_key("meta_l-ret")

     

       48
       53
        
               machine.wait_for_window(r"alice.*?machine")

     

       49
       49
       -
               machine.sleep(2)

     

       50
       54
        
               machine.screenshot("terminal")

     

       51
       55
        
         '';

     

       52
       56
        
       }

+3 -1

pkgs/development/python-modules/qtile-extras/default.nix

···

       17
       17
        
         requests,

     

       18
       18
        
         setuptools-scm,

     

       19
       19
        
         xorgserver,

     

       20
       20
       +
         nixosTests,

     

       20
       21
        
       }:

     

       21
       21
       -
       

     

       22
       22
        
       buildPythonPackage rec {

     

       23
       23
        
         pname = "qtile-extras";

     

       24
       24
        
         version = "0.33.0";

     
···

       85
       85
        
         '';

     

       86
       86
        
       

     

       87
       87
        
         pythonImportsCheck = [ "qtile_extras" ];

     

       88
       88
       +
       

     

       89
       89
       +
         passthru.tests.qtile-extras = nixosTests.qtile-extras;

     

       88
       90
        
       

     

       89
       91
        
         meta = with lib; {

     

       90
       92
        
           description = "Extra modules and widgets for the Qtile tiling window manager";