xorgserver: rename references and deprecate alias

this shouldn't create any rebuilds

pkgs/applications/video/vdr/softhddevice/default.nix

@@ -5,7 +5,7 @@
   alsa-lib,
   fetchFromGitHub,
   xcbutilwm,
-  xorgserver,
+  xorg-server,
   ffmpeg,
   libva,
   libvdpau,
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace softhddev.c \
-      --replace "LOCALBASE \"/bin/X\"" "\"${xorgserver}/bin/X\""
+      --replace "LOCALBASE \"/bin/X\"" "\"${xorg-server}/bin/X\""
   '';
 
   meta = {

pkgs/applications/window-managers/i3/default.nix

@@ -22,7 +22,7 @@
   pango,
   perlPackages,
   libxkbcommon,
-  xorgserver,
+  xorg-server,
   xvfb-run,
   xdotool,
   xrandr,
@@ -104,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: {
   doCheck = stdenv.hostPlatform.isLinux;
 
   nativeCheckInputs = lib.optionals finalAttrs.finalPackage.doCheck [
-    xorgserver
+    xorg-server
     xvfb-run
     xdotool
     setxkbmap

pkgs/by-name/ba/bamf/package.nix

@@ -15,7 +15,7 @@
   gobject-introspection,
   gtk-doc,
   docbook_xsl,
-  xorgserver,
+  xorg-server,
   dbus,
   python3,
   wrapGAppsHook3,
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
     vala
     which
     wrapGAppsHook3
-    xorgserver
+    xorg-server
   ];
 
   buildInputs = [

pkgs/by-name/bu/bumblebee/package.nix

@@ -27,7 +27,7 @@
   glib,
   libbsd,
   libX11,
-  xorgserver,
+  xorg-server,
   kmod,
   xf86videonouveau,
   nvidia_x11 ? linuxPackages.nvidia_x11,
@@ -65,12 +65,12 @@ let
 
   bbdPath = lib.makeBinPath [
     kmod
-    xorgserver
+    xorg-server
   ];
 
   xmodules = lib.concatStringsSep "," (
     map (x: "${x.out or x}/lib/xorg/modules") (
-      [ xorgserver ] ++ lib.optional (!useNvidia) xf86videonouveau
+      [ xorg-server ] ++ lib.optional (!useNvidia) xf86videonouveau
     )
   );
 

pkgs/by-name/gd/gdm/package.nix

@@ -26,7 +26,7 @@
   gobject-introspection,
   plymouth,
   coreutils,
-  xorgserver,
+  xorg-server,
   dbus,
   nixos-icons,
   runCommand,
@@ -110,9 +110,9 @@ stdenv.mkDerivation (finalAttrs: {
       inherit
         coreutils
         plymouth
-        xorgserver
         dbus
         ;
+      xorgserver = xorg-server;
     })
 
     # The following patches implement certain environment variables in GDM which are set by
@@ -135,7 +135,7 @@ stdenv.mkDerivation (finalAttrs: {
   postPatch = ''
     # Upstream checks some common paths to find an `X` binary. We already know it.
     echo #!/bin/sh > build-aux/find-x-server.sh
-    echo "echo ${lib.getBin xorgserver}/bin/X" >> build-aux/find-x-server.sh
+    echo "echo ${lib.getBin xorg-server}/bin/X" >> build-aux/find-x-server.sh
     patchShebangs build-aux/find-x-server.sh
 
     # Reverts https://gitlab.gnome.org/GNOME/gdm/-/commit/b0f802e36ff948a415bfd2bccaa268b6990515b7

pkgs/by-name/ge/geis/package.nix

@@ -18,7 +18,7 @@
   libxext,
   libx11,
   pango,
-  xorgserver,
+  xorg-server,
   testers,
   validatePkgConfig,
 }:
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
     libxtst
     pango
     python3Packages.python
-    xorgserver
+    xorg-server
   ];
 
   prePatch = ''

pkgs/by-name/gn/gnome-control-center/package.nix

@@ -71,7 +71,7 @@
   gnome-user-share,
   gnome-remote-desktop,
   wrapGAppsHook4,
-  xorgserver,
+  xorg-server,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -161,7 +161,7 @@ stdenv.mkDerivation (finalAttrs: {
     python3.pkgs.pygobject3 # for test-networkmanager-service.py
     python3.pkgs.python-dbusmock
     setxkbmap
-    xorgserver # for Xvfb
+    xorg-server # for Xvfb
   ];
 
   doCheck = true;

pkgs/by-name/he/herbstluftwm/package.nix

@@ -16,7 +16,7 @@
   freetype,
   asciidoc,
   xdotool,
-  xorgserver,
+  xorg-server,
   xsetroot,
   xterm,
   runtimeShell,
@@ -109,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: {
       ]
     ))
     xdotool
-    xorgserver
+    xorg-server
     xsetroot
     xterm
     python3.pkgs.pytestCheckHook

pkgs/by-name/lu/lutris-unwrapped/package.nix

@@ -32,7 +32,7 @@
   gettext,
   libstrangle,
   fluidsynth,
-  xorgserver,
+  xorg-server,
   xkbcomp,
   setxkbmap,
   util-linux,
@@ -54,7 +54,7 @@ let
     xgamma
     libstrangle
     fluidsynth
-    xorgserver
+    xorg-server
     setxkbmap
     xkbcomp
     # bypass mount suid wrapper which does not work in fhsenv

pkgs/by-name/mu/muffin/package.nix

@@ -36,7 +36,7 @@
   wayland-protocols,
   wayland-scanner,
   wrapGAppsHook3,
-  xorgserver,
+  xorg-server,
   xwayland,
   zenity,
 }:
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
     pkg-config
     python3
     wrapGAppsHook3
-    xorgserver # for cvt command
+    xorg-server # for cvt command
     gobject-introspection
     wayland-scanner
   ];

