xcbutil: rename references and deprecate alias

this shouldn't create any rebuilds
This commit is contained in:
quantenzitrone
2026-02-04 22:58:58 +01:00
parent abcb7426af
commit a024c30a8a
42 changed files with 81 additions and 81 deletions
@@ -7,7 +7,7 @@
libxcb-keysyms,
libxcb-wm,
libX11,
xcbutil,
libxcb-util,
xcbutilxrm,
}:
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
libxcb-keysyms
libxcb-wm
libX11
xcbutil
libxcb-util
xcbutilxrm
];
@@ -16,7 +16,7 @@
libxcb-cursor,
libxcb-keysyms,
libxcb-wm,
xcbutil,
libxcb-util,
xmodmap,
}:
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
libxcb-cursor
libxcb-keysyms
libxcb-wm
xcbutil
libxcb-util
];
# src/ewmh/ewmh.cpp:67:28: error: non-constant-expression cannot be narrowed from type 'int' to 'uint32_t' (aka 'unsigned int') in initializer list
@@ -9,7 +9,7 @@
installShellFiles,
libxcb,
libxcb-keysyms,
xcbutil,
libxcb-util,
libxcb-wm,
xcbutilxrm,
libstartup_notification,
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
libxcb
libxcb-keysyms
xcbutil
libxcb-util
libxcb-wm
xcbutilxrm
libxkbcommon
+2 -2
View File
@@ -43,7 +43,7 @@
wayland,
wayland-protocols,
wayland-scanner,
xcbutil,
libxcb-util,
libxcb-wm,
xz,
# Boolean flags
@@ -105,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: {
valgrind
wayland
wayland-protocols
xcbutil
libxcb-util
libxcb-wm
xz
]
+2 -2
View File
@@ -22,7 +22,7 @@
libGL,
libxcb,
vst2-sdk,
xcbutil,
libxcb-util,
libxkbcommon,
libxcb-keysyms,
libxcb-cursor,
@@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: {
zenity
alsa-tools
libxcb
xcbutil
libxcb-util
libxkbcommon
libxcb-keysyms
libxcb-cursor
+2 -2
View File
@@ -15,7 +15,7 @@
libjpeg,
libtool,
wxGTK32,
xcbutil,
libxcb-util,
sqlite,
gtk3,
patchelf,
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
libnotify
libX11
libxcb
xcbutil
libxcb-util
];
NIX_LDFLAGS = lib.optionalString (!headless) "-lX11";
+2 -2
View File
@@ -4,7 +4,7 @@
fetchFromGitHub,
libxcb,
libXinerama,
xcbutil,
libxcb-util,
libxcb-keysyms,
libxcb-wm,
nixosTests,
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
libxcb
libXinerama
xcbutil
libxcb-util
libxcb-keysyms
libxcb-wm
];
+2 -2
View File
@@ -9,7 +9,7 @@
libX11,
pkg-config,
upx,
xcbutil,
libxcb-util,
}:
stdenv.mkDerivation {
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
libGL
libGLU
libX11
xcbutil
libxcb-util
];
nativeBuildInputs = [
+2 -2
View File
@@ -8,7 +8,7 @@
libxkbcommon,
libxcb-cursor,
libxcb-keysyms,
xcbutil,
libxcb-util,
libXrandr,
libXinerama,
libXcursor,
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
libxkbcommon
libxcb-cursor
libxcb-keysyms
xcbutil
libxcb-util
libXrandr
libXinerama
libXcursor
+2 -2
View File
@@ -2,7 +2,7 @@
lib,
stdenv,
fetchFromBitbucket,
xcbutil,
libxcb-util,
libxcb-keysyms,
libxcb-wm,
libxcb-cursor,
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
};
buildInputs = [
xcbutil
libxcb-util
libxcb-keysyms
libxcb-wm
libxcb-cursor
+2 -2
View File
@@ -8,7 +8,7 @@
libxkbcommon,
libxcb-cursor,
libxcb-keysyms,
xcbutil,
libxcb-util,
libXrandr,
libXinerama,
libXcursor,
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
libxkbcommon
libxcb-cursor
libxcb-keysyms
xcbutil
libxcb-util
libXrandr
libXinerama
libXcursor
+2 -2
View File
@@ -8,7 +8,7 @@
libxkbcommon,
libxcb-cursor,
libxcb-keysyms,
xcbutil,
libxcb-util,
libXrandr,
libXinerama,
libXcursor,
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
libxkbcommon
libxcb-cursor
libxcb-keysyms
xcbutil
libxcb-util
libXrandr
libXinerama
libXcursor
@@ -5,7 +5,7 @@
libX11,
libxcb,
pkg-config,
xcbutil,
libxcb-util,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
libX11
libxcb
xcbutil
libxcb-util
];
meta = {
+2 -2
View File
@@ -24,7 +24,7 @@
docutils,
libxcb,
libX11,
xcbutil,
libxcb-util,
libxcb-wm,
}:
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
libxcb
libX11
xcbutil
libxcb-util
libxcb-wm
libXdmcp
libXau
+2 -2
View File
@@ -24,7 +24,7 @@
pkg-config,
stdenv,
uthash,
xcbutil,
libxcb-util,
libxcb-image,
libxcb-render-util,
xorgproto,
@@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
pcre2
pixman
uthash
xcbutil
libxcb-util
libxcb-image
libxcb-render-util
xorgproto
+2 -2
View File
@@ -15,7 +15,7 @@
lib,
stdenv,
xcbproto,
xcbutil,
libxcb-util,
libxcb-cursor,
libxcb-image,
libxcb-render-util,
@@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
pcre
python3
xcbproto
xcbutil
libxcb-util
libxcb-cursor
libxcb-image
libxcb-render-util
+2 -2
View File
@@ -24,7 +24,7 @@
wayland-scanner,
which,
xcb-imdkit,
xcbutil,
libxcb-util,
libxcb-cursor,
libxcb-keysyms,
libxcb-wm,
@@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optionals x11Support [
libxcb
xcb-imdkit
xcbutil
libxcb-util
libxcb-cursor
libxcb-keysyms
libxcb-wm
+2 -2
View File
@@ -8,7 +8,7 @@
libXcursor,
libXft,
libXt,
xcbutil,
libxcb-util,
libxcb-keysyms,
libxcb-wm,
writeShellScript,
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
libXcursor
libXft
libXt
xcbutil
libxcb-util
libxcb-keysyms
libxcb-wm
libbsd
+2 -2
View File
@@ -12,7 +12,7 @@
libsndfile,
libxcb,
libxkbcommon,
xcbutil,
libxcb-util,
libxcb-cursor,
libxcb-keysyms,
zenity,
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
libsndfile
libxcb
libxkbcommon
xcbutil
libxcb-util
libxcb-cursor
libxcb-keysyms
zenity
+2 -2
View File
@@ -5,7 +5,7 @@
fetchpatch,
asciidoc,
libxcb,
xcbutil,
libxcb-util,
libxcb-keysyms,
libxcb-wm,
nixosTests,
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
libxcb
xcbutil
libxcb-util
libxcb-keysyms
libxcb-wm
];
+2 -2
View File
@@ -9,7 +9,7 @@
fontconfig,
freetype,
libxcb,
xcbutil,
libxcb-util,
libxcb-cursor,
libxcb-keysyms,
libxkbcommon,
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
fontconfig
freetype
libxcb
xcbutil
libxcb-util
libxcb-cursor
libxcb-keysyms
libxkbcommon
+2 -2
View File
@@ -44,7 +44,7 @@
libXrender,
libXtst,
libxshmfence,
xcbutil,
libxcb-util,
libxcb-image,
libxcb-keysyms,
libxcb-render-util,
@@ -110,7 +110,7 @@ stdenv.mkDerivation rec {
libXrender
libXtst
libxshmfence
xcbutil
libxcb-util
libxcb-image
libXScrnSaver
libxcb-keysyms
+2 -2
View File
@@ -19,7 +19,7 @@
vulkan-loader,
wayland,
wezterm,
xcbutil,
libxcb-util,
libxcb-image,
libxcb-keysyms,
libxcb-wm,
@@ -78,7 +78,7 @@ rustPlatform.buildRustPackage rec {
libxcb
libxkbcommon
wayland
xcbutil
libxcb-util
libxcb-image
libxcb-keysyms
libxcb-wm # contains xcb-ewmh among others
+2 -2
View File
@@ -4,7 +4,7 @@
fetchFromGitHub,
libxcb,
libXrandr,
xcbutil,
libxcb-util,
libxcb-keysyms,
libxcb-wm,
xcbproto,
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
libxcb
libXrandr
xcbutil
libxcb-util
libxcb-keysyms
libxcb-wm
xcbproto
+2 -2
View File
@@ -3,7 +3,7 @@
stdenv,
fetchFromGitHub,
libxcb,
xcbutil,
libxcb-util,
libxcb-cursor,
}:
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
libxcb
xcbutil
libxcb-util
libxcb-cursor
];
+2 -2
View File
@@ -30,7 +30,7 @@
pixman,
pkg-config,
systemd,
xcbutil,
libxcb-util,
libxcb-wm,
libxcb-image,
xkbcomp,
@@ -83,7 +83,7 @@ stdenv.mkDerivation (finalPackages: rec {
openssl
pixman
systemd
xcbutil
libxcb-util
libxcb-wm
libxcb-image
xkbcomp
+2 -2
View File
@@ -5,7 +5,7 @@
cmake,
extra-cmake-modules,
uthash,
xcbutil,
libxcb-util,
libxcb-keysyms,
xorgproto,
}:
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
];
buildInputs = [
xcbutil
libxcb-util
libxcb-keysyms
];
+2 -2
View File
@@ -5,7 +5,7 @@
pkg-config,
m4,
libxcb,
xcbutil,
libxcb-util,
libX11,
}:
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
doCheck = true;
buildInputs = [
libxcb
xcbutil
libxcb-util
libX11
];
+2 -2
View File
@@ -3,7 +3,7 @@
stdenv,
fetchFromGitHub,
libxcb,
xcbutil,
libxcb-util,
libxcb-wm,
}:
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
libxcb
libxcb-wm
xcbutil
libxcb-util
];
meta = {
+2 -2
View File
@@ -7,7 +7,7 @@
freetype,
pkg-config,
gettext,
xcbutil,
libxcb-util,
gcc,
intltool,
file,
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
fox_1_6
gettext
xcbutil
libxcb-util
gcc
file
libpng
+2 -2
View File
@@ -6,7 +6,7 @@
fontconfig,
harfbuzz,
libpng,
xcbutil,
libxcb-util,
libXcursor,
libxcb-image,
libxkbcommon,
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
libpng
libxkbcommon
libxcb-cursor
xcbutil
libxcb-util
libxcb-image
];
+2 -2
View File
@@ -9,7 +9,7 @@
libpthreadstubs,
libXau,
libXdmcp,
xcbutil,
libxcb-util,
nixosTests,
}:
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
libpthreadstubs
libXau
libXdmcp
xcbutil
libxcb-util
];
passthru.tests = { inherit (nixosTests) xss-lock; };
+2 -2
View File
@@ -3,7 +3,7 @@
stdenv,
fetchFromGitHub,
libxcb,
xcbutil,
libxcb-util,
libxcb-wm,
git,
}:
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
libxcb
git
xcbutil
libxcb-util
libxcb-wm
];
+2 -2
View File
@@ -20,7 +20,7 @@
mesa-gl-headers,
openssl,
pixman,
xcbutil,
libxcb-util,
libxcb-image,
libxcb-keysyms,
libxcb-render-util,
@@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
mesa-gl-headers
openssl
pixman
xcbutil
libxcb-util
libxcb-image
libxcb-keysyms
libxcb-render-util
+2 -2
View File
@@ -6,7 +6,7 @@
autoreconfHook,
installShellFiles,
pixman,
xcbutil,
libxcb-util,
libxcb-image,
libseccomp,
libjpeg,
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
pixman
libxcb-image
xcbutil
libxcb-util
libseccomp
libjpeg
libpng
+2 -2
View File
@@ -21,7 +21,7 @@
wayland,
wayland-protocols,
wayland-scanner,
xcbutil,
libxcb-util,
libxcb-cursor,
libxcb-errors,
libxcb-wm,
@@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
wayland-protocols
]
++ lib.optionals x11Support [
xcbutil
libxcb-util
libxcb-cursor
libxcb-errors
libxcb-wm
@@ -42,7 +42,7 @@
pcre2,
sqlite,
udev,
xcbutil,
libxcb-util,
libxcb-image,
libxcb-keysyms,
libxcb-render-util,
@@ -131,7 +131,7 @@ stdenv.mkDerivation (
libXrender
libxcb
libxkbcommon
xcbutil
libxcb-util
libxcb-image
libxcb-keysyms
libxcb-render-util
@@ -56,7 +56,7 @@
pcre2,
sqlite,
udev,
xcbutil,
libxcb-util,
libxcb-image,
libxcb-keysyms,
libxcb-render-util,
@@ -153,7 +153,7 @@ stdenv.mkDerivation rec {
libXrender
libxcb
libxkbcommon
xcbutil
libxcb-util
libxcb-image
libxcb-keysyms
libxcb-render-util
+2 -2
View File
@@ -22,7 +22,7 @@
libxml2_13,
ncurses,
wayland,
xcbutil,
libxcb-util,
zlib,
zstd,
}:
@@ -63,7 +63,7 @@ stdenv.mkDerivation {
libxml2_13
ncurses
wayland
xcbutil
libxcb-util
zlib
zstd
];
+2 -2
View File
@@ -29,7 +29,7 @@
libthai,
libdatrie,
libxcb-keysyms,
xcbutil,
libxcb-util,
libxcb-wm,
xcb-imdkit,
libxkbfile,
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
libsepol
libXdmcp
libxkbcommon
xcbutil
libxcb-util
libxcb-wm
libxcb-keysyms
xcb-imdkit
+1
View File
@@ -1908,6 +1908,7 @@ mapAliases {
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
xcbutil = libxcb-util; # Added 2026-02-04
xcbutilcursor = libxcb-cursor; # Added 2026-02-04
xcbutilerrors = libxcb-errors; # Added 2026-02-04
xcbutilimage = libxcb-image; # Added 2026-02-04
-1
View File
@@ -8855,7 +8855,6 @@ with pkgs;
libXxf86vm = libxxf86vm;
mkfontdir = mkfontscale;
xcbproto = xcb-proto;
xcbutil = libxcb-util;
zabbixFor = version: rec {
agent = (callPackages ../servers/monitoring/zabbix/agent.nix { }).${version};