Unverified Commit 41c2c614 authored by Fabián Heredia Montiel's avatar Fabián Heredia Montiel Committed by GitHub
Browse files

Merge pull request #257211 from jwijenbergh/qtile-23.0 

Qtile: 0.22.1 -> 0.23.0
parents d1c454a3 2fcf9739

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

+3 −3
Original line number Diff line number Diff line
@@ -20,19 +20,19 @@ 


buildPythonPackage rec {

  pname = "pywlroots";

  version = "0.15.24";

  version = "0.16.5";

  format = "setuptools";



  disabled = pythonOlder "3.7";



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-TvYhxiAbK+mpcEE9y79WH96dzeDnvI0xPaUxSYQqyHE=";

    hash = "sha256-W43RCJektumgvO9K3K3mHR1BiyZXsHj4fN2EkGlJChQ=";

  };



  nativeBuildInputs = [ pkg-config ];

  propagatedNativeBuildInputs = [ cffi ];

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

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

  propagatedBuildInputs = [ cffi pywayland xkbcommon ];

  nativeCheckInputs = [ pytestCheckHook ];

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

+11 −4
Original line number Diff line number Diff line
@@ -5,13 +5,15 @@ 
, dbus-next

, dbus-python

, glib

, libdrm

, libinput

, libxkbcommon

, mpd2

, pango

, pixman

, pkg-config

, psutil

, pulseaudio

, pulsectl-asyncio

, pygobject3

, python-dateutil

, pywayland
@@ -22,19 +24,20 @@ 
, wayland

, wlroots

, xcbutilcursor

, xcbutilwm

, xcffib

, xkbcommon

}:



buildPythonPackage rec {

  pname = "qtile";

  version = "0.22.1";

  version = "0.23.0";



  src = fetchFromGitHub {

    owner = "qtile";

    repo = "qtile";

    rev = "v${version}";

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

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

  };



  patches = [
@@ -48,6 +51,9 @@ buildPythonPackage rec { 
      --replace libpango-1.0.so.0 ${pango.out}/lib/libpango-1.0.so.0

    substituteInPlace libqtile/backend/x11/xcursors.py \

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

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

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

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

  '';



  SETUPTOOLS_SCM_PRETEND_VERSION = version;
@@ -66,12 +72,12 @@ buildPythonPackage rec { 
    dbus-next

    mpd2

    psutil

    pulsectl-asyncio

    pyxdg

    pygobject3

    pywayland

    pywlroots

    xkbcommon

    pulseaudio

  ];



  buildInputs = [
@@ -79,6 +85,7 @@ buildPythonPackage rec { 
    wayland

    wlroots

    libxkbcommon

    xcbutilwm

  ];



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

pkgs/top-level/python-packages.nix

+2 −2
Original line number Diff line number Diff line
@@ -10936,7 +10936,7 @@ self: super: with self; { 
  pywizlight = callPackage ../development/python-modules/pywizlight { };















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













    wlroots = pkgs.wlroots_0_15;













    wlroots = pkgs.wlroots_0_16;















  };





























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










@@ -11056,7 +11056,7 @@ self: super: with self; {













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





























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













    wlroots = pkgs.wlroots_0_15;













    wlroots = pkgs.wlroots_0_16;















  };















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