python3Packages.python-xlib: rename from xlib (#534038)

2026-07-21 08:01:31 +00:00 · 2026-06-22 00:22:28 +00:00
parent e8f2f5af6c efd93a2640
commit a9f0e7a8aa
41 changed files with 58 additions and 57 deletions
--- 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;

--- 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 = [
--- 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
--- 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 \
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 = ''
--- 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
  ];

--- 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 = ''
--- 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 = [
--- 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
    ];
--- 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 ];

--- 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
--- 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; [
--- 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
    ]
--- 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 = ''
--- 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
    ]);
--- 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
--- 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
  ];
--- 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
--- 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;
--- 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
  ];

--- 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";
--- 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
  ];

--- 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 = [
--- 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 ]
--- 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
--- 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
  ];

--- 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
--- 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
--- 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 ''
--- 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 ];
--- a/pkgs/development/python-modules/python-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;

--- 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 [
--- 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
  ];

--- 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;
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -659,6 +659,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
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16405,6 +16405,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 { };