From 1fff2e7504a1745fd3e2dc2933f53d4b192f2e99 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Wed, 4 Feb 2026 19:16:35 +0100 Subject: [PATCH] xcbutilimage: rename references and deprecate alias this shouldn't create any rebuilds --- pkgs/applications/editors/android-studio/common.nix | 4 ++-- pkgs/applications/version-management/p4v/linux.nix | 4 ++-- pkgs/applications/window-managers/i3/lock-color.nix | 4 ++-- pkgs/applications/window-managers/i3/lock.nix | 4 ++-- pkgs/by-name/bi/binaryninja-free/package.nix | 4 ++-- pkgs/by-name/gu/gummy/package.nix | 4 ++-- pkgs/by-name/ma/mathematica/generic.nix | 4 ++-- pkgs/by-name/nx/nxwitness-client/package.nix | 4 ++-- pkgs/by-name/pi/picom/package.nix | 4 ++-- pkgs/by-name/po/polybar/package.nix | 4 ++-- pkgs/by-name/sf/sfml/package.nix | 4 ++-- pkgs/by-name/sf/sfml_2/package.nix | 4 ++-- pkgs/by-name/we/webex/package.nix | 4 ++-- pkgs/by-name/we/wechat-uos/package.nix | 4 ++-- pkgs/by-name/we/wezterm/package.nix | 4 ++-- pkgs/by-name/xa/xarcan/package.nix | 4 ++-- pkgs/by-name/xm/xmoji/package.nix | 4 ++-- pkgs/by-name/xv/xvfb/package.nix | 4 ++-- pkgs/by-name/xw/xwallpaper/package.nix | 4 ++-- pkgs/development/libraries/qt-5/modules/qtbase.nix | 4 ++-- pkgs/development/libraries/qt-6/modules/qtbase/default.nix | 4 ++-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 23 files changed, 43 insertions(+), 43 deletions(-) diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 938062b13455..b3dbb8e516b4 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -41,7 +41,7 @@ libxcb-wm, libxcb-render-util, libxcb-keysyms, - xcbutilimage, + libxcb-image, libxcb-cursor, libxkbfile, libXcomposite, @@ -174,7 +174,7 @@ let libxcb-wm libxcb-render-util libxcb-keysyms - xcbutilimage + libxcb-image libxcb-cursor libice libsm diff --git a/pkgs/applications/version-management/p4v/linux.nix b/pkgs/applications/version-management/p4v/linux.nix index 51e4459ee7fc..c8808b66928c 100644 --- a/pkgs/applications/version-management/p4v/linux.nix +++ b/pkgs/applications/version-management/p4v/linux.nix @@ -24,7 +24,7 @@ qttools, qtwebengine, qtwebview, - xcbutilimage, + libxcb-image, libxcb-keysyms, libxcb-render-util, libxcb-wm, @@ -66,7 +66,7 @@ let qttools qtwebengine qtwebview - xcbutilimage + libxcb-image libxcb-keysyms libxcb-render-util libxcb-wm diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index e9404c33df79..bfa39114c90d 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -6,7 +6,7 @@ pkg-config, libxcb, libxcb-keysyms, - xcbutilimage, + libxcb-image, pam, libX11, libev, @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxcb libxcb-keysyms - xcbutilimage + libxcb-image pam libX11 libev diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix index 18f85689a89a..6918a964de26 100644 --- a/pkgs/applications/window-managers/i3/lock.nix +++ b/pkgs/applications/window-managers/i3/lock.nix @@ -7,7 +7,7 @@ pkg-config, libxcb, libxcb-keysyms, - xcbutilimage, + libxcb-image, xcbutilxrm, pam, libX11, @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxcb libxcb-keysyms - xcbutilimage + libxcb-image xcbutilxrm pam libX11 diff --git a/pkgs/by-name/bi/binaryninja-free/package.nix b/pkgs/by-name/bi/binaryninja-free/package.nix index 1c0d98220a23..9e1d352a9828 100644 --- a/pkgs/by-name/bi/binaryninja-free/package.nix +++ b/pkgs/by-name/bi/binaryninja-free/package.nix @@ -12,7 +12,7 @@ stdenv, unzip, wayland, - xcbutilimage, + libxcb-image, libxcb-keysyms, libxcb-render-util, libxcb-wm, @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { libxkbcommon stdenv.cc.cc.lib wayland - xcbutilimage + libxcb-image libxcb-keysyms libxcb-render-util libxcb-wm diff --git a/pkgs/by-name/gu/gummy/package.nix b/pkgs/by-name/gu/gummy/package.nix index eb272661ea7a..ca89df1aa601 100644 --- a/pkgs/by-name/gu/gummy/package.nix +++ b/pkgs/by-name/gu/gummy/package.nix @@ -8,7 +8,7 @@ libXext, sdbus-cpp, udev, - xcbutilimage, + libxcb-image, coreutils, cli11, ddcutil, @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { sdbus-cpp spdlog udev - xcbutilimage + libxcb-image ]; cmakeFlags = [ diff --git a/pkgs/by-name/ma/mathematica/generic.nix b/pkgs/by-name/ma/mathematica/generic.nix index 531ead1a631e..5c6e1c747e32 100644 --- a/pkgs/by-name/ma/mathematica/generic.nix +++ b/pkgs/by-name/ma/mathematica/generic.nix @@ -42,7 +42,7 @@ pciutils, tre, unixODBC, - xcbutilimage, + libxcb-image, libxcb-keysyms, xkeyboard_config, libxtst, @@ -127,7 +127,7 @@ stdenv.mkDerivation { pciutils tre unixODBC - xcbutilimage + libxcb-image libxcb-keysyms xkeyboard_config libice diff --git a/pkgs/by-name/nx/nxwitness-client/package.nix b/pkgs/by-name/nx/nxwitness-client/package.nix index e814ab534eb7..419f8c7976a2 100644 --- a/pkgs/by-name/nx/nxwitness-client/package.nix +++ b/pkgs/by-name/nx/nxwitness-client/package.nix @@ -17,7 +17,7 @@ openal, qt6Packages, wayland, - xcbutilimage, + libxcb-image, libxcb-keysyms, libxcb-render-util, libxcb-wm, @@ -45,7 +45,7 @@ let qt6Packages.qtwebsockets qt6Packages.qtwebview wayland - xcbutilimage + libxcb-image libxcb-keysyms libxcb-render-util libxcb-wm diff --git a/pkgs/by-name/pi/picom/package.nix b/pkgs/by-name/pi/picom/package.nix index 7900f7d92dea..1add7236f4fe 100644 --- a/pkgs/by-name/pi/picom/package.nix +++ b/pkgs/by-name/pi/picom/package.nix @@ -25,7 +25,7 @@ stdenv, uthash, xcbutil, - xcbutilimage, + libxcb-image, libxcb-render-util, xorgproto, xwininfo, @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { pixman uthash xcbutil - xcbutilimage + libxcb-image libxcb-render-util xorgproto ]; diff --git a/pkgs/by-name/po/polybar/package.nix b/pkgs/by-name/po/polybar/package.nix index 21c038968147..58e6b03bdeec 100644 --- a/pkgs/by-name/po/polybar/package.nix +++ b/pkgs/by-name/po/polybar/package.nix @@ -17,7 +17,7 @@ xcbproto, xcbutil, libxcb-cursor, - xcbutilimage, + libxcb-image, libxcb-render-util, libxcb-wm, xcbutilxrm, @@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { xcbproto xcbutil libxcb-cursor - xcbutilimage + libxcb-image libxcb-render-util libxcb-wm xcbutilxrm diff --git a/pkgs/by-name/sf/sfml/package.nix b/pkgs/by-name/sf/sfml/package.nix index 214289478f3e..00ee98350a60 100644 --- a/pkgs/by-name/sf/sfml/package.nix +++ b/pkgs/by-name/sf/sfml/package.nix @@ -20,7 +20,7 @@ libXcursor, libXrandr, libXrender, - xcbutilimage, + libxcb-image, }: stdenv.mkDerivation (finalAttrs: { @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { libXcursor libXrandr libXrender - xcbutilimage + libxcb-image ]; cmakeFlags = [ diff --git a/pkgs/by-name/sf/sfml_2/package.nix b/pkgs/by-name/sf/sfml_2/package.nix index f18d872c830d..060cb935fcd0 100644 --- a/pkgs/by-name/sf/sfml_2/package.nix +++ b/pkgs/by-name/sf/sfml_2/package.nix @@ -18,7 +18,7 @@ libXcursor, libXrandr, libXrender, - xcbutilimage, + libxcb-image, }: stdenv.mkDerivation (finalAttrs: { pname = "sfml"; @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { libXcursor libXrandr libXrender - xcbutilimage + libxcb-image ]; cmakeFlags = [ diff --git a/pkgs/by-name/we/webex/package.nix b/pkgs/by-name/we/webex/package.nix index bf81b9f5383a..277f77188c8f 100644 --- a/pkgs/by-name/we/webex/package.nix +++ b/pkgs/by-name/we/webex/package.nix @@ -45,7 +45,7 @@ libXtst, libxshmfence, xcbutil, - xcbutilimage, + libxcb-image, libxcb-keysyms, libxcb-render-util, libxcb-wm, @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { libXtst libxshmfence xcbutil - xcbutilimage + libxcb-image libXScrnSaver libxcb-keysyms libxcb-render-util diff --git a/pkgs/by-name/we/wechat-uos/package.nix b/pkgs/by-name/we/wechat-uos/package.nix index a61d7bda1dcc..f6c89f75e50e 100644 --- a/pkgs/by-name/we/wechat-uos/package.nix +++ b/pkgs/by-name/we/wechat-uos/package.nix @@ -29,7 +29,7 @@ libdrm, libxkbcommon, libxcb-wm, - xcbutilimage, + libxcb-image, libxcb-keysyms, libxcb-render-util, libgbm, @@ -85,7 +85,7 @@ let pango zlib libxcb-wm - xcbutilimage + libxcb-image libxcb-keysyms libxcb-render-util libx11 diff --git a/pkgs/by-name/we/wezterm/package.nix b/pkgs/by-name/we/wezterm/package.nix index 04574e2162e7..defaefc1eba7 100644 --- a/pkgs/by-name/we/wezterm/package.nix +++ b/pkgs/by-name/we/wezterm/package.nix @@ -20,7 +20,7 @@ wayland, wezterm, xcbutil, - xcbutilimage, + libxcb-image, libxcb-keysyms, libxcb-wm, zlib, @@ -79,7 +79,7 @@ rustPlatform.buildRustPackage rec { libxkbcommon wayland xcbutil - xcbutilimage + libxcb-image libxcb-keysyms libxcb-wm # contains xcb-ewmh among others ]; diff --git a/pkgs/by-name/xa/xarcan/package.nix b/pkgs/by-name/xa/xarcan/package.nix index 20d87cb6cb99..3f67984d9f61 100644 --- a/pkgs/by-name/xa/xarcan/package.nix +++ b/pkgs/by-name/xa/xarcan/package.nix @@ -32,7 +32,7 @@ systemd, xcbutil, libxcb-wm, - xcbutilimage, + libxcb-image, xkbcomp, xkeyboard_config, xorgproto, @@ -85,7 +85,7 @@ stdenv.mkDerivation (finalPackages: rec { systemd xcbutil libxcb-wm - xcbutilimage + libxcb-image xkbcomp xkeyboard_config xorgproto diff --git a/pkgs/by-name/xm/xmoji/package.nix b/pkgs/by-name/xm/xmoji/package.nix index 06c4a6e318df..f404dfc15f31 100644 --- a/pkgs/by-name/xm/xmoji/package.nix +++ b/pkgs/by-name/xm/xmoji/package.nix @@ -8,7 +8,7 @@ libpng, xcbutil, libXcursor, - xcbutilimage, + libxcb-image, libxkbcommon, libxcb-cursor, }: @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { libxkbcommon libxcb-cursor xcbutil - xcbutilimage + libxcb-image ]; makeFlags = [ "prefix=${placeholder "out"}" ]; diff --git a/pkgs/by-name/xv/xvfb/package.nix b/pkgs/by-name/xv/xvfb/package.nix index d1ba08962e9c..d91e318e557e 100644 --- a/pkgs/by-name/xv/xvfb/package.nix +++ b/pkgs/by-name/xv/xvfb/package.nix @@ -21,7 +21,7 @@ openssl, pixman, xcbutil, - xcbutilimage, + libxcb-image, libxcb-keysyms, libxcb-render-util, libxcb-wm, @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { openssl pixman xcbutil - xcbutilimage + libxcb-image libxcb-keysyms libxcb-render-util libxcb-wm diff --git a/pkgs/by-name/xw/xwallpaper/package.nix b/pkgs/by-name/xw/xwallpaper/package.nix index 182721cc68ff..b277975bc0ec 100644 --- a/pkgs/by-name/xw/xwallpaper/package.nix +++ b/pkgs/by-name/xw/xwallpaper/package.nix @@ -7,7 +7,7 @@ installShellFiles, pixman, xcbutil, - xcbutilimage, + libxcb-image, libseccomp, libjpeg, libpng, @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ pixman - xcbutilimage + libxcb-image xcbutil libseccomp libjpeg diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 7474b188b13f..7e4a9a98d4d4 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -43,7 +43,7 @@ sqlite, udev, xcbutil, - xcbutilimage, + libxcb-image, libxcb-keysyms, libxcb-render-util, libxcb-wm, @@ -132,7 +132,7 @@ stdenv.mkDerivation ( libxcb libxkbcommon xcbutil - xcbutilimage + libxcb-image libxcb-keysyms libxcb-render-util libxcb-wm diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix index 5fd6462af26b..6adf79beacd7 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix @@ -57,7 +57,7 @@ sqlite, udev, xcbutil, - xcbutilimage, + libxcb-image, libxcb-keysyms, libxcb-render-util, libxcb-wm, @@ -154,7 +154,7 @@ stdenv.mkDerivation rec { libxcb libxkbcommon xcbutil - xcbutilimage + libxcb-image libxcb-keysyms libxcb-render-util libxcb-wm diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 96864d022f12..3f8a9150421a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1909,6 +1909,7 @@ mapAliases { 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 + xcbutilimage = libxcb-image; # Added 2026-02-04 xcbutilkeysyms = libxcb-keysyms; # Added 2026-02-04 xcbutilrenderutil = libxcb-render-util; # Added 2026-02-04 xcbutilwm = libxcb-wm; # Added 2026-02-04 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7bea20b7525c..a2cb5579ce90 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8857,7 +8857,6 @@ with pkgs; xcbproto = xcb-proto; xcbutil = libxcb-util; xcbutilerrors = libxcb-errors; - xcbutilimage = libxcb-image; zabbixFor = version: rec { agent = (callPackages ../servers/monitoring/zabbix/agent.nix { }).${version};