pkgs/by-name/mu/mutter/package.nix

@@ -54,7 +54,7 @@
   mesa-gl-headers,
   meson,
   gnome-settings-daemon,
-  xorgserver,
+  xorg-server,
   python3,
   wayland-scanner,
   wrapGAppsHook4,
@@ -121,7 +121,7 @@ stdenv.mkDerivation (finalAttrs: {
     wayland-scanner
     wrapGAppsHook4
     gi-docgen
-    xorgserver
+    xorg-server
     gobject-introspection
     udevCheckHook
   ];

pkgs/by-name/mu/mutter48/package.nix

@@ -54,7 +54,7 @@
   mesa-gl-headers,
   meson,
   gnome-settings-daemon,
-  xorgserver,
+  xorg-server,
   python3,
   wayland-scanner,
   wrapGAppsHook4,
@@ -121,7 +121,7 @@ stdenv.mkDerivation (finalAttrs: {
     wayland-scanner
     wrapGAppsHook4
     gi-docgen
-    xorgserver
+    xorg-server
     gobject-introspection
     udevCheckHook
   ];

pkgs/by-name/se/selinux-sandbox/package.nix

@@ -9,7 +9,7 @@
   policycoreutils,
   selinux-python,
   dbus,
-  xorgserver,
+  xorg-server,
   openbox,
   xmodmap,
   libselinux,
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     libcap_ng
     policycoreutils
     python3
-    xorgserver
+    xorg-server
     openbox
     xmodmap
     dbus
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
       --replace "#!/bin/sh" "#!${bash}/bin/sh" \
       --replace "/usr/share/sandbox/start" "${placeholder "out"}/share/sandbox/start" \
       --replace "/usr/bin/cut" "${coreutils}/bin/cut" \
-      --replace "/usr/bin/Xephyr" "${xorgserver}/bin/Xepyhr" \
+      --replace "/usr/bin/Xephyr" "${xorg-server}/bin/Xepyhr" \
       --replace "secon" "${policycoreutils}/bin/secon"
     substituteInPlace sandbox \
       --replace "/usr/sbin/seunshare" "$out/bin/seunshare" \

pkgs/by-name/xf/xf86-input-cmt/package.nix

@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   pkg-config,
-  xorgserver,
+  xorg-server,
   xorgproto,
   utilmacros,
   libgestures,
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
-    xorgserver
+    xorg-server
     xorgproto
     utilmacros
     libgestures

pkgs/by-name/xf/xf86-input-evdev/package.nix

@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "xf86-input-evdev";
   version = "2.11.0";
 
-  # to get rid of xorgserver.dev; man is tiny
+  # to get rid of xorg-server.dev; man is tiny
   outputs = [
     "out"
     "dev"

pkgs/by-name/xf/xf86-input-wacom/package.nix

@@ -16,7 +16,7 @@
   udev,
   udevCheckHook,
   utilmacros,
-  xorgserver,
+  xorg-server,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
     utilmacros
     pixman
     xorgproto
-    xorgserver
+    xorg-server
   ];
 
   doInstallCheck = true;

pkgs/by-name/xp/xpra/package.nix

@@ -54,7 +54,7 @@
   libx11,
   xorgproto,
   libxkbfile,
-  xorgserver,
+  xorg-server,
   xxHash,
   clang,
   withHtml ? true,
@@ -76,9 +76,9 @@ let
 
   xorgModulePaths = writeText "module-paths" ''
     Section "Files"
-      ModulePath "${xorgserver}/lib/xorg/modules"
-      ModulePath "${xorgserver}/lib/xorg/modules/extensions"
-      ModulePath "${xorgserver}/lib/xorg/modules/drivers"
+      ModulePath "${xorg-server}/lib/xorg/modules"
+      ModulePath "${xorg-server}/lib/xorg/modules/extensions"
+      ModulePath "${xorg-server}/lib/xorg/modules/drivers"
       ModulePath "${xf86videodummy}/lib/xorg/modules/drivers"
     EndSection
   '';
@@ -254,7 +254,7 @@ effectiveBuildPythonApplication rec {
       --prefix PATH : ${
         lib.makeBinPath [
           getopt
-          xorgserver
+          xorg-server
           xauth
           which
           util-linux

pkgs/development/python-modules/qtile-extras/default.nix

@@ -19,7 +19,7 @@
   qtile,
   requests,
   setuptools-scm,
-  xorgserver,
+  xorg-server,
   nixosTests,
 }:
 buildPythonPackage rec {
@@ -63,7 +63,7 @@ buildPythonPackage rec {
     python-dateutil
     qtile
     requests
-    xorgserver
+    xorg-server
     # stravalib  # marked as broken due to https://github.com/stravalib/stravalib/issues/379
   ];
 

pkgs/top-level/aliases.nix

@@ -2225,6 +2225,7 @@ mapAliases {
     };
   xorg-autoconf = util-macros; # Added 2025-08-18
   xorgdocs = xorg-docs; # Added 2026-01-19
+  xorgserver = xorg-server; # Added 2026-02-04
   xorgsgmldoctools = xorg-sgml-doctools; # Added 2026-01-19
   xow_dongle-firmware = throw "'xow_dongle-firmware' has been renamed to/replaced by 'xone-dongle-firmware'"; # Added 2025-12-30
   xsw = throw "'xsw' has been removed due to lack of upstream maintenance"; # Added 2025-08-22

pkgs/top-level/all-packages.nix

@@ -8870,7 +8870,6 @@ with pkgs;
   xf86videonouveau = xf86-video-nouveau;
   xkeyboardconfig = xkeyboard-config;
   xorgcffiles = xorg-cf-files;
-  xorgserver = xorg-server;
 
   zabbixFor = version: rec {
     agent = (callPackages ../servers/monitoring/zabbix/agent.nix { }).${version};