From efd93a264038013829671f7c96c9b2e25a1a8f2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 21 Jun 2026 14:03:28 -0700 Subject: [PATCH] python3Packages.python-xlib: rename from xlib The project name (e.g. on PyPI) is python-xlib. --- .../elisp-packages/manual-packages/holo-layer/package.nix | 2 +- pkgs/applications/office/activitywatch/default.nix | 4 ++-- pkgs/by-name/au/autokey/package.nix | 2 +- pkgs/by-name/di/discover-overlay/package.nix | 2 +- pkgs/by-name/do/dockbarx/package.nix | 2 +- pkgs/by-name/gs/gscreenshot/package.nix | 2 +- pkgs/by-name/gw/gwe/package.nix | 2 +- pkgs/by-name/ha/handheld-daemon/package.nix | 2 +- pkgs/by-name/he/herbstluftwm/package.nix | 2 +- pkgs/by-name/hu/hushboard/package.nix | 2 +- pkgs/by-name/i3/i3-swallow/package.nix | 2 +- pkgs/by-name/jo/joystickwake/package.nix | 2 +- pkgs/by-name/ka/kazam/package.nix | 2 +- pkgs/by-name/ke/keyd/package.nix | 2 +- pkgs/by-name/pl/plasma-hud/package.nix | 2 +- pkgs/by-name/sa/safeeyes/package.nix | 2 +- pkgs/by-name/so/solaar/package.nix | 2 +- pkgs/by-name/st/streamdeck-ui/package.nix | 2 +- pkgs/by-name/sw/sway-assign-cgroups/package.nix | 2 +- pkgs/by-name/tu/tuifimanager/package.nix | 2 +- pkgs/by-name/um/umu-launcher-unwrapped/package.nix | 2 +- pkgs/by-name/xk/xkeysnail/package.nix | 2 +- pkgs/by-name/xp/xpaste/package.nix | 2 +- pkgs/development/python-modules/ewmh/default.nix | 4 ++-- pkgs/development/python-modules/ewmhlib/default.nix | 4 ++-- pkgs/development/python-modules/i3ipc/default.nix | 4 ++-- pkgs/development/python-modules/mouseinfo/default.nix | 4 ++-- pkgs/development/python-modules/plover/4.nix | 4 ++-- pkgs/development/python-modules/plover/5.nix | 4 ++-- pkgs/development/python-modules/pyautogui/default.nix | 4 ++-- pkgs/development/python-modules/pymonctl/default.nix | 4 ++-- pkgs/development/python-modules/pynput/default.nix | 4 ++-- pkgs/development/python-modules/pynputfix/default.nix | 4 ++-- pkgs/development/python-modules/pyscreeze/default.nix | 4 ++-- pkgs/development/python-modules/pystray/default.nix | 4 ++-- .../python-modules/{xlib => python-xlib}/default.nix | 2 +- pkgs/development/python-modules/pywinbox/default.nix | 4 ++-- pkgs/development/python-modules/pywinctl/default.nix | 4 ++-- pkgs/development/python-modules/ueberzug/default.nix | 4 ++-- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 4 ++-- 41 files changed, 58 insertions(+), 57 deletions(-) rename pkgs/development/python-modules/{xlib => python-xlib}/default.nix (97%) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/holo-layer/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/holo-layer/package.nix index 082579c45068..0b20ac1d399c 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/holo-layer/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/holo-layer/package.nix @@ -22,7 +22,7 @@ let pyqt6-sip sexpdata six - xlib + python-xlib ]; pythonEnv = python3.withPackages pythonPkgs; diff --git a/pkgs/applications/office/activitywatch/default.nix b/pkgs/applications/office/activitywatch/default.nix index 8b291b54995b..50e158704a5d 100644 --- a/pkgs/applications/office/activitywatch/default.nix +++ b/pkgs/applications/office/activitywatch/default.nix @@ -40,7 +40,7 @@ rec { dependencies = with python3Packages; [ aw-client - xlib + python-xlib pynput ]; @@ -70,7 +70,7 @@ rec { dependencies = with python3Packages; [ aw-client - xlib + python-xlib ]; pythonRelaxDeps = [ diff --git a/pkgs/by-name/au/autokey/package.nix b/pkgs/by-name/au/autokey/package.nix index 99e85f089f4b..f20e3906ea1e 100644 --- a/pkgs/by-name/au/autokey/package.nix +++ b/pkgs/by-name/au/autokey/package.nix @@ -67,7 +67,7 @@ python3Packages.buildPythonApplication (finalAttrs: { dependencies = with python3Packages; [ dbus-python pyinotify - xlib + python-xlib pygobject3 packaging standard-imghdr diff --git a/pkgs/by-name/di/discover-overlay/package.nix b/pkgs/by-name/di/discover-overlay/package.nix index 521ff49a587b..3fe58531f832 100644 --- a/pkgs/by-name/di/discover-overlay/package.nix +++ b/pkgs/by-name/di/discover-overlay/package.nix @@ -45,7 +45,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { requests pillow setuptools - xlib + python-xlib ]; postPatch = '' substituteInPlace discover_overlay/image_getter.py \ diff --git a/pkgs/by-name/do/dockbarx/package.nix b/pkgs/by-name/do/dockbarx/package.nix index 7c7f20fd283c..d26dd806c34c 100644 --- a/pkgs/by-name/do/dockbarx/package.nix +++ b/pkgs/by-name/do/dockbarx/package.nix @@ -44,7 +44,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pillow pygobject3 pyxdg - xlib + python-xlib ]; # no tests diff --git a/pkgs/by-name/gs/gscreenshot/package.nix b/pkgs/by-name/gs/gscreenshot/package.nix index e12dfc39947d..7559182dc050 100644 --- a/pkgs/by-name/gs/gscreenshot/package.nix +++ b/pkgs/by-name/gs/gscreenshot/package.nix @@ -52,7 +52,7 @@ python3Packages.buildPythonApplication (finalAttrs: { scrot slop xclip - python3Packages.xlib + python3Packages.python-xlib ] ++ (with python3Packages; [ pillow diff --git a/pkgs/by-name/gw/gwe/package.nix b/pkgs/by-name/gw/gwe/package.nix index 848df337bc3d..4b8640e6e163 100644 --- a/pkgs/by-name/gw/gwe/package.nix +++ b/pkgs/by-name/gw/gwe/package.nix @@ -25,7 +25,7 @@ let peewee pynvml pygobject3 - xlib + python-xlib pyxdg requests rx diff --git a/pkgs/by-name/ha/handheld-daemon/package.nix b/pkgs/by-name/ha/handheld-daemon/package.nix index b9f075e7a415..c13f6c85b96f 100644 --- a/pkgs/by-name/ha/handheld-daemon/package.nix +++ b/pkgs/by-name/ha/handheld-daemon/package.nix @@ -88,7 +88,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pyyaml rich setuptools - xlib + python-xlib pyroute2 pygobject3 dbus-python diff --git a/pkgs/by-name/he/herbstluftwm/package.nix b/pkgs/by-name/he/herbstluftwm/package.nix index 202fef89c74c..f3d8da4a5c2d 100644 --- a/pkgs/by-name/he/herbstluftwm/package.nix +++ b/pkgs/by-name/he/herbstluftwm/package.nix @@ -105,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: { ps: with ps; [ ewmh pytest - xlib + python-xlib ] )) xdotool diff --git a/pkgs/by-name/hu/hushboard/package.nix b/pkgs/by-name/hu/hushboard/package.nix index 03707922ca67..239994d636f5 100644 --- a/pkgs/by-name/hu/hushboard/package.nix +++ b/pkgs/by-name/hu/hushboard/package.nix @@ -49,7 +49,7 @@ python3Packages.buildPythonApplication { pycairo pygobject3 six - xlib + python-xlib ]; postPatch = '' diff --git a/pkgs/by-name/i3/i3-swallow/package.nix b/pkgs/by-name/i3/i3-swallow/package.nix index c36c2cd2a01e..d3a7637d7df6 100644 --- a/pkgs/by-name/i3/i3-swallow/package.nix +++ b/pkgs/by-name/i3/i3-swallow/package.nix @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication { propagatedBuildInputs = [ python3Packages.i3ipc - python3Packages.xlib + python3Packages.python-xlib python3Packages.six ]; diff --git a/pkgs/by-name/jo/joystickwake/package.nix b/pkgs/by-name/jo/joystickwake/package.nix index f455d91fd88d..e8001e3273f4 100644 --- a/pkgs/by-name/jo/joystickwake/package.nix +++ b/pkgs/by-name/jo/joystickwake/package.nix @@ -22,7 +22,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { dependencies = with python3.pkgs; [ dbus-fast pyudev - xlib + python-xlib ]; postInstall = '' diff --git a/pkgs/by-name/ka/kazam/package.nix b/pkgs/by-name/ka/kazam/package.nix index fa1240ad5927..ab5de46ff6a2 100644 --- a/pkgs/by-name/ka/kazam/package.nix +++ b/pkgs/by-name/ka/kazam/package.nix @@ -56,7 +56,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pyxdg pycairo dbus-python - xlib + python-xlib ]; patches = [ diff --git a/pkgs/by-name/ke/keyd/package.nix b/pkgs/by-name/ke/keyd/package.nix index f041a188abb5..57283ccebad9 100644 --- a/pkgs/by-name/ke/keyd/package.nix +++ b/pkgs/by-name/ke/keyd/package.nix @@ -28,7 +28,7 @@ let ''; propagatedBuildInputs = with python3Packages; [ - xlib + python-xlib pygobject3.out dbus-python.out ]; diff --git a/pkgs/by-name/pl/plasma-hud/package.nix b/pkgs/by-name/pl/plasma-hud/package.nix index 0b74881f08ef..8e9e973966ab 100644 --- a/pkgs/by-name/pl/plasma-hud/package.nix +++ b/pkgs/by-name/pl/plasma-hud/package.nix @@ -29,7 +29,7 @@ python3Packages.buildPythonApplication (finalAttrs: { dbus-python pygobject3 setproctitle - xlib + python-xlib ]) ++ [ rofi ]; diff --git a/pkgs/by-name/sa/safeeyes/package.nix b/pkgs/by-name/sa/safeeyes/package.nix index 7b65b3176203..8821221d9f70 100644 --- a/pkgs/by-name/sa/safeeyes/package.nix +++ b/pkgs/by-name/sa/safeeyes/package.nix @@ -43,7 +43,7 @@ python3Packages.buildPythonApplication (finalAttrs: { dependencies = with python3Packages; [ babel psutil - xlib + python-xlib pygobject3 dbus-python packaging diff --git a/pkgs/by-name/so/solaar/package.nix b/pkgs/by-name/so/solaar/package.nix index 2bd83cb0d174..ddef3ae472b0 100644 --- a/pkgs/by-name/so/solaar/package.nix +++ b/pkgs/by-name/so/solaar/package.nix @@ -56,7 +56,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pyudev pyyaml typing-extensions - xlib + python-xlib ]; nativeCheckInputs = with python3Packages; [ diff --git a/pkgs/by-name/st/streamdeck-ui/package.nix b/pkgs/by-name/st/streamdeck-ui/package.nix index e7f5de41a2b3..c1de94ac7194 100644 --- a/pkgs/by-name/st/streamdeck-ui/package.nix +++ b/pkgs/by-name/st/streamdeck-ui/package.nix @@ -49,7 +49,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pynput pyside6 streamdeck - xlib + python-xlib importlib-metadata evdev ] diff --git a/pkgs/by-name/sw/sway-assign-cgroups/package.nix b/pkgs/by-name/sw/sway-assign-cgroups/package.nix index 234a5d9aeb11..4b92ebe7309b 100644 --- a/pkgs/by-name/sw/sway-assign-cgroups/package.nix +++ b/pkgs/by-name/sw/sway-assign-cgroups/package.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication (finalAttrs: { i3ipc psutil tenacity - xlib + python-xlib ]; installPhase = '' diff --git a/pkgs/by-name/tu/tuifimanager/package.nix b/pkgs/by-name/tu/tuifimanager/package.nix index c841cbb4ffc5..1b59710031e3 100644 --- a/pkgs/by-name/tu/tuifimanager/package.nix +++ b/pkgs/by-name/tu/tuifimanager/package.nix @@ -52,7 +52,7 @@ lib.throwIf (enableDragAndDrop && !hasDndSupport) python3Packages.pynput python3Packages.pyside6 python3Packages.requests - python3Packages.xlib + python3Packages.python-xlib kdePackages.qtbase kdePackages.qt6gtk2 ]); diff --git a/pkgs/by-name/um/umu-launcher-unwrapped/package.nix b/pkgs/by-name/um/umu-launcher-unwrapped/package.nix index 7654caff923f..8bd55621ae89 100644 --- a/pkgs/by-name/um/umu-launcher-unwrapped/package.nix +++ b/pkgs/by-name/um/umu-launcher-unwrapped/package.nix @@ -50,7 +50,7 @@ python3Packages.buildPythonPackage rec { [ pyzstd urllib3 - xlib + python-xlib ] ++ lib.optionals withTruststore [ truststore diff --git a/pkgs/by-name/xk/xkeysnail/package.nix b/pkgs/by-name/xk/xkeysnail/package.nix index c9c50863f34c..06fc6f0a30b2 100644 --- a/pkgs/by-name/xk/xkeysnail/package.nix +++ b/pkgs/by-name/xk/xkeysnail/package.nix @@ -28,7 +28,7 @@ python3Packages.buildPythonApplication { dependencies = with python3Packages; [ evdev - xlib + python-xlib inotify-simple appdirs ]; diff --git a/pkgs/by-name/xp/xpaste/package.nix b/pkgs/by-name/xp/xpaste/package.nix index ab5e02c9f139..dcbea1e8940f 100644 --- a/pkgs/by-name/xp/xpaste/package.nix +++ b/pkgs/by-name/xp/xpaste/package.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication (finalAttrs: { build-system = with python3Packages; [ setuptools ]; dependencies = with python3Packages; [ - xlib + python-xlib ]; # no tests, no python module to import, no version output to check diff --git a/pkgs/development/python-modules/ewmh/default.nix b/pkgs/development/python-modules/ewmh/default.nix index 9819f036887b..7acff2a6b90b 100644 --- a/pkgs/development/python-modules/ewmh/default.nix +++ b/pkgs/development/python-modules/ewmh/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchPypi, - xlib, + python-xlib, }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "0g9l14my3v8zlgq1yd8wh5gpara0qcapsfmvg7lq2lapglzhjsy5"; }; - propagatedBuildInputs = [ xlib ]; + propagatedBuildInputs = [ python-xlib ]; # No tests included doCheck = false; diff --git a/pkgs/development/python-modules/ewmhlib/default.nix b/pkgs/development/python-modules/ewmhlib/default.nix index f4c1cbc834de..f488eecad91c 100644 --- a/pkgs/development/python-modules/ewmhlib/default.nix +++ b/pkgs/development/python-modules/ewmhlib/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, setuptools, - xlib, + python-xlib, typing-extensions, }: @@ -23,7 +23,7 @@ buildPythonPackage (finalAttrs: { build-system = [ setuptools ]; dependencies = [ - xlib + python-xlib typing-extensions ]; diff --git a/pkgs/development/python-modules/i3ipc/default.nix b/pkgs/development/python-modules/i3ipc/default.nix index e5992995c23d..32eab47c531d 100644 --- a/pkgs/development/python-modules/i3ipc/default.nix +++ b/pkgs/development/python-modules/i3ipc/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, coreutils, setuptools, - xlib, + python-xlib, fontconfig, pytestCheckHook, writableTmpDirAsHomeHook, @@ -41,7 +41,7 @@ buildPythonPackage rec { ''; build-system = [ setuptools ]; - dependencies = [ xlib ]; + dependencies = [ python-xlib ]; # Fontconfig error: Cannot load default config file env.FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; diff --git a/pkgs/development/python-modules/mouseinfo/default.nix b/pkgs/development/python-modules/mouseinfo/default.nix index d19cc6fe82ae..1cc01a040c0e 100644 --- a/pkgs/development/python-modules/mouseinfo/default.nix +++ b/pkgs/development/python-modules/mouseinfo/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, pyperclip, fetchFromGitHub, - xlib, + python-xlib, pillow, }: buildPythonPackage { @@ -29,7 +29,7 @@ buildPythonPackage { propagatedBuildInputs = [ pyperclip - xlib + python-xlib pillow ]; diff --git a/pkgs/development/python-modules/plover/4.nix b/pkgs/development/python-modules/plover/4.nix index 50a262bf043c..faab089fdc09 100644 --- a/pkgs/development/python-modules/plover/4.nix +++ b/pkgs/development/python-modules/plover/4.nix @@ -17,7 +17,7 @@ setuptools, wcwidth, wheel, - xlib, + python-xlib, wrapQtAppsHook, }: @@ -54,7 +54,7 @@ buildPythonPackage (finalAttrs: { rtf-tokenize setuptools wcwidth - xlib + python-xlib ]; optional-dependencies = { gui-qt = [ diff --git a/pkgs/development/python-modules/plover/5.nix b/pkgs/development/python-modules/plover/5.nix index 9a5db28094f0..d37519c51751 100644 --- a/pkgs/development/python-modules/plover/5.nix +++ b/pkgs/development/python-modules/plover/5.nix @@ -25,7 +25,7 @@ setuptools, wcwidth, wheel, - xlib, + python-xlib, qtbase, wrapQtAppsHook, hidapi, @@ -105,7 +105,7 @@ buildPythonPackage (finalAttrs: { setuptools wcwidth xkbcommon - xlib + python-xlib ] ++ readme-renderer.optional-dependencies.md ++ lib.optionals stdenv.hostPlatform.isLinux [ evdev ] diff --git a/pkgs/development/python-modules/pyautogui/default.nix b/pkgs/development/python-modules/pyautogui/default.nix index 24d8f0c064cc..950964726973 100644 --- a/pkgs/development/python-modules/pyautogui/default.nix +++ b/pkgs/development/python-modules/pyautogui/default.nix @@ -10,7 +10,7 @@ pyscreeze, pytweening, tkinter, - xlib, + python-xlib, xvfb-run, scrot, }: @@ -39,7 +39,7 @@ buildPythonPackage (finalAttrs: { mouseinfo pygetwindow pymsgbox - xlib + python-xlib tkinter pyperclip pyscreeze diff --git a/pkgs/development/python-modules/pymonctl/default.nix b/pkgs/development/python-modules/pymonctl/default.nix index 7a434581e95e..00b36dd2492d 100644 --- a/pkgs/development/python-modules/pymonctl/default.nix +++ b/pkgs/development/python-modules/pymonctl/default.nix @@ -6,7 +6,7 @@ setuptools, ewmhlib, - xlib, + python-xlib, typing-extensions, }: @@ -26,7 +26,7 @@ buildPythonPackage (finalAttrs: { dependencies = [ ewmhlib - xlib + python-xlib typing-extensions ]; diff --git a/pkgs/development/python-modules/pynput/default.nix b/pkgs/development/python-modules/pynput/default.nix index d27999d63045..42ff4270355a 100644 --- a/pkgs/development/python-modules/pynput/default.nix +++ b/pkgs/development/python-modules/pynput/default.nix @@ -11,7 +11,7 @@ sphinx, # dependencies - xlib, + python-xlib, evdev, six, pyobjc-framework-ApplicationServices, @@ -53,7 +53,7 @@ buildPythonPackage rec { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ evdev - xlib + python-xlib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # the darwin backend imports HIServices (ApplicationServices) and Quartz diff --git a/pkgs/development/python-modules/pynputfix/default.nix b/pkgs/development/python-modules/pynputfix/default.nix index 90fc331e5aa8..fd5eb1826127 100644 --- a/pkgs/development/python-modules/pynputfix/default.nix +++ b/pkgs/development/python-modules/pynputfix/default.nix @@ -11,7 +11,7 @@ sphinx, # dependencies - xlib, + python-xlib, evdev, six, @@ -52,7 +52,7 @@ buildPythonPackage { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ evdev - xlib + python-xlib ]; doCheck = false; # requires running X server diff --git a/pkgs/development/python-modules/pyscreeze/default.nix b/pkgs/development/python-modules/pyscreeze/default.nix index 8205dd6a5bc6..9d09cdacfb8d 100644 --- a/pkgs/development/python-modules/pyscreeze/default.nix +++ b/pkgs/development/python-modules/pyscreeze/default.nix @@ -4,7 +4,7 @@ buildPythonPackage, fetchFromGitHub, pillow, - xlib, + python-xlib, xvfb-run, scrot, }: @@ -24,7 +24,7 @@ buildPythonPackage { doCheck = stdenv.hostPlatform.isLinux; nativeCheckInputs = lib.optionals stdenv.hostPlatform.isLinux [ scrot - xlib + python-xlib xvfb-run ]; checkPhase = lib.optionalString stdenv.hostPlatform.isLinux '' diff --git a/pkgs/development/python-modules/pystray/default.nix b/pkgs/development/python-modules/pystray/default.nix index d10b65fd4089..107d5508098c 100644 --- a/pkgs/development/python-modules/pystray/default.nix +++ b/pkgs/development/python-modules/pystray/default.nix @@ -10,7 +10,7 @@ pygobject3, gtk3, stdenv, - xlib, + python-xlib, libayatana-appindicator, pyobjc-framework-Quartz, xvfb-run, @@ -55,7 +55,7 @@ buildPythonPackage rec { gtk3 ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - xlib + python-xlib libayatana-appindicator ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ pyobjc-framework-Quartz ]; diff --git a/pkgs/development/python-modules/xlib/default.nix b/pkgs/development/python-modules/python-xlib/default.nix similarity index 97% rename from pkgs/development/python-modules/xlib/default.nix rename to pkgs/development/python-modules/python-xlib/default.nix index 73c1ff3eca83..1bb1f5361d5f 100644 --- a/pkgs/development/python-modules/xlib/default.nix +++ b/pkgs/development/python-modules/python-xlib/default.nix @@ -15,7 +15,7 @@ }: buildPythonPackage rec { - pname = "xlib"; + pname = "python-xlib"; version = "0.33"; pyproject = true; diff --git a/pkgs/development/python-modules/pywinbox/default.nix b/pkgs/development/python-modules/pywinbox/default.nix index 63d18a832aa7..edbaf0aa6cdd 100644 --- a/pkgs/development/python-modules/pywinbox/default.nix +++ b/pkgs/development/python-modules/pywinbox/default.nix @@ -6,7 +6,7 @@ setuptools, ewmhlib, - xlib, + python-xlib, typing-extensions, pyobjc-core, pyobjc-framework-Cocoa, @@ -28,7 +28,7 @@ buildPythonPackage (finalAttrs: { dependencies = [ ewmhlib - xlib + python-xlib typing-extensions ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/development/python-modules/pywinctl/default.nix b/pkgs/development/python-modules/pywinctl/default.nix index 7fd8b154652f..47a678d76fff 100644 --- a/pkgs/development/python-modules/pywinctl/default.nix +++ b/pkgs/development/python-modules/pywinctl/default.nix @@ -6,7 +6,7 @@ ewmhlib, pymonctl, pywinbox, - xlib, + python-xlib, typing-extensions, }: @@ -28,7 +28,7 @@ buildPythonPackage (finalAttrs: { ewmhlib pymonctl pywinbox - xlib + python-xlib typing-extensions ]; diff --git a/pkgs/development/python-modules/ueberzug/default.nix b/pkgs/development/python-modules/ueberzug/default.nix index 71d98a4f7849..7b7f0328ceec 100644 --- a/pkgs/development/python-modules/ueberzug/default.nix +++ b/pkgs/development/python-modules/ueberzug/default.nix @@ -12,7 +12,7 @@ pillow, pkg-config, psutil, - xlib, + python-xlib, }: buildPythonPackage rec { @@ -43,7 +43,7 @@ buildPythonPackage rec { docopt pillow psutil - xlib + python-xlib ]; doCheck = false; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index e99e55652476..4cff4ad378c0 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -658,6 +658,7 @@ mapAliases { x11_hash = throw "'x11_hash' has been renamed to/replaced by 'x11-hash'"; # Converted to throw 2025-10-29 xapp = throw "'xapp' has been renamed to/replaced by 'python-xapp'"; # Converted to throw 2025-10-29 xbox-webapi = throw "xbox-webapi was removed because Home Assistant switched to python-xbox"; # added 2025-12-03 + xlib = python-xlib; # added 2026-06-21 XlsxWriter = throw "'XlsxWriter' has been renamed to/replaced by 'xlsxwriter'"; # Converted to throw 2025-10-29 y-py = throw "'y-py' has been removed as it was archived upstream; consider using 'pycrdt' instead"; # Added 2026-01-21 Yapsy = throw "'Yapsy' has been renamed to/replaced by 'yapsy'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1d0ef73df8c5..ff4beaa925d9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16407,6 +16407,8 @@ self: super: with self; { python-xbox = callPackage ../development/python-modules/python-xbox { }; + python-xlib = callPackage ../development/python-modules/python-xlib { }; + python-xmp-toolkit = callPackage ../development/python-modules/python-xmp-toolkit { }; python-xz = callPackage ../development/python-modules/python-xz { }; @@ -21829,8 +21831,6 @@ self: super: with self; { xknxproject = callPackage ../development/python-modules/xknxproject { }; - xlib = callPackage ../development/python-modules/xlib { }; - xlrd = callPackage ../development/python-modules/xlrd { }; xlsx2csv = callPackage ../development/python-modules/xlsx2csv { };