qtile: move to python-modules

This commit is contained in:
Arjan Schrijver 2023-05-10 14:51:37 +02:00
parent 0a61fd3de2
commit f35a3d2dcc
8 changed files with 36 additions and 24 deletions

View file

@ -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;
})

View file

@ -6,7 +6,7 @@
, xorgserver , xorgserver
, pulseaudio , pulseaudio
, pytest-asyncio , pytest-asyncio
, qtile-unwrapped , qtile
, keyring , keyring
, requests , requests
, stravalib , stravalib
@ -34,7 +34,7 @@ buildPythonPackage rec {
]; ];
checkInputs = [ checkInputs = [
pytest-asyncio pytest-asyncio
qtile-unwrapped qtile
pulseaudio pulseaudio
keyring keyring
requests requests

View file

@ -1,20 +1,33 @@
{ lib { lib
, buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, python3 , cairocffi
, python3Packages , dbus-next
, mypy , dbus-python
, glib , glib
, pango
, pkg-config
, libinput , libinput
, libxkbcommon , libxkbcommon
, mpd2
, mypy
, pango
, pkg-config
, psutil
, pulseaudio
, pygobject3
, python-dateutil
, pywayland
, pywlroots
, pyxdg
, setuptools
, setuptools-scm
, wayland , wayland
, wlroots , wlroots
, xcbutilcursor , xcbutilcursor
, pulseaudio , xcffib
, xkbcommon
}: }:
python3Packages.buildPythonPackage rec { buildPythonPackage rec {
pname = "qtile"; pname = "qtile";
version = "0.22.1"; version = "0.22.1";
@ -42,14 +55,13 @@ python3Packages.buildPythonPackage rec {
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
] ++ (with python3Packages; [
setuptools-scm setuptools-scm
]); setuptools
];
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = [
xcffib xcffib
(cairocffi.override { withXcffib = true; }) (cairocffi.override { withXcffib = true; })
setuptools
python-dateutil python-dateutil
dbus-python dbus-python
dbus-next dbus-next

View file

@ -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;
})

View file

@ -1405,6 +1405,7 @@ mapAliases ({
qt515 = qt5; # Added 2022-11-24 qt515 = qt5; # Added 2022-11-24
qt5ct = libsForQt5.qt5ct; # Added 2021-12-27 qt5ct = libsForQt5.qt5ct; # Added 2021-12-27
qtcurve = libsForQt5.qtcurve; # Added 2020-11-07 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 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 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 quagga = throw "quagga is no longer maintained upstream"; # Added 2021-04-22

View file

@ -34635,8 +34635,7 @@ with pkgs;
qpdfview = libsForQt5.callPackage ../applications/office/qpdfview { }; qpdfview = libsForQt5.callPackage ../applications/office/qpdfview { };
qtile-unwrapped = callPackage ../applications/window-managers/qtile { }; qtile = callPackage ../development/python-modules/qtile/wrapper.nix { };
qtile = callPackage ../applications/window-managers/qtile/wrapper.nix { };
vimgolf = callPackage ../games/vimgolf { }; vimgolf = callPackage ../games/vimgolf { };

View file

@ -10158,6 +10158,7 @@ self: super: with self; {
qtconsole = callPackage ../development/python-modules/qtconsole { }; qtconsole = callPackage ../development/python-modules/qtconsole { };
qtile = callPackage ../development/python-modules/qtile { };
qtile-extras = callPackage ../development/python-modules/qtile-extras { }; qtile-extras = callPackage ../development/python-modules/qtile-extras { };
qtpy = callPackage ../development/python-modules/qtpy { }; qtpy = callPackage ../development/python-modules/qtpy { };