commit 41c2c6143640629866b5518c86bceceeb28ec7c4 · pyrox.dev/nixpkgs

+3 -3

pkgs/development/python-modules/pywlroots/default.nix

···

       20
       20
        
       

     

       21
       21
        
       buildPythonPackage rec {

     

       22
       22
        
         pname = "pywlroots";

     

       23
       23
       -
         version = "0.15.24";

     

       23
       23
       +
         version = "0.16.5";

     

       24
       24
        
         format = "setuptools";

     

       25
       25
        
       

     

       26
       26
        
         disabled = pythonOlder "3.7";

     

       27
       27
        
       

     

       28
       28
        
         src = fetchPypi {

     

       29
       29
        
           inherit pname version;

     

       30
       30
       -
           hash = "sha256-TvYhxiAbK+mpcEE9y79WH96dzeDnvI0xPaUxSYQqyHE=";

     

       30
       30
       +
           hash = "sha256-W43RCJektumgvO9K3K3mHR1BiyZXsHj4fN2EkGlJChQ=";

     

       31
       31
        
         };

     

       32
       32
        
       

     

       33
       33
        
         nativeBuildInputs = [ pkg-config ];

     

       34
       34
        
         propagatedNativeBuildInputs = [ cffi ];

     

       35
       35
       -
         buildInputs = [ libinput libxkbcommon pixman xorg.libxcb udev wayland wlroots ];

     

       35
       35
       +
         buildInputs = [ libinput libxkbcommon pixman xorg.libxcb xorg.xcbutilwm udev wayland wlroots ];

     

       36
       36
        
         propagatedBuildInputs = [ cffi pywayland xkbcommon ];

     

       37
       37
        
         nativeCheckInputs = [ pytestCheckHook ];

     

       38
       38

+11 -4

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

···

       5
       5
        
       , dbus-next

     

       6
       6
        
       , dbus-python

     

       7
       7
        
       , glib

     

       8
       8
       +
       , libdrm

     

       8
       9
        
       , libinput

     

       9
       10
        
       , libxkbcommon

     

       10
       11
        
       , mpd2

     

       11
       12
        
       , pango

     

       13
       13
       +
       , pixman

     

       12
       14
        
       , pkg-config

     

       13
       15
        
       , psutil

     

       14
       14
       -
       , pulseaudio

     

       16
       16
       +
       , pulsectl-asyncio

     

       15
       17
        
       , pygobject3

     

       16
       18
        
       , python-dateutil

     

       17
       19
        
       , pywayland

     
···

       22
       24
        
       , wayland

     

       23
       25
        
       , wlroots

     

       24
       26
        
       , xcbutilcursor

     

       27
       27
       +
       , xcbutilwm

     

       25
       28
        
       , xcffib

     

       26
       29
        
       , xkbcommon

     

       27
       30
        
       }:

     

       28
       31
        
       

     

       29
       32
        
       buildPythonPackage rec {

     

       30
       33
        
         pname = "qtile";

     

       31
       31
       -
         version = "0.22.1";

     

       34
       34
       +
         version = "0.23.0";

     

       32
       35
        
       

     

       33
       36
        
         src = fetchFromGitHub {

     

       34
       37
        
           owner = "qtile";

     

       35
       38
        
           repo = "qtile";

     

       36
       39
        
           rev = "v${version}";

     

       37
       37
       -
           hash = "sha256-HOyExVKOqZ4OeNM1/AiXQeiUV+EbSJLEjWEibm07ff8=";

     

       40
       40
       +
           hash = "sha256-WxnpkKqYGGEsFTt/1iCSiCzdESJP6HFJ6BztaMsMbYo=";

     

       38
       41
        
         };

     

       39
       42
        
       

     

       40
       43
        
         patches = [

     
···

       48
       51
        
             --replace libpango-1.0.so.0 ${pango.out}/lib/libpango-1.0.so.0

     

       49
       52
        
           substituteInPlace libqtile/backend/x11/xcursors.py \

     

       50
       53
        
             --replace libxcb-cursor.so.0 ${xcbutilcursor.out}/lib/libxcb-cursor.so.0

     

       54
       54
       +
           substituteInPlace libqtile/backend/wayland/cffi/build.py \

     

       55
       55
       +
               --replace /usr/include/pixman-1 ${lib.getDev pixman}/include \

     

       56
       56
       +
               --replace /usr/include/libdrm ${lib.getDev libdrm}/include/libdrm

     

       51
       57
        
         '';

     

       52
       58
        
       

     

       53
       59
        
         SETUPTOOLS_SCM_PRETEND_VERSION = version;

     
···

       66
       72
        
           dbus-next

     

       67
       73
        
           mpd2

     

       68
       74
        
           psutil

     

       75
       75
       +
           pulsectl-asyncio

     

       69
       76
        
           pyxdg

     

       70
       77
        
           pygobject3

     

       71
       78
        
           pywayland

     

       72
       79
        
           pywlroots

     

       73
       80
        
           xkbcommon

     

       74
       74
       -
           pulseaudio

     

       75
       81
        
         ];

     

       76
       82
        
       

     

       77
       83
        
         buildInputs = [

     
···

       79
       85
        
           wayland

     

       80
       86
        
           wlroots

     

       81
       87
        
           libxkbcommon

     

       88
       88
       +
           xcbutilwm

     

       82
       89
        
         ];

     

       83
       90
        
       

     

       84
       91
        
         doCheck = false; # Requires X server #TODO this can be worked out with the existing NixOS testing infrastructure.

+2 -2

pkgs/top-level/python-packages.nix

···

       10936
       10936
        
         pywizlight = callPackage ../development/python-modules/pywizlight { };

     

       10937
       10937
        
       

     

       10938
       10938
        
         pywlroots = callPackage ../development/python-modules/pywlroots {

     

       10939
       10939
       -
           wlroots = pkgs.wlroots_0_15;

     

       10939
       10939
       +
           wlroots = pkgs.wlroots_0_16;

     

       10940
       10940
        
         };

     

       10941
       10941
        
       

     

       10942
       10942
        
         pyws66i = callPackage ../development/python-modules/pyws66i { };

     
···

       11056
       11056
        
         qtconsole = callPackage ../development/python-modules/qtconsole { };

     

       11057
       11057
        
       

     

       11058
       11058
        
         qtile = callPackage ../development/python-modules/qtile {

     

       11059
       11059
       -
           wlroots = pkgs.wlroots_0_15;

     

       11059
       11059
       +
           wlroots = pkgs.wlroots_0_16;

     

       11060
       11060
        
         };

     

       11061
       11061
        
         qtile-extras = callPackage ../development/python-modules/qtile-extras { };

     

       11062
       11062