Unverified Commit 72c5e716 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #313604 from arjan-s/bump-qtile 

python3Packages.pywlroots: 0.16.8 -> 0.17.0, python3Packages.qtile: 0.25.0 -> 0.26.0, python3Packages.qtile-extras: 0.25.0 -> 0.26.0
parents 3e280884 2736b03d

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

+2 −2
Original line number Diff line number Diff line
@@ -21,14 +21,14 @@ 


buildPythonPackage rec {

  pname = "pywlroots";

  version = "0.16.8";

  version = "0.17.0";

  format = "setuptools";



  disabled = pythonOlder "3.7";



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-jAkDZKAm75MlAMNuX+21ZV6kHb53zgIOJctJC2bXH1k=";

    hash = "sha256-cssr4UBIwMvInM8bV4YwE6mXf9USSMMAzMcgAefEPbs=";

  };



  nativeBuildInputs = [ pkg-config ];

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

+4 −2
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
  pytest-asyncio,

  pytest-lazy-fixture,

  pytestCheckHook,

  python-dateutil,

  qtile,

  requests,

  setuptools-scm,
@@ -19,14 +20,14 @@ 


buildPythonPackage rec {

  pname = "qtile-extras";

  version = "0.25.0";

  version = "0.26.0";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "elParaguayo";

    repo = "qtile-extras";

    rev = "refs/tags/v${version}";

    hash = "sha256-OYzSKOVg4D5gKxaEreclYq3D16dl8ddLipSdifokDNY=";

    hash = "sha256-ywqZggn1k7zezk5CS1y6EWZfLoIWMHmGO8mvqxBaB9g=";

  };



  build-system = [ setuptools-scm ];
@@ -41,6 +42,7 @@ buildPythonPackage rec { 
    pytest-asyncio

    pytest-lazy-fixture

    pytestCheckHook

    python-dateutil

    qtile

    requests

    xorgserver

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

+12 −12
Original line number Diff line number Diff line
@@ -4,9 +4,9 @@ 
  fetchFromGitHub,

  cairocffi,

  dbus-next,

  dbus-python,

  glib,

  iwlib,

  libcst,

  libdrm,

  libinput,

  libxkbcommon,
@@ -17,7 +17,7 @@ 
  psutil,

  pulsectl-asyncio,

  pygobject3,

  python-dateutil,

  pytz,

  pywayland,

  pywlroots,

  pyxdg,
@@ -34,14 +34,14 @@ 


buildPythonPackage rec {

  pname = "qtile";

  version = "0.25.0";

  version = "0.26.0";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "qtile";

    repo = "qtile";

    rev = "refs/tags/v${version}";

    hash = "sha256-j5hpXfUSDUT9nBr6CafIzqdTYQxSWok+ZlQA7bGdVvk=";

    hash = "sha256-htgrfGBGRlJSm88mmwW92ikXR/M1lr0OTom16TIvdpo=";

  };



  patches = [
@@ -50,14 +50,14 @@ buildPythonPackage rec { 


  postPatch = ''

    substituteInPlace libqtile/pangocffi.py \

      --replace libgobject-2.0.so.0 ${glib.out}/lib/libgobject-2.0.so.0 \

      --replace libpangocairo-1.0.so.0 ${pango.out}/lib/libpangocairo-1.0.so.0 \

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

      --replace-fail libgobject-2.0.so.0 ${glib.out}/lib/libgobject-2.0.so.0 \

      --replace-fail libpangocairo-1.0.so.0 ${pango.out}/lib/libpangocairo-1.0.so.0 \

      --replace-fail 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

      --replace-fail 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

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

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

  '';



  build-system = [
@@ -69,13 +69,13 @@ buildPythonPackage rec { 
  dependencies = [

    (cairocffi.override { withXcffib = true; })

    dbus-next

    dbus-python

    iwlib

    libcst

    mpd2

    psutil

    pulsectl-asyncio

    pygobject3

    python-dateutil

    pytz

    pywayland

    pywlroots

    pyxdg

pkgs/top-level/python-packages.nix

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















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













    wlroots = pkgs.wlroots_0_16;













    wlroots = pkgs.wlroots_0_17;















  };





























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










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













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





























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













    wlroots = pkgs.wlroots_0_16;













    wlroots = pkgs.wlroots_0_17;















  };















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