xcbutilwm: rename references and deprecate alias

this shouldn't create any rebuilds
This commit is contained in:
quantenzitrone
2026-02-04 19:08:13 +01:00
parent d8dee65535
commit 866aa37ba3
42 changed files with 81 additions and 81 deletions

View File

@@ -38,7 +38,7 @@
libxcb,
libxkbcommon,
mesa-demos,
xcbutilwm,
libxcb-wm,
xcbutilrenderutil,
xcbutilkeysyms,
xcbutilimage,
@@ -171,7 +171,7 @@ let
libX11
libxcb
libxkbcommon
xcbutilwm
libxcb-wm
xcbutilrenderutil
xcbutilkeysyms
xcbutilimage

View File

@@ -27,7 +27,7 @@
xcbutilimage,
xcbutilkeysyms,
xcbutilrenderutil,
xcbutilwm,
libxcb-wm,
}:
{
@@ -69,7 +69,7 @@ let
xcbutilimage
xcbutilkeysyms
xcbutilrenderutil
xcbutilwm
libxcb-wm
];
dontBuild = true;

View File

@@ -4,7 +4,7 @@
vdr,
alsa-lib,
fetchFromGitHub,
xcbutilwm,
libxcb-wm,
xorg-server,
ffmpeg,
libva,
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
buildInputs = [
vdr
xcbutilwm
libxcb-wm
ffmpeg
alsa-lib
libva

View File

@@ -5,7 +5,7 @@
patches,
libxcb,
xcbutilkeysyms,
xcbutilwm,
libxcb-wm,
libX11,
xcbutil,
xcbutilxrm,
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
buildInputs = [
libxcb
xcbutilkeysyms
xcbutilwm
libxcb-wm
libX11
xcbutil
xcbutilxrm

View File

@@ -15,7 +15,7 @@
pkg-config,
libxcb-cursor,
xcbutilkeysyms,
xcbutilwm,
libxcb-wm,
xcbutil,
xmodmap,
}:
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
pcre2
libxcb-cursor
xcbutilkeysyms
xcbutilwm
libxcb-wm
xcbutil
];

View File

@@ -10,7 +10,7 @@
libxcb,
xcbutilkeysyms,
xcbutil,
xcbutilwm,
libxcb-wm,
xcbutilxrm,
libstartup_notification,
libX11,
@@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
libxcb
xcbutilkeysyms
xcbutil
xcbutilwm
libxcb-wm
xcbutilxrm
libxkbcommon
libstartup_notification

View File

@@ -14,7 +14,7 @@
libinput,
libxkbcommon,
vulkan-headers,
xcbutilwm,
libxcb-wm,
gtkmm3,
withFiltersPlugin ? true,
withFocusRequestPlugin ? true,
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
libinput
libxkbcommon
vulkan-headers
xcbutilwm
libxcb-wm
gtkmm3
];

View File

@@ -44,7 +44,7 @@
wayland-protocols,
wayland-scanner,
xcbutil,
xcbutilwm,
libxcb-wm,
xz,
# Boolean flags
buildManPages ? true,
@@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: {
wayland
wayland-protocols
xcbutil
xcbutilwm
libxcb-wm
xz
]
++ lib.optionals (!useBuiltinLua) [ luajit ]

View File

@@ -15,7 +15,7 @@
xcbutilimage,
xcbutilkeysyms,
xcbutilrenderutil,
xcbutilwm,
libxcb-wm,
libxml2,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
xcbutilimage
xcbutilkeysyms
xcbutilrenderutil
xcbutilwm
libxcb-wm
];
installPhase = ''

View File

@@ -6,7 +6,7 @@
libXinerama,
xcbutil,
xcbutilkeysyms,
xcbutilwm,
libxcb-wm,
nixosTests,
}:
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
libXinerama
xcbutil
xcbutilkeysyms
xcbutilwm
libxcb-wm
];
makeFlags = [ "PREFIX=$(out)" ];

View File

@@ -14,7 +14,7 @@
wayland-protocols,
pixman,
libxkbcommon,
xcbutilwm,
libxcb-wm,
libGL,
libX11,
xwayland ? null,
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
wayland-protocols
pixman
libxkbcommon
xcbutilwm
libxcb-wm
libGL
libX11
];

View File

@@ -8,7 +8,7 @@
libevdev,
libinput,
libxkbcommon,
xcbutilwm,
libxcb-wm,
makeWrapper,
meson,
ninja,
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
libevdev
libinput
libxkbcommon
xcbutilwm
libxcb-wm
pango
pixman
systemd

View File

@@ -4,7 +4,7 @@
fetchFromBitbucket,
xcbutil,
xcbutilkeysyms,
xcbutilwm,
libxcb-wm,
libxcb-cursor,
}:
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
xcbutil
xcbutilkeysyms
xcbutilwm
libxcb-wm
libxcb-cursor
];

View File

@@ -16,7 +16,7 @@
wayland-scanner,
wlroots_0_18,
writeText,
xcbutilwm,
libxcb-wm,
xwayland,
# Boolean flags
enableXWayland ? true,
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
]
++ lib.optionals enableXWayland [
libX11
xcbutilwm
libxcb-wm
xwayland
];

