From f35a3d2dcc7dc1d843d6759175288ac564c7bf32 Mon Sep 17 00:00:00 2001 From: Arjan Schrijver Date: Wed, 10 May 2023 14:51:37 +0200 Subject: [PATCH] qtile: move to python-modules --- .../window-managers/qtile/wrapper.nix | 9 ----- .../python-modules/qtile-extras/default.nix | 4 +-- .../python-modules}/qtile/default.nix | 34 +++++++++++++------ .../python-modules}/qtile/fix-restart.patch | 0 .../python-modules/qtile/wrapper.nix | 8 +++++ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 3 +- pkgs/top-level/python-packages.nix | 1 + 8 files changed, 36 insertions(+), 24 deletions(-) delete mode 100644 pkgs/applications/window-managers/qtile/wrapper.nix rename pkgs/{applications/window-managers => development/python-modules}/qtile/default.nix (88%) rename pkgs/{applications/window-managers => development/python-modules}/qtile/fix-restart.patch (100%) create mode 100644 pkgs/development/python-modules/qtile/wrapper.nix diff --git a/pkgs/applications/window-managers/qtile/wrapper.nix b/pkgs/applications/window-managers/qtile/wrapper.nix deleted file mode 100644 index 8cb5596a844..00000000000 --- 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 3ba8f9487d5..44e6a2dcc90 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 similarity index 88% rename from pkgs/applications/window-managers/qtile/default.nix rename to pkgs/development/python-modules/qtile/default.nix index 173dc919c74..bf3f59dcb3b 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 similarity index 100% rename from pkgs/applications/window-managers/qtile/fix-restart.patch rename to 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 00000000000..b4f6e4c2e23 --- /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 c22d2e9f65c..1ad06ead3d5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1405,6 +1405,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 b5ac28e8f05..ad18acc6b10 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34635,8 +34635,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 7e3021fe6a9..a59e039cc43 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10158,6 +10158,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 { };