From d8dee65535b6dfd71281efb7dcb9d98afad3ad75 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Wed, 4 Feb 2026 18:55:16 +0100 Subject: [PATCH] {xcbutilcursor,xcb-util-cursor}: rename references and deprecate aliases this shouldn't create any rebuilds --- pkgs/applications/editors/android-studio/common.nix | 4 ++-- pkgs/applications/window-managers/awesome/default.nix | 4 ++-- pkgs/applications/window-managers/hyprwm/hypr/default.nix | 4 ++-- pkgs/applications/window-managers/i3/default.nix | 4 ++-- pkgs/by-name/al/alfaview/package.nix | 4 ++-- pkgs/by-name/be/bespokesynth/package.nix | 4 ++-- pkgs/by-name/ch/chow-centaur/package.nix | 4 ++-- pkgs/by-name/dk/dk/package.nix | 4 ++-- pkgs/by-name/li/librearp-lv2/package.nix | 4 ++-- pkgs/by-name/li/librearp/package.nix | 4 ++-- pkgs/by-name/po/polybar/package.nix | 4 ++-- pkgs/by-name/ro/rofi-unwrapped/package.nix | 4 ++-- pkgs/by-name/su/surge/package.nix | 4 ++-- pkgs/by-name/we/weston/package.nix | 4 ++-- pkgs/by-name/wm/wmutils-core/package.nix | 4 ++-- pkgs/by-name/wm/wmutils-libwm/package.nix | 4 ++-- pkgs/by-name/xm/xmoji/package.nix | 4 ++-- pkgs/by-name/xw/xwayland-satellite/package.nix | 4 ++-- pkgs/by-name/ya/yambar/package.nix | 4 ++-- pkgs/development/python-modules/qtile/default.nix | 4 ++-- pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 3 --- 22 files changed, 42 insertions(+), 43 deletions(-) diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 6526006ec5ef..0e46fd0178de 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -42,7 +42,7 @@ xcbutilrenderutil, xcbutilkeysyms, xcbutilimage, - xcbutilcursor, + libxcb-cursor, libxkbfile, libXcomposite, libXcursor, @@ -175,7 +175,7 @@ let xcbutilrenderutil xcbutilkeysyms xcbutilimage - xcbutilcursor + libxcb-cursor libice libsm libxkbfile diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 6c477bec07f2..4be852e0f0f4 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -22,7 +22,7 @@ libstartup_notification, libxdg_basedir, libpthreadstubs, - xcb-util-cursor, + libxcb-cursor, makeWrapper, pango, gobject-introspection, @@ -129,7 +129,7 @@ stdenv.mkDerivation rec { lua net-tools pango - xcb-util-cursor + libxcb-cursor libxau libxdmcp libxcb diff --git a/pkgs/applications/window-managers/hyprwm/hypr/default.nix b/pkgs/applications/window-managers/hyprwm/hypr/default.nix index 2d0d0e8209ad..73fc79d4c56a 100644 --- a/pkgs/applications/window-managers/hyprwm/hypr/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hypr/default.nix @@ -13,7 +13,7 @@ makeWrapper, pcre2, pkg-config, - xcbutilcursor, + libxcb-cursor, xcbutilkeysyms, xcbutilwm, xcbutil, @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { libXdmcp libxcb pcre2 - xcbutilcursor + libxcb-cursor xcbutilkeysyms xcbutilwm xcbutil diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 3eba467c0046..b1a2b94df040 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -17,7 +17,7 @@ pcre2, libev, yajl, - xcb-util-cursor, + libxcb-cursor, perl, pango, perlPackages, @@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { pcre2 libev yajl - xcb-util-cursor + libxcb-cursor perl pango perlPackages.AnyEventI3 diff --git a/pkgs/by-name/al/alfaview/package.nix b/pkgs/by-name/al/alfaview/package.nix index f75cb18919b2..fe9d38198f42 100644 --- a/pkgs/by-name/al/alfaview/package.nix +++ b/pkgs/by-name/al/alfaview/package.nix @@ -21,7 +21,7 @@ libgbm, openssl, systemd, - xcb-util-cursor, + libxcb-cursor, libxcb-wm, libxcb-render-util, libxcb-keysyms, @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { openssl stdenv.cc.cc systemd - xcb-util-cursor + libxcb-cursor libx11 libxcb-wm libxcb-image diff --git a/pkgs/by-name/be/bespokesynth/package.nix b/pkgs/by-name/be/bespokesynth/package.nix index fb8395362b05..804deddef8ca 100644 --- a/pkgs/by-name/be/bespokesynth/package.nix +++ b/pkgs/by-name/be/bespokesynth/package.nix @@ -25,7 +25,7 @@ xcbutil, libxkbcommon, xcbutilkeysyms, - xcb-util-cursor, + libxcb-cursor, gtk3, webkitgtk_4_1, python3, @@ -115,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: { xcbutil libxkbcommon xcbutilkeysyms - xcb-util-cursor + libxcb-cursor mount ]; diff --git a/pkgs/by-name/ch/chow-centaur/package.nix b/pkgs/by-name/ch/chow-centaur/package.nix index 08aae7013add..97fe2d31747e 100644 --- a/pkgs/by-name/ch/chow-centaur/package.nix +++ b/pkgs/by-name/ch/chow-centaur/package.nix @@ -6,7 +6,7 @@ pkg-config, cairo, libxkbcommon, - xcbutilcursor, + libxcb-cursor, xcbutilkeysyms, xcbutil, libXrandr, @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ cairo libxkbcommon - xcbutilcursor + libxcb-cursor xcbutilkeysyms xcbutil libXrandr diff --git a/pkgs/by-name/dk/dk/package.nix b/pkgs/by-name/dk/dk/package.nix index f0bfbba4c528..b357d7333fb5 100644 --- a/pkgs/by-name/dk/dk/package.nix +++ b/pkgs/by-name/dk/dk/package.nix @@ -5,7 +5,7 @@ xcbutil, xcbutilkeysyms, xcbutilwm, - xcb-util-cursor, + libxcb-cursor, }: stdenv.mkDerivation (finalAttrs: { @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { xcbutil xcbutilkeysyms xcbutilwm - xcb-util-cursor + libxcb-cursor ]; postPatch = '' diff --git a/pkgs/by-name/li/librearp-lv2/package.nix b/pkgs/by-name/li/librearp-lv2/package.nix index c1ee31ca9d1c..a5f920f5f7ed 100644 --- a/pkgs/by-name/li/librearp-lv2/package.nix +++ b/pkgs/by-name/li/librearp-lv2/package.nix @@ -6,7 +6,7 @@ pkg-config, cairo, libxkbcommon, - xcbutilcursor, + libxcb-cursor, xcbutilkeysyms, xcbutil, libXrandr, @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ cairo libxkbcommon - xcbutilcursor + libxcb-cursor xcbutilkeysyms xcbutil libXrandr diff --git a/pkgs/by-name/li/librearp/package.nix b/pkgs/by-name/li/librearp/package.nix index 72f167fbe727..8c578d1d7f88 100644 --- a/pkgs/by-name/li/librearp/package.nix +++ b/pkgs/by-name/li/librearp/package.nix @@ -6,7 +6,7 @@ pkg-config, cairo, libxkbcommon, - xcbutilcursor, + libxcb-cursor, xcbutilkeysyms, xcbutil, libXrandr, @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ cairo libxkbcommon - xcbutilcursor + libxcb-cursor xcbutilkeysyms xcbutil libXrandr diff --git a/pkgs/by-name/po/polybar/package.nix b/pkgs/by-name/po/polybar/package.nix index 72b4c5017305..df6b9378799b 100644 --- a/pkgs/by-name/po/polybar/package.nix +++ b/pkgs/by-name/po/polybar/package.nix @@ -16,7 +16,7 @@ stdenv, xcbproto, xcbutil, - xcbutilcursor, + libxcb-cursor, xcbutilimage, xcbutilrenderutil, xcbutilwm, @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { python3 xcbproto xcbutil - xcbutilcursor + libxcb-cursor xcbutilimage xcbutilrenderutil xcbutilwm diff --git a/pkgs/by-name/ro/rofi-unwrapped/package.nix b/pkgs/by-name/ro/rofi-unwrapped/package.nix index 49c485e1385d..308302dae498 100644 --- a/pkgs/by-name/ro/rofi-unwrapped/package.nix +++ b/pkgs/by-name/ro/rofi-unwrapped/package.nix @@ -25,7 +25,7 @@ which, xcb-imdkit, xcbutil, - xcb-util-cursor, + libxcb-cursor, xcbutilkeysyms, xcbutilwm, xcbutilxrm, @@ -88,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: { libxcb xcb-imdkit xcbutil - xcb-util-cursor + libxcb-cursor xcbutilkeysyms xcbutilwm xcbutilxrm diff --git a/pkgs/by-name/su/surge/package.nix b/pkgs/by-name/su/surge/package.nix index 6d8734803635..cedae623458f 100644 --- a/pkgs/by-name/su/surge/package.nix +++ b/pkgs/by-name/su/surge/package.nix @@ -13,7 +13,7 @@ libxcb, libxkbcommon, xcbutil, - xcbutilcursor, + libxcb-cursor, xcbutilkeysyms, zenity, curl, @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { libxcb libxkbcommon xcbutil - xcbutilcursor + libxcb-cursor xcbutilkeysyms zenity curl diff --git a/pkgs/by-name/we/weston/package.nix b/pkgs/by-name/we/weston/package.nix index 1ed7c54d6364..fe1c81ce22a2 100644 --- a/pkgs/by-name/we/weston/package.nix +++ b/pkgs/by-name/we/weston/package.nix @@ -19,7 +19,7 @@ seatd, wayland, wayland-protocols, - xcbutilcursor, + libxcb-cursor, demoSupport ? true, jpegSupport ? true, @@ -104,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional webpSupport libwebp ++ lib.optionals xwaylandSupport [ libXcursor - xcbutilcursor + libxcb-cursor xwayland ]; diff --git a/pkgs/by-name/wm/wmutils-core/package.nix b/pkgs/by-name/wm/wmutils-core/package.nix index 2bab3597b7a5..1d4ee12b0484 100644 --- a/pkgs/by-name/wm/wmutils-core/package.nix +++ b/pkgs/by-name/wm/wmutils-core/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, libxcb, xcbutil, - xcb-util-cursor, + libxcb-cursor, }: stdenv.mkDerivation (finalAttrs: { @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libxcb xcbutil - xcb-util-cursor + libxcb-cursor ]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/by-name/wm/wmutils-libwm/package.nix b/pkgs/by-name/wm/wmutils-libwm/package.nix index 2ed91047c2bb..a14c1fc8f03f 100644 --- a/pkgs/by-name/wm/wmutils-libwm/package.nix +++ b/pkgs/by-name/wm/wmutils-libwm/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, libxcb, - xcb-util-cursor, + libxcb-cursor, }: stdenv.mkDerivation (finalAttrs: { @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libxcb - xcb-util-cursor + libxcb-cursor ]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/by-name/xm/xmoji/package.nix b/pkgs/by-name/xm/xmoji/package.nix index f1152d912ad8..06c4a6e318df 100644 --- a/pkgs/by-name/xm/xmoji/package.nix +++ b/pkgs/by-name/xm/xmoji/package.nix @@ -10,7 +10,7 @@ libXcursor, xcbutilimage, libxkbcommon, - xcb-util-cursor, + libxcb-cursor, }: stdenv.mkDerivation (finalAttrs: { @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { libXcursor libpng libxkbcommon - xcb-util-cursor + libxcb-cursor xcbutil xcbutilimage ]; diff --git a/pkgs/by-name/xw/xwayland-satellite/package.nix b/pkgs/by-name/xw/xwayland-satellite/package.nix index 98a31aff70d4..1a223e7496dc 100644 --- a/pkgs/by-name/xw/xwayland-satellite/package.nix +++ b/pkgs/by-name/xw/xwayland-satellite/package.nix @@ -6,7 +6,7 @@ nix-update-script, pkg-config, rustPlatform, - xcb-util-cursor, + libxcb-cursor, xwayland, withSystemd ? true, }: @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libxcb - xcb-util-cursor + libxcb-cursor ]; buildNoDefaultFeatures = true; diff --git a/pkgs/by-name/ya/yambar/package.nix b/pkgs/by-name/ya/yambar/package.nix index aba3516e2259..788c05c86834 100644 --- a/pkgs/by-name/ya/yambar/package.nix +++ b/pkgs/by-name/ya/yambar/package.nix @@ -22,7 +22,7 @@ wayland-protocols, wayland-scanner, xcbutil, - xcbutilcursor, + libxcb-cursor, xcbutilerrors, xcbutilwm, waylandSupport ? true, @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals x11Support [ xcbutil - xcbutilcursor + libxcb-cursor xcbutilerrors xcbutilwm ]; diff --git a/pkgs/development/python-modules/qtile/default.nix b/pkgs/development/python-modules/qtile/default.nix index 8f059c4ecea5..efb7eb0c4804 100644 --- a/pkgs/development/python-modules/qtile/default.nix +++ b/pkgs/development/python-modules/qtile/default.nix @@ -29,7 +29,7 @@ wayland-protocols, wayland-scanner, wlroots, - xcbutilcursor, + libxcb-cursor, xcbutilwm, xcffib, nixosTests, @@ -89,7 +89,7 @@ buildPythonPackage (finalAttrs: { "--config-setting=GOBJECT=${lib.getLib glib}/lib/libgobject-2.0.so" "--config-setting=PANGO=${lib.getLib pango}/lib/libpango-1.0.so" "--config-setting=PANGOCAIRO=${lib.getLib pango}/lib/libpangocairo-1.0.so" - "--config-setting=XCBCURSOR=${lib.getLib xcbutilcursor}/lib/libxcb-cursor.so" + "--config-setting=XCBCURSOR=${lib.getLib libxcb-cursor}/lib/libxcb-cursor.so" ]; dependencies = extraPackages ++ [ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0d8613cddb98..18a6e7f8e01f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1906,7 +1906,9 @@ mapAliases { wxGTK33 = wxwidgets_3_3; # Added 2025-07-20 xbrightness = throw "'xbrightness' has been removed as it is unmaintained"; # Added 2025-08-28 xbursttools = throw "'xbursttools' has been removed as it is broken and unmaintained upstream."; # Added 2025-06-12 + xcb-util-cursor = libxcb-cursor; # Added 2026-02-04 xcb-util-cursor-HEAD = warnAlias "'xcb-util-cursor-HEAD' has been removed; use 'libxcb-cursor' instead" libxcb-cursor; # added 2026-01-12 + xcbutilcursor = libxcb-cursor; # Added 2026-02-04 xcursorthemes = xcursor-themes; # Added 2026-01-19 xdragon = throw "'xdragon' has been renamed to/replaced by 'dragon-drop'"; # Converted to throw 2025-10-27 xf86_input_cmt = xf86-input-cmt; # Added 2025-12-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aad1e0e11834..113be95794e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7852,8 +7852,6 @@ with pkgs; libmagic = file; }; - xcb-util-cursor = libxcb-cursor; - xgboostWithCuda = xgboost.override { cudaSupport = true; }; zlib = callPackage ../development/libraries/zlib { @@ -8858,7 +8856,6 @@ with pkgs; mkfontdir = mkfontscale; xcbproto = xcb-proto; xcbutil = libxcb-util; - xcbutilcursor = libxcb-cursor; xcbutilerrors = libxcb-errors; xcbutilimage = libxcb-image; xcbutilkeysyms = libxcb-keysyms;