View File

@@ -12,7 +12,7 @@
ladspa-sdk,
libxcb,
lv2,
xcbutilwm,
libxcb-wm,
libxcb-util,
zita-convolver,
zita-resampler,
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
ladspa-sdk
libxcb
lv2
xcbutilwm
libxcb-wm
libxcb-util
zita-convolver
zita-resampler

View File

@@ -23,7 +23,7 @@
wayland-protocols,
wayland-scanner,
wlroots_0_19,
xcbutilwm,
libxcb-wm,
xwayland,
}:
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
wayland
wayland-protocols
wlroots_0_19
xcbutilwm
libxcb-wm
xwayland
];

View File

@@ -25,7 +25,7 @@
libxcb,
libX11,
xcbutil,
xcbutilwm,
libxcb-wm,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
libxcb
libX11
xcbutil
xcbutilwm
libxcb-wm
libXdmcp
libXau
libpulseaudio

View File

@@ -12,7 +12,7 @@
wayland,
wayland-protocols,
wayland-scanner,
xcbutilwm,
libxcb-wm,
xwayland,
enableXWayland ? true,
meson,
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
]
++ lib.optionals enableXWayland [
libX11
xcbutilwm
libxcb-wm
xwayland
];

View File

@@ -20,7 +20,7 @@
xcbutilimage,
xcbutilkeysyms,
xcbutilrenderutil,
xcbutilwm,
libxcb-wm,
}:
let
version = "6.0.6";
@@ -48,7 +48,7 @@ let
xcbutilimage
xcbutilkeysyms
xcbutilrenderutil
xcbutilwm
libxcb-wm
];
meta = {

View File

@@ -19,7 +19,7 @@
libxcb-cursor,
xcbutilimage,
xcbutilrenderutil,
xcbutilwm,
libxcb-wm,
xcbutilxrm,
makeWrapper,
removeReferencesTo,
@@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
libxcb-cursor
xcbutilimage
xcbutilrenderutil
xcbutilwm
libxcb-wm
xcbutilxrm
]
++ lib.optional alsaSupport alsa-lib

View File

@@ -27,7 +27,7 @@
xcbutil,
libxcb-cursor,
xcbutilkeysyms,
xcbutilwm,
libxcb-wm,
xcbutilxrm,
waylandSupport ? true,
x11Support ? true,
@@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: {
xcbutil
libxcb-cursor
xcbutilkeysyms
xcbutilwm
libxcb-wm
xcbutilxrm
];

View File

@@ -15,7 +15,7 @@
libGL,
libgbm,
libxcb,
xcbutilwm,
libxcb-wm,
validatePkgConfig,
testers,
wayland-scanner,
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
libxkbcommon
libgbm
libxcb
xcbutilwm
libxcb-wm
pixman
wayland
wayland-protocols

View File

@@ -10,7 +10,7 @@
libXt,
xcbutil,
xcbutilkeysyms,
xcbutilwm,
libxcb-wm,
writeShellScript,
curl,
jq,
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
libXt
xcbutil
xcbutilkeysyms
xcbutilwm
libxcb-wm
libbsd
];

View File

@@ -24,7 +24,7 @@
scdoc,
scenefx,
wayland-scanner,
xcbutilwm,
libxcb-wm,
wlroots_0_19,
testers,
nixosTests,
@@ -101,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: {
wayland-protocols
(wlroots_0_19.override { inherit (finalAttrs) enableXWayland; })
]
++ lib.optionals finalAttrs.enableXWayland [ xcbutilwm ];
++ lib.optionals finalAttrs.enableXWayland [ libxcb-wm ];
mesonFlags =
let

View File

@@ -7,7 +7,7 @@
libxcb,
xcbutil,
xcbutilkeysyms,
xcbutilwm,
libxcb-wm,
nixosTests,
}:
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
libxcb
xcbutil
xcbutilkeysyms
xcbutilwm
libxcb-wm
];
strictDeps = true;

View File

@@ -13,7 +13,7 @@
glm,
assimp,
libxcb,
xcbutilwm,
libxcb-wm,
nix-update-script,
}:
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
glm
assimp
libxcb
xcbutilwm
libxcb-wm
wayland
wayland-protocols
];

View File

@@ -16,7 +16,7 @@
wayland,
which,
xcbutilkeysyms,
xcbutilwm,
libxcb-wm,
valijson,
vulkan-headers,
vulkan-loader,
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
vulkan-utility-libraries
wayland
xcbutilkeysyms
xcbutilwm
libxcb-wm
qt6.qtbase
qt6.qtwayland
];

View File

@@ -48,7 +48,7 @@
xcbutilimage,
xcbutilkeysyms,
xcbutilrenderutil,
xcbutilwm,
libxcb-wm,
p7zip,
onetbb,
wayland,
@@ -115,7 +115,7 @@ stdenv.mkDerivation rec {
libXScrnSaver
xcbutilkeysyms
xcbutilrenderutil
xcbutilwm
libxcb-wm
onetbb
wayland
];

View File

@@ -28,7 +28,7 @@
atkmm,
libdrm,
libxkbcommon,
xcbutilwm,
libxcb-wm,
xcbutilimage,
xcbutilkeysyms,
xcbutilrenderutil,
@@ -84,7 +84,7 @@ let
stdenv.cc.libc
pango
zlib
xcbutilwm
libxcb-wm
xcbutilimage
xcbutilkeysyms
xcbutilrenderutil

View File

@@ -22,7 +22,7 @@
xcbutil,
xcbutilimage,
xcbutilkeysyms,
xcbutilwm,
libxcb-wm,
zlib,
}:
@@ -81,7 +81,7 @@ rustPlatform.buildRustPackage rec {
xcbutil
xcbutilimage
xcbutilkeysyms
xcbutilwm # contains xcb-ewmh among others
libxcb-wm # contains xcb-ewmh among others
];
buildFeatures = [ "distro-defaults" ];

View File

@@ -6,7 +6,7 @@
libXrandr,
xcbutil,
xcbutilkeysyms,
xcbutilwm,
libxcb-wm,
xcbproto,
}:
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
libXrandr
xcbutil
xcbutilkeysyms
xcbutilwm
libxcb-wm
xcbproto
];

View File

@@ -31,7 +31,7 @@
pkg-config,
systemd,
xcbutil,
xcbutilwm,
libxcb-wm,
xcbutilimage,
xkbcomp,
xkeyboard_config,
@@ -84,7 +84,7 @@ stdenv.mkDerivation (finalPackages: rec {
pixman
systemd
xcbutil
xcbutilwm
libxcb-wm
xcbutilimage
xkbcomp
xkeyboard_config

View File

@@ -4,7 +4,7 @@
fetchFromGitHub,
libxcb,
xcbutil,
xcbutilwm,
libxcb-wm,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
libxcb
xcbutilwm
libxcb-wm
xcbutil
];

View File

@@ -4,7 +4,7 @@
fetchFromGitHub,
libxcb,
xcbutil,
xcbutilwm,
libxcb-wm,
git,
}:
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
libxcb
git
xcbutil
xcbutilwm
libxcb-wm
];
meta = {

View File

@@ -24,7 +24,7 @@
xcbutilimage,
xcbutilkeysyms,
xcbutilrenderutil,
xcbutilwm,
libxcb-wm,
xkbcomp,
xkeyboard-config,
xorgproto,
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
xcbutilimage
xcbutilkeysyms
xcbutilrenderutil
xcbutilwm
libxcb-wm
xorgproto
xtrans
];

View File

@@ -24,7 +24,7 @@
xcbutil,
libxcb-cursor,
xcbutilerrors,
xcbutilwm,
libxcb-wm,
waylandSupport ? true,
x11Support ? true,
}:
@@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
xcbutil
libxcb-cursor
xcbutilerrors
xcbutilwm
libxcb-wm
];
strictDeps = true;

View File

@@ -46,7 +46,7 @@
xcbutilimage,
xcbutilkeysyms,
xcbutilrenderutil,
xcbutilwm,
libxcb-wm,
zlib,
at-spi2-core,
@@ -135,7 +135,7 @@ stdenv.mkDerivation (
xcbutilimage
xcbutilkeysyms
xcbutilrenderutil
xcbutilwm
libxcb-wm
]
++ lib.optional libGLSupported libGL
);

View File

@@ -60,7 +60,7 @@
xcbutilimage,
xcbutilkeysyms,
xcbutilrenderutil,
xcbutilwm,
libxcb-wm,
zlib,
at-spi2-core,
unixODBC,
@@ -157,7 +157,7 @@ stdenv.mkDerivation rec {
xcbutilimage
xcbutilkeysyms
xcbutilrenderutil
xcbutilwm
libxcb-wm
libxdmcp
libxtst
libxcb-cursor

View File

@@ -30,7 +30,7 @@
wayland-scanner,
wlroots,
libxcb-cursor,
xcbutilwm,
libxcb-wm,
xcffib,
nixosTests,
extraPackages ? [ ],
@@ -112,7 +112,7 @@ buildPythonPackage (finalAttrs: {
libxkbcommon
wayland
wlroots
xcbutilwm
libxcb-wm
];
propagatedBuildInputs = [

View File

@@ -30,7 +30,7 @@
libdatrie,
xcbutilkeysyms,
xcbutil,
xcbutilwm,
libxcb-wm,
xcb-imdkit,
libxkbfile,
nixosTests,
@@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
libXdmcp
libxkbcommon
xcbutil
xcbutilwm
libxcb-wm
xcbutilkeysyms
xcb-imdkit
xkeyboard_config

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
xcbutilwm = libxcb-wm; # 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

View File

@@ -8860,7 +8860,6 @@ with pkgs;
xcbutilimage = libxcb-image;
xcbutilkeysyms = libxcb-keysyms;
xcbutilrenderutil = libxcb-render-util;
xcbutilwm = libxcb-wm;
zabbixFor = version: rec {
agent = (callPackages ../servers/monitoring/zabbix/agent.nix { }).${version};