From 710fcd2bc5ad66380bef7bfd8edad0f1d1885fd3 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Wed, 4 Feb 2026 18:26:54 +0100 Subject: [PATCH] xorgserver: rename references and deprecate alias this shouldn't create any rebuilds --- pkgs/applications/video/vdr/softhddevice/default.nix | 4 ++-- pkgs/applications/window-managers/i3/default.nix | 4 ++-- pkgs/by-name/ba/bamf/package.nix | 4 ++-- pkgs/by-name/bu/bumblebee/package.nix | 6 +++--- pkgs/by-name/gd/gdm/package.nix | 6 +++--- pkgs/by-name/ge/geis/package.nix | 4 ++-- pkgs/by-name/gn/gnome-control-center/package.nix | 4 ++-- pkgs/by-name/he/herbstluftwm/package.nix | 4 ++-- pkgs/by-name/lu/lutris-unwrapped/package.nix | 4 ++-- pkgs/by-name/mu/muffin/package.nix | 4 ++-- pkgs/by-name/mu/mutter/package.nix | 4 ++-- pkgs/by-name/mu/mutter48/package.nix | 4 ++-- pkgs/by-name/se/selinux-sandbox/package.nix | 6 +++--- pkgs/by-name/xf/xf86-input-cmt/package.nix | 4 ++-- pkgs/by-name/xf/xf86-input-evdev/package.nix | 2 +- pkgs/by-name/xf/xf86-input-wacom/package.nix | 4 ++-- pkgs/by-name/xp/xpra/package.nix | 10 +++++----- .../python-modules/qtile-extras/default.nix | 4 ++-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 20 files changed, 42 insertions(+), 42 deletions(-) diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix index dc4c069df341..f6c9e6f274c8 100644 --- a/pkgs/applications/video/vdr/softhddevice/default.nix +++ b/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 = { diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index d761e7144297..3eba467c0046 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/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 diff --git a/pkgs/by-name/ba/bamf/package.nix b/pkgs/by-name/ba/bamf/package.nix index 0f0dfc309246..4231719ddf11 100644 --- a/pkgs/by-name/ba/bamf/package.nix +++ b/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 = [ diff --git a/pkgs/by-name/bu/bumblebee/package.nix b/pkgs/by-name/bu/bumblebee/package.nix index d44ac9bfaa2e..026b10a1b85d 100644 --- a/pkgs/by-name/bu/bumblebee/package.nix +++ b/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 ) ); diff --git a/pkgs/by-name/gd/gdm/package.nix b/pkgs/by-name/gd/gdm/package.nix index d81cb58d5295..ce03f3130dca 100644 --- a/pkgs/by-name/gd/gdm/package.nix +++ b/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 diff --git a/pkgs/by-name/ge/geis/package.nix b/pkgs/by-name/ge/geis/package.nix index 4e049ccbc44a..d2d1951c39fd 100644 --- a/pkgs/by-name/ge/geis/package.nix +++ b/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 = '' diff --git a/pkgs/by-name/gn/gnome-control-center/package.nix b/pkgs/by-name/gn/gnome-control-center/package.nix index 2d84429ee513..947aefe87b30 100644 --- a/pkgs/by-name/gn/gnome-control-center/package.nix +++ b/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; diff --git a/pkgs/by-name/he/herbstluftwm/package.nix b/pkgs/by-name/he/herbstluftwm/package.nix index 4f7b6fec3ab9..b33d446464d6 100644 --- a/pkgs/by-name/he/herbstluftwm/package.nix +++ b/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 diff --git a/pkgs/by-name/lu/lutris-unwrapped/package.nix b/pkgs/by-name/lu/lutris-unwrapped/package.nix index a06c8fb92384..3846f9245415 100644 --- a/pkgs/by-name/lu/lutris-unwrapped/package.nix +++ b/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 diff --git a/pkgs/by-name/mu/muffin/package.nix b/pkgs/by-name/mu/muffin/package.nix index f249d6ad4d31..eac0caef6cee 100644 --- a/pkgs/by-name/mu/muffin/package.nix +++ b/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 ]; diff --git a/pkgs/by-name/mu/mutter/package.nix b/pkgs/by-name/mu/mutter/package.nix index 7dce4468738a..a4fc48ff37be 100644 --- a/pkgs/by-name/mu/mutter/package.nix +++ b/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 ]; diff --git a/pkgs/by-name/mu/mutter48/package.nix b/pkgs/by-name/mu/mutter48/package.nix index 17c973d1751d..96a032e8bdba 100644 --- a/pkgs/by-name/mu/mutter48/package.nix +++ b/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 ]; diff --git a/pkgs/by-name/se/selinux-sandbox/package.nix b/pkgs/by-name/se/selinux-sandbox/package.nix index c6202e84ffea..b4c624e5f26b 100644 --- a/pkgs/by-name/se/selinux-sandbox/package.nix +++ b/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" \ diff --git a/pkgs/by-name/xf/xf86-input-cmt/package.nix b/pkgs/by-name/xf/xf86-input-cmt/package.nix index 2e7a21877d58..a5af589101a8 100644 --- a/pkgs/by-name/xf/xf86-input-cmt/package.nix +++ b/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 diff --git a/pkgs/by-name/xf/xf86-input-evdev/package.nix b/pkgs/by-name/xf/xf86-input-evdev/package.nix index df15fa63733c..3a414ba30662 100644 --- a/pkgs/by-name/xf/xf86-input-evdev/package.nix +++ b/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" diff --git a/pkgs/by-name/xf/xf86-input-wacom/package.nix b/pkgs/by-name/xf/xf86-input-wacom/package.nix index 7eb6174e950f..99e349e54d7e 100644 --- a/pkgs/by-name/xf/xf86-input-wacom/package.nix +++ b/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; diff --git a/pkgs/by-name/xp/xpra/package.nix b/pkgs/by-name/xp/xpra/package.nix index 0d0c56017985..c482b3071e5c 100644 --- a/pkgs/by-name/xp/xpra/package.nix +++ b/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 diff --git a/pkgs/development/python-modules/qtile-extras/default.nix b/pkgs/development/python-modules/qtile-extras/default.nix index 82a644355182..f636eed0e849 100644 --- a/pkgs/development/python-modules/qtile-extras/default.nix +++ b/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 ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7cc746394295..8e3d608a39b4 100644 --- a/pkgs/top-level/aliases.nix +++ b/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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c87001c26e12..648244d4d2ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/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};