xf86{videonouveau,input{evdev,libinput}}: rename references and deprecate aliases

this shouldn't create any rebuilds
This commit is contained in:
quantenzitrone
2026-02-04 22:57:03 +01:00
parent 1508c3b862
commit 07eefa930d
7 changed files with 13 additions and 13 deletions
+2 -2
View File
@@ -29,7 +29,7 @@
libX11,
xorg-server,
kmod,
xf86videonouveau,
xf86-video-nouveau,
nvidia_x11 ? linuxPackages.nvidia_x11,
linuxPackages,
pkgsi686Linux,
@@ -70,7 +70,7 @@ let
xmodules = lib.concatStringsSep "," (
map (x: "${x.out or x}/lib/xorg/modules") (
[ xorg-server ] ++ lib.optional (!useNvidia) xf86videonouveau
[ xorg-server ] ++ lib.optional (!useNvidia) xf86-video-nouveau
)
);
+2 -2
View File
@@ -10,7 +10,7 @@
automake,
libnotify,
libX11,
xf86inputevdev,
xf86-input-evdev,
}:
stdenv.mkDerivation {
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
glibc
libnotify
libX11
xf86inputevdev
xf86-input-evdev
];
preConfigure = ''
+1 -1
View File
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
patches = [
# Comment from 037167ae17fefe6b5dc86dc05f0dd168031c3c68:
#
# The i965 driver was removed in Mesa 22, but the xf86videointel driver
# The i965 driver was removed in Mesa 22, but the xf86-video-intel driver
# hasn't been updated to reflect this. This leads to the following error
# when used with the affected hardware:
#
+2 -2
View File
@@ -26,7 +26,7 @@
wlr-protocols,
xapp,
xfconf,
xf86inputlibinput,
xf86-input-libinput,
colord,
withColord ? true,
gitUpdater,
@@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
libxklavier
wlr-protocols
xapp # org.x.apps.portal
xf86inputlibinput
xf86-input-libinput
xfconf
]
++ lib.optionals withUpower [ upower ]
+3 -3
View File
@@ -21,7 +21,7 @@
qttools,
qtwayland,
wrapQtAppsHook,
xf86inputlibinput,
xf86-input-libinput,
xkeyboard_config,
gitUpdater,
}:
@@ -60,8 +60,8 @@ stdenv.mkDerivation rec {
qtbase
qtsvg
qtwayland
xf86inputlibinput
xf86inputlibinput.dev
xf86-input-libinput
xf86-input-libinput.dev
];
cmakeFlags = [ "-DCMAKE_CXX_STANDARD=20" ];
+3
View File
@@ -1911,8 +1911,10 @@ mapAliases {
xf86_input_cmt = xf86-input-cmt; # Added 2025-12-12
xf86_input_wacom = xf86-input-wacom; # Added 2025-12-12
xf86_video_nested = xf86-video-nested; # added 2026-01-13
xf86inputevdev = xf86-input-evdev; # Added 2026-02-04
xf86inputjoystick = xf86-input-joystick; # Added 2026-01-19
xf86inputkeyboard = xf86-input-keyboard; # Added 2026-01-19
xf86inputlibinput = xf86-input-libinput; # Added 2026-02-04
xf86inputmouse = xf86-input-mouse; # Added 2026-01-19
xf86inputsynaptics = xf86-input-synaptics; # Added 2026-01-19
xf86inputvmmouse = xf86-input-vmmouse; # Added 2026-01-19
@@ -1935,6 +1937,7 @@ mapAliases {
xf86videomga = xf86-video-mga; # Added 2026-01-19
xf86videoneomagic = xf86-video-neomagic; # Added 2026-01-19
xf86videonewport = throw "The Xorg Newport video driver is broken and hasn't had a release since 2012"; # added 2025-12-13
xf86videonouveau = xf86-video-nouveau; # Added 2026-02-04
xf86videonv = xf86-video-nv; # Added 2026-01-19
xf86videoomap = xf86-video-omap; # Added 2026-01-19
xf86videoopenchrome = xf86-video-openchrome; # Added 2026-01-19
-3
View File
@@ -8865,9 +8865,6 @@ with pkgs;
xcbutilkeysyms = libxcb-keysyms;
xcbutilrenderutil = libxcb-render-util;
xcbutilwm = libxcb-wm;
xf86inputevdev = xf86-input-evdev;
xf86inputlibinput = xf86-input-libinput;
xf86videonouveau = xf86-video-nouveau;
zabbixFor = version: rec {
agent = (callPackages ../servers/monitoring/zabbix/agent.nix { }).${version};