xcbutilkeysyms: rename references and deprecate alias

this shouldn't create any rebuilds
This commit is contained in:
quantenzitrone
2026-02-04 19:14:57 +01:00
parent f7a087d8f2
commit 584757f348
39 changed files with 75 additions and 75 deletions
@@ -40,7 +40,7 @@
mesa-demos,
libxcb-wm,
libxcb-render-util,
xcbutilkeysyms,
libxcb-keysyms,
xcbutilimage,
libxcb-cursor,
libxkbfile,
@@ -173,7 +173,7 @@ let
libxkbcommon
libxcb-wm
libxcb-render-util
xcbutilkeysyms
libxcb-keysyms
xcbutilimage
libxcb-cursor
libice
@@ -25,7 +25,7 @@
qtwebengine,
qtwebview,
xcbutilimage,
xcbutilkeysyms,
libxcb-keysyms,
libxcb-render-util,
libxcb-wm,
}:
@@ -67,7 +67,7 @@ let
qtwebengine
qtwebview
xcbutilimage
xcbutilkeysyms
libxcb-keysyms
libxcb-render-util
libxcb-wm
];
@@ -4,7 +4,7 @@
fetchFromGitHub,
patches,
libxcb,
xcbutilkeysyms,
libxcb-keysyms,
libxcb-wm,
libX11,
xcbutil,
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
buildInputs = [
libxcb
xcbutilkeysyms
libxcb-keysyms
libxcb-wm
libX11
xcbutil
@@ -14,7 +14,7 @@
pcre2,
pkg-config,
libxcb-cursor,
xcbutilkeysyms,
libxcb-keysyms,
libxcb-wm,
xcbutil,
xmodmap,
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
libxcb
pcre2
libxcb-cursor
xcbutilkeysyms
libxcb-keysyms
libxcb-wm
xcbutil
];
@@ -8,7 +8,7 @@
ninja,
installShellFiles,
libxcb,
xcbutilkeysyms,
libxcb-keysyms,
xcbutil,
libxcb-wm,
xcbutilxrm,
@@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
libxcb
xcbutilkeysyms
libxcb-keysyms
xcbutil
libxcb-wm
xcbutilxrm
@@ -5,7 +5,7 @@
pkg-config,
xorgproto,
libxcb,
xcbutilkeysyms,
libxcb-keysyms,
libx11,
i3ipc-glib,
glib,
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkg-config ];
buildInputs = [
libxcb
xcbutilkeysyms
libxcb-keysyms
xorgproto
libx11.dev
i3ipc-glib
@@ -5,7 +5,7 @@
autoreconfHook,
pkg-config,
libxcb,
xcbutilkeysyms,
libxcb-keysyms,
xcbutilimage,
pam,
libX11,
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
libxcb
xcbutilkeysyms
libxcb-keysyms
xcbutilimage
pam
libX11
@@ -6,7 +6,7 @@
ninja,
pkg-config,
libxcb,
xcbutilkeysyms,
libxcb-keysyms,
xcbutilimage,
xcbutilxrm,
pam,
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
libxcb
xcbutilkeysyms
libxcb-keysyms
xcbutilimage
xcbutilxrm
pam
+2 -2
View File
@@ -51,7 +51,7 @@
libshout,
ffmpeg_6,
libmpeg2,
xcbutilkeysyms,
libxcb-keysyms,
lirc,
lua5_2,
taglib,
@@ -203,7 +203,7 @@ stdenv.mkDerivation (finalAttrs: {
srt
libshout
ffmpeg_6
xcbutilkeysyms
libxcb-keysyms
lirc
lua5_2
taglib
+2 -2
View File
@@ -24,7 +24,7 @@
vst2-sdk,
xcbutil,
libxkbcommon,
xcbutilkeysyms,
libxcb-keysyms,
libxcb-cursor,
gtk3,
webkitgtk_4_1,
@@ -114,7 +114,7 @@ stdenv.mkDerivation (finalAttrs: {
libxcb
xcbutil
libxkbcommon
xcbutilkeysyms
libxcb-keysyms
libxcb-cursor
mount
];
+2 -2
View File
@@ -13,7 +13,7 @@
unzip,
wayland,
xcbutilimage,
xcbutilkeysyms,
libxcb-keysyms,
libxcb-render-util,
libxcb-wm,
libxml2,
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
stdenv.cc.cc.lib
wayland
xcbutilimage
xcbutilkeysyms
libxcb-keysyms
libxcb-render-util
libxcb-wm
];
+2 -2
View File
@@ -5,7 +5,7 @@
libxcb,
libXinerama,
xcbutil,
xcbutilkeysyms,
libxcb-keysyms,
libxcb-wm,
nixosTests,
}:
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
libxcb
libXinerama
xcbutil
xcbutilkeysyms
libxcb-keysyms
libxcb-wm
];
+2 -2
View File
@@ -7,7 +7,7 @@
cairo,
libxkbcommon,
libxcb-cursor,
xcbutilkeysyms,
libxcb-keysyms,
xcbutil,
libXrandr,
libXinerama,
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
cairo
libxkbcommon
libxcb-cursor
xcbutilkeysyms
libxcb-keysyms
xcbutil
libXrandr
libXinerama
+2 -2
View File
@@ -3,7 +3,7 @@
stdenv,
fetchFromBitbucket,
xcbutil,
xcbutilkeysyms,
libxcb-keysyms,
libxcb-wm,
libxcb-cursor,
}:
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
xcbutil
xcbutilkeysyms
libxcb-keysyms
libxcb-wm
libxcb-cursor
];
+2 -2
View File
@@ -11,7 +11,7 @@
libxcb,
lz4,
vulkan-loader,
xcbutilkeysyms,
libxcb-keysyms,
zlib,
zstd,
}:
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
lz4
python3
wayland
xcbutilkeysyms
libxcb-keysyms
zlib
zstd
];
+2 -2
View File
@@ -7,7 +7,7 @@
cairo,
libxkbcommon,
libxcb-cursor,
xcbutilkeysyms,
libxcb-keysyms,
xcbutil,
libXrandr,
libXinerama,
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
cairo
libxkbcommon
libxcb-cursor
xcbutilkeysyms
libxcb-keysyms
xcbutil
libXrandr
libXinerama
+2 -2
View File
@@ -7,7 +7,7 @@
cairo,
libxkbcommon,
libxcb-cursor,
xcbutilkeysyms,
libxcb-keysyms,
xcbutil,
libXrandr,
libXinerama,
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
cairo
libxkbcommon
libxcb-cursor
xcbutilkeysyms
libxcb-keysyms
xcbutil
libXrandr
libXinerama
+2 -2
View File
@@ -43,7 +43,7 @@
tre,
unixODBC,
xcbutilimage,
xcbutilkeysyms,
libxcb-keysyms,
xkeyboard_config,
libxtst,
libxscrnsaver,
@@ -128,7 +128,7 @@ stdenv.mkDerivation {
tre
unixODBC
xcbutilimage
xcbutilkeysyms
libxcb-keysyms
xkeyboard_config
libice
libsm
+2 -2
View File
@@ -18,7 +18,7 @@
qt6Packages,
wayland,
xcbutilimage,
xcbutilkeysyms,
libxcb-keysyms,
libxcb-render-util,
libxcb-wm,
}:
@@ -46,7 +46,7 @@ let
qt6Packages.qtwebview
wayland
xcbutilimage
xcbutilkeysyms
libxcb-keysyms
libxcb-render-util
libxcb-wm
];
+2 -2
View File
@@ -26,7 +26,7 @@
xcb-imdkit,
xcbutil,
libxcb-cursor,
xcbutilkeysyms,
libxcb-keysyms,
libxcb-wm,
xcbutilxrm,
waylandSupport ? true,
@@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
xcb-imdkit
xcbutil
libxcb-cursor
xcbutilkeysyms
libxcb-keysyms
libxcb-wm
xcbutilxrm
];
+2 -2
View File
@@ -9,7 +9,7 @@
libXft,
libXt,
xcbutil,
xcbutilkeysyms,
libxcb-keysyms,
libxcb-wm,
writeShellScript,
curl,
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
libXft
libXt
xcbutil
xcbutilkeysyms
libxcb-keysyms
libxcb-wm
libbsd
];
+2 -2
View File
@@ -14,7 +14,7 @@
libxkbcommon,
xcbutil,
libxcb-cursor,
xcbutilkeysyms,
libxcb-keysyms,
zenity,
curl,
rsync,
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
libxkbcommon
xcbutil
libxcb-cursor
xcbutilkeysyms
libxcb-keysyms
zenity
curl
rsync
+2 -2
View File
@@ -6,7 +6,7 @@
asciidoc,
libxcb,
xcbutil,
xcbutilkeysyms,
libxcb-keysyms,
libxcb-wm,
nixosTests,
}:
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
libxcb
xcbutil
xcbutilkeysyms
libxcb-keysyms
libxcb-wm
];
+2 -2
View File
@@ -11,7 +11,7 @@
libxcb,
xcbutil,
libxcb-cursor,
xcbutilkeysyms,
libxcb-keysyms,
libxkbcommon,
libX11,
libXrandr,
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
libxcb
xcbutil
libxcb-cursor
xcbutilkeysyms
libxcb-keysyms
libxkbcommon
libX11
libXrandr
+2 -2
View File
@@ -83,7 +83,7 @@
wayland-scanner,
wrapGAppsHook3,
writeShellScript,
xcbutilkeysyms,
libxcb-keysyms,
zlib,
chromecastSupport ? true,
@@ -193,7 +193,7 @@ stdenv.mkDerivation (finalAttrs: {
srt
systemdLibs
taglib_1
xcbutilkeysyms
libxcb-keysyms
zlib
]
++ optionals (!onlyLibVLC) [ live555 ]
@@ -15,7 +15,7 @@
pkg-config,
wayland,
which,
xcbutilkeysyms,
libxcb-keysyms,
libxcb-wm,
valijson,
vulkan-headers,
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
vulkan-loader
vulkan-utility-libraries
wayland
xcbutilkeysyms
libxcb-keysyms
libxcb-wm
qt6.qtbase
qt6.qtwayland
+2 -2
View File
@@ -46,7 +46,7 @@
libxshmfence,
xcbutil,
xcbutilimage,
xcbutilkeysyms,
libxcb-keysyms,
libxcb-render-util,
libxcb-wm,
p7zip,
@@ -113,7 +113,7 @@ stdenv.mkDerivation rec {
xcbutil
xcbutilimage
libXScrnSaver
xcbutilkeysyms
libxcb-keysyms
libxcb-render-util
libxcb-wm
onetbb
+2 -2
View File
@@ -30,7 +30,7 @@
libxkbcommon,
libxcb-wm,
xcbutilimage,
xcbutilkeysyms,
libxcb-keysyms,
libxcb-render-util,
libgbm,
alsa-lib,
@@ -86,7 +86,7 @@ let
zlib
libxcb-wm
xcbutilimage
xcbutilkeysyms
libxcb-keysyms
libxcb-render-util
libx11
libxt
+2 -2
View File
@@ -21,7 +21,7 @@
wezterm,
xcbutil,
xcbutilimage,
xcbutilkeysyms,
libxcb-keysyms,
libxcb-wm,
zlib,
}:
@@ -80,7 +80,7 @@ rustPlatform.buildRustPackage rec {
wayland
xcbutil
xcbutilimage
xcbutilkeysyms
libxcb-keysyms
libxcb-wm # contains xcb-ewmh among others
];
+2 -2
View File
@@ -5,7 +5,7 @@
libxcb,
libXrandr,
xcbutil,
xcbutilkeysyms,
libxcb-keysyms,
libxcb-wm,
xcbproto,
}:
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
libxcb
libXrandr
xcbutil
xcbutilkeysyms
libxcb-keysyms
libxcb-wm
xcbproto
];
+2 -2
View File
@@ -6,7 +6,7 @@
extra-cmake-modules,
uthash,
xcbutil,
xcbutilkeysyms,
libxcb-keysyms,
xorgproto,
}:
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
xcbutil
xcbutilkeysyms
libxcb-keysyms
];
meta = {
+2 -2
View File
@@ -22,7 +22,7 @@
pixman,
xcbutil,
xcbutilimage,
xcbutilkeysyms,
libxcb-keysyms,
libxcb-render-util,
libxcb-wm,
xkbcomp,
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
pixman
xcbutil
xcbutilimage
xcbutilkeysyms
libxcb-keysyms
libxcb-render-util
libxcb-wm
xorgproto
+2 -2
View File
@@ -9,7 +9,7 @@
libarchive,
libXdmcp,
libpthreadstubs,
xcbutilkeysyms,
libxcb-keysyms,
qt6,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
qt6.qtbase
qt6.qtimageformats
qt6.qtwebengine
xcbutilkeysyms
libxcb-keysyms
];
cmakeFlags = [
+2 -2
View File
@@ -38,7 +38,7 @@
wayland,
wayland-protocols,
wayland-scanner,
xcbutilkeysyms,
libxcb-keysyms,
libxxf86vm,
libxrandr,
libxfixes,
@@ -291,7 +291,7 @@ stdenv.mkDerivation {
vulkan-loader
wayland
wayland-protocols
xcbutilkeysyms
libxcb-keysyms
xorgproto
zstd
]
@@ -44,7 +44,7 @@
udev,
xcbutil,
xcbutilimage,
xcbutilkeysyms,
libxcb-keysyms,
libxcb-render-util,
libxcb-wm,
zlib,
@@ -133,7 +133,7 @@ stdenv.mkDerivation (
libxkbcommon
xcbutil
xcbutilimage
xcbutilkeysyms
libxcb-keysyms
libxcb-render-util
libxcb-wm
]
@@ -58,7 +58,7 @@
udev,
xcbutil,
xcbutilimage,
xcbutilkeysyms,
libxcb-keysyms,
libxcb-render-util,
libxcb-wm,
zlib,
@@ -155,7 +155,7 @@ stdenv.mkDerivation rec {
libxkbcommon
xcbutil
xcbutilimage
xcbutilkeysyms
libxcb-keysyms
libxcb-render-util
libxcb-wm
libxdmcp
+2 -2
View File
@@ -28,7 +28,7 @@
libxkbcommon,
libthai,
libdatrie,
xcbutilkeysyms,
libxcb-keysyms,
xcbutil,
libxcb-wm,
xcb-imdkit,
@@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
libxkbcommon
xcbutil
libxcb-wm
xcbutilkeysyms
libxcb-keysyms
xcb-imdkit
xkeyboard_config
libxkbfile
+1
View File
@@ -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
xcbutilkeysyms = libxcb-keysyms; # Added 2026-02-04
xcbutilrenderutil = libxcb-render-util; # Added 2026-02-04
xcbutilwm = libxcb-wm; # Added 2026-02-04
xcursorthemes = xcursor-themes; # Added 2026-01-19
-1
View File
@@ -8858,7 +8858,6 @@ with pkgs;
xcbutil = libxcb-util;
xcbutilerrors = libxcb-errors;
xcbutilimage = libxcb-image;
xcbutilkeysyms = libxcb-keysyms;
zabbixFor = version: rec {
agent = (callPackages ../servers/monitoring/zabbix/agent.nix { }).${version};