Unverified Commit 6826212c authored by Ryan Lahfa's avatar Ryan Lahfa Committed by GitHub
Browse files

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

qtile: move to python-modules
parents f2262b21 f35a3d2d
Loading
Loading
Loading
Loading
+0 −9
Original line number Diff line number Diff line
{ 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;
})
+2 −2
Original line number Diff line number Diff line
@@ -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
+23 −11
Original line number Diff line number Diff line
{ 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
+8 −0
Original line number Diff line number Diff line
{ 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;
})
Loading