Merge pull request #231252 from arjan-s/qtile-to-python-modules

qtile: move to python-modules

8 files changed, 36 insertions, 24 deletions

diff --git a/pkgs/applications/window-managers/qtile/wrapper.nix b/pkgs/applications/window-managers/qtile/wrapper.nix
deleted file mode 100644
index 8cb5596a84468..0000000000000
--- a/pkgs/applications/window-managers/qtile/wrapper.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ python3, qtile-unwrapped }:
-(python3.withPackages (_: [ qtile-unwrapped ])).overrideAttrs (_: {
-  # otherwise will be exported as "env", this restores `nix search` behavior
-  name = "${qtile-unwrapped.pname}-${qtile-unwrapped.version}";
-  # export underlying qtile package
-  passthru = { unwrapped = qtile-unwrapped; };
-  # restore original qtile attrs
-  inherit (qtile-unwrapped) pname version meta;
-})
diff --git a/pkgs/development/python-modules/qtile-extras/default.nix b/pkgs/development/python-modules/qtile-extras/default.nix
index 3ba8f9487d58f..44e6a2dcc906c 100644
--- a/pkgs/development/python-modules/qtile-extras/default.nix
+++ b/pkgs/development/python-modules/qtile-extras/default.nix
@@ -6,7 +6,7 @@
 , xorgserver
 , pulseaudio
 , pytest-asyncio
-, qtile-unwrapped
+, qtile
 , keyring
 , requests
 , stravalib
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   ];
   checkInputs = [
     pytest-asyncio
-    qtile-unwrapped
+    qtile
     pulseaudio
     keyring
     requests
diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/development/python-modules/qtile/default.nix
index 173dc919c74e9..bf3f59dcb3bbd 100644
--- a/pkgs/applications/window-managers/qtile/default.nix
+++ b/pkgs/development/python-modules/qtile/default.nix
@@ -1,20 +1,33 @@
 { lib
+, buildPythonPackage
 , fetchFromGitHub
-, python3
-, python3Packages
-, mypy
+, cairocffi
+, dbus-next
+, dbus-python
 , glib
-, pango
-, pkg-config
 , libinput
 , libxkbcommon
+, mpd2
+, mypy
+, pango
+, pkg-config
+, psutil
+, pulseaudio
+, pygobject3
+, python-dateutil
+, pywayland
+, pywlroots
+, pyxdg
+, setuptools
+, setuptools-scm
 , wayland
 , wlroots
 , xcbutilcursor
-, pulseaudio
+, xcffib
+, xkbcommon
 }:
 
-python3Packages.buildPythonPackage rec {
+buildPythonPackage rec {
   pname = "qtile";
   version = "0.22.1";
 
@@ -42,14 +55,13 @@ python3Packages.buildPythonPackage rec {
 
   nativeBuildInputs = [
     pkg-config
-  ] ++ (with python3Packages; [
     setuptools-scm
-  ]);
+    setuptools
+  ];
 
-  propagatedBuildInputs = with python3Packages; [
+  propagatedBuildInputs = [
     xcffib
     (cairocffi.override { withXcffib = true; })
-    setuptools
     python-dateutil
     dbus-python
     dbus-next
diff --git a/pkgs/applications/window-managers/qtile/fix-restart.patch b/pkgs/development/python-modules/qtile/fix-restart.patch
index eca4f0866342f..eca4f0866342f 100644
--- a/pkgs/applications/window-managers/qtile/fix-restart.patch
+++ b/pkgs/development/python-modules/qtile/fix-restart.patch
diff --git a/pkgs/development/python-modules/qtile/wrapper.nix b/pkgs/development/python-modules/qtile/wrapper.nix
new file mode 100644
index 0000000000000..b4f6e4c2e23b2
--- /dev/null
+++ b/pkgs/development/python-modules/qtile/wrapper.nix
@@ -0,0 +1,8 @@
+{ python3 }:
+
+(python3.withPackages (_: [ python3.pkgs.qtile ])).overrideAttrs (_: {
+  # restore some qtile attrs, beautify name
+  inherit (python3.pkgs.qtile) pname version meta;
+  name = with python3.pkgs.qtile; "${pname}-${version}";
+  passthru.unwrapped = python3.pkgs.qtile;
+})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 9649879e18f87..45f89834a1e68 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1415,6 +1415,7 @@ mapAliases ({
   qt515 = qt5;  # Added 2022-11-24
   qt5ct = libsForQt5.qt5ct; # Added 2021-12-27
   qtcurve = libsForQt5.qtcurve; # Added 2020-11-07
+  qtile-unwrapped = python3.pkgs.qtile; # Added 2023-05-12
   qtkeychain = throw "the qtkeychain attribute (qt4 version) has been removes, use the qt5 version: libsForQt5.qtkeychain"; # Added 2021-08-04
   qtscriptgenerator = throw "'qtscriptgenerator' (Qt4) is unmaintained upstream and not used in nixpkgs"; # Added 2022-06-14
   quagga = throw "quagga is no longer maintained upstream"; # Added 2021-04-22
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4ccc1d0f64af3..d7603df17ad36 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -34818,8 +34818,7 @@ with pkgs;
 
   qpdfview = libsForQt5.callPackage ../applications/office/qpdfview { };
 
-  qtile-unwrapped = callPackage ../applications/window-managers/qtile { };
-  qtile = callPackage ../applications/window-managers/qtile/wrapper.nix { };
+  qtile = callPackage ../development/python-modules/qtile/wrapper.nix { };
 
   vimgolf = callPackage ../games/vimgolf { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8a87eb2405671..d21ca37898c08 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10246,6 +10246,7 @@ self: super: with self; {
 
   qtconsole = callPackage ../development/python-modules/qtconsole { };
 
+  qtile = callPackage ../development/python-modules/qtile { };
   qtile-extras = callPackage ../development/python-modules/qtile-extras { };
 
   qtpy = callPackage ../development/python-modules/qtpy { };