pkgs.xorg: deprecate package set

- `iroh` has been removed and split up into `iroh-dns-server` and `iroh-relay`.

- the `xorg` package set has been deprecated and will be removed, packages have moved to the top level.

- the `xorg` package set has been deprecated, packages have moved to the top level.

- `python3Packages.pygame` has been been renamed to `python3Packages.pygame-original`, the attribute `python3Packages.pygame` will from python 3.14 default to the more actively maintained `python3Packages.pygame-ce`

download-cache/

{

  lib,

  config,

  # keep-sorted start case=no numeric=no block=yes

  appres,

  automake,

  bdftopcf,

  bitmap,

  ed,

  editres,

  font-adobe-100dpi,

  font-adobe-75dpi,

  font-adobe-utopia-100dpi,

  font-adobe-utopia-75dpi,

  font-adobe-utopia-type1,

  font-alias,

  font-arabic-misc,

  font-bh-100dpi,

  font-bh-75dpi,

  font-bh-lucidatypewriter-100dpi,

  font-bh-lucidatypewriter-75dpi,

  font-bh-ttf,

  font-bh-type1,

  font-bitstream-100dpi,

  font-bitstream-75dpi,

  font-bitstream-type1,

  font-cronyx-cyrillic,

  font-cursor-misc,

  font-daewoo-misc,

  font-dec-misc,

  font-encodings,

  font-ibm-type1,

  font-isas-misc,

  font-jis-misc,

  font-micro-misc,

  font-misc-cyrillic,

  font-misc-ethiopic,

  font-misc-meltho,

  font-misc-misc,

  font-mutt-misc,

  font-schumacher-misc,

  font-screen-cyrillic,

  font-sony-misc,

  font-sun-misc,

  font-util,

  font-winitzki-cyrillic,

  font-xfree86-type1,

  fonttosfnt,

  gccmakedep,

  iceauth,

  ico,

  imake,

  libapplewm,

  libdmx,

  libfontenc,

  libfs,

  libice,

  libpciaccess,

  libpthread-stubs,

  libsm,

  libwindowswm,

  libx11,

  libxau,

  libxaw,

  libxcb,

  libxcb-cursor,

  libxcb-errors,

  libxcb-image,

  libxcb-keysyms,

  libxcb-render-util,

  libxcb-util,

  libxcb-wm,

  libxcomposite,

  libxcursor,

  libxcvt,

  libxdamage,

  libxdmcp,

  libxext,

  libxfixes,

  libxfont_1,

  libxfont_2,

  libxft,

  libxi,

  libxinerama,

  libxkbfile,

  libxmu,

  libxp,

  libxpm,

  libxpresent,

  libxrandr,

  libxrender,

  libxres,

  libxscrnsaver,

  libxshmfence,

  libxt,

  libxtst,

  libxv,

  libxvmc,

  libxxf86dga,

  libxxf86misc,

  libxxf86vm,

  listres,

  lndir,

  luit,

  makedepend,

  mkfontscale,

  oclock,

  pixman,

  sessreg,

  setxkbmap,

  smproxy,

  tab-window-manager,

  transset,

  util-macros,

  viewres,

  wrapWithXFileSearchPathHook,

  x11perf,

  xauth,

  xbacklight,

  xbitmaps,

  xcalc,

  xcb-proto,

  xclock,

  xcmsdb,

  xcompmgr,

  xconsole,

  xcursor-themes,

  xcursorgen,

  xdm,

  xdpyinfo,

  xdriinfo,

  xev,

  xeyes,

  xf86-input-evdev,

  xf86-input-joystick,

  xf86-input-keyboard,

  xf86-input-libinput,

  xf86-input-mouse,

  xf86-input-synaptics,

  xf86-input-vmmouse,

  xf86-input-void,

  xf86-video-amdgpu,

  xf86-video-apm,

  xf86-video-ark,

  xf86-video-ast,

  xf86-video-ati,

  xf86-video-chips,

  xf86-video-cirrus,

  xf86-video-dummy,

  xf86-video-fbdev,

  xf86-video-geode,

  xf86-video-i128,

  xf86-video-i740,

  xf86-video-intel,

  xf86-video-mga,

  xf86-video-neomagic,

  xf86-video-nouveau,

  xf86-video-nv,

  xf86-video-omap,

  xf86-video-openchrome,

  xf86-video-qxl,

  xf86-video-r128,

  xf86-video-s3virge,

  xf86-video-savage,

  xf86-video-siliconmotion,

  xf86-video-sis,

  xf86-video-sisusb,

  xf86-video-suncg6,

  xf86-video-sunffb,

  xf86-video-sunleo,

  xf86-video-tdfx,

  xf86-video-trident,

  xf86-video-v4l,

  xf86-video-vbox,

  xf86-video-vesa,

  xf86-video-vmware,

  xf86-video-voodoo,

  xfd,

  xfontsel,

  xfs,

  xfsinfo,

  xgamma,

  xgc,

  xhost,

  xinit,

  xinput,

  xkbcomp,

  xkbevd,

  xkbprint,

  xkbutils,

  xkeyboard-config,

  xkeyboard-config_custom,

  xkill,

  xload,

  xlsatoms,

  xlsclients,

  xlsfonts,

  xmag,

  xmessage,

  xmodmap,

  xmore,

  xorg-cf-files,

  xorg-docs,

  xorg-server,

  xorg-sgml-doctools,

  xorgproto,

  xpr,

  xprop,

  xrandr,

  xrdb,

  xrefresh,

  xset,

  xsetroot,

  xsm,

  xstdcmap,

  xtrans,

  xvfb,

  xvinfo,

  xwd,

  xwininfo,

  xwud,

  # keep-sorted end

}:

_:

{

  inherit

    # keep-sorted start case=no numeric=no block=yes

    appres

    bdftopcf

    bitmap

    editres

    fonttosfnt

    gccmakedep

    iceauth

    ico

    imake

    libdmx

    libfontenc

    libpciaccess

    libxcb

    libxcvt

    libxkbfile

    libxshmfence

    listres

    lndir

    luit

    makedepend

    mkfontscale

    oclock

    pixman

    sessreg

    setxkbmap

    smproxy

    transset

    viewres

    wrapWithXFileSearchPathHook

    x11perf

    xauth

    xbacklight

    xbitmaps

    xcalc

    xclock

    xcmsdb

    xcompmgr

    xconsole

    xcursorgen

    xdm

    xdpyinfo

    xdriinfo

    xev

    xeyes

    xfd

    xfontsel

    xfs

    xfsinfo

    xgamma

    xgc

    xhost

    xinit

    xinput

    xkbcomp

    xkbevd

    xkbprint

    xkbutils

    xkill

    xload

    xlsatoms

    xlsclients

    xlsfonts

    xmag

    xmessage

    xmodmap

    xmore

    xorgproto

    xpr

    xprop

    xrandr

    xrdb

    xrefresh

    xset

    xsetroot

    xsm

    xstdcmap

    xtrans

    xvfb

    xvinfo

    xwd

    xwininfo

    xwud

    # keep-sorted end

    ;

  # keep-sorted start case=no numeric=no block=yes

  encodings = font-encodings;

  fontadobe100dpi = font-adobe-100dpi;

  fontadobe75dpi = font-adobe-75dpi;

  fontadobeutopia100dpi = font-adobe-utopia-100dpi;

  fontadobeutopia75dpi = font-adobe-utopia-75dpi;

  fontadobeutopiatype1 = font-adobe-utopia-type1;

  fontalias = font-alias;

  fontarabicmisc = font-arabic-misc;

  fontbh100dpi = font-bh-100dpi;

  fontbh75dpi = font-bh-75dpi;

  fontbhlucidatypewriter100dpi = font-bh-lucidatypewriter-100dpi;

  fontbhlucidatypewriter75dpi = font-bh-lucidatypewriter-75dpi;

  fontbhttf = font-bh-ttf;

  fontbhtype1 = font-bh-type1;

  fontbitstream100dpi = font-bitstream-100dpi;

  fontbitstream75dpi = font-bitstream-75dpi;

  fontbitstreamtype1 = font-bitstream-type1;

  fontcronyxcyrillic = font-cronyx-cyrillic;

  fontcursormisc = font-cursor-misc;

  fontdaewoomisc = font-daewoo-misc;

  fontdecmisc = font-dec-misc;

  fontibmtype1 = font-ibm-type1;

  fontisasmisc = font-isas-misc;

  fontjismisc = font-jis-misc;

  fontmicromisc = font-micro-misc;

  fontmisccyrillic = font-misc-cyrillic;

  fontmiscethiopic = font-misc-ethiopic;

  fontmiscmeltho = font-misc-meltho;

  fontmiscmisc = font-misc-misc;

  fontmuttmisc = font-mutt-misc;

  fontschumachermisc = font-schumacher-misc;

  fontscreencyrillic = font-screen-cyrillic;

  fontsonymisc = font-sony-misc;

  fontsunmisc = font-sun-misc;

  fontutil = font-util;

  fontwinitzkicyrillic = font-winitzki-cyrillic;

  fontxfree86type1 = font-xfree86-type1;

  libAppleWM = libapplewm;

  libFS = libfs;

  libICE = libice;

  libpthreadstubs = libpthread-stubs;

  libSM = libsm;

  libWindowsWM = libwindowswm;

  libX11 = libx11;

  libXau = libxau;

  libXaw = libxaw;

  libXcomposite = libxcomposite;

  libXcursor = libxcursor;

  libXdamage = libxdamage;

  libXdmcp = libxdmcp;

  libXext = libxext;

  libXfixes = libxfixes;

  libXfont = libxfont_1;

  libXfont2 = libxfont_2;

  libXft = libxft;

  libXi = libxi;

  libXinerama = libxinerama;

  libXmu = libxmu;

  libXp = libxp;

  libXpm = libxpm;

  libXpresent = libxpresent;

  libXrandr = libxrandr;

  libXrender = libxrender;

  libXres = libxres;

  libXScrnSaver = libxscrnsaver;

  libXt = libxt;

  libXtst = libxtst;

  libXv = libxv;

  libXvMC = libxvmc;

  libXxf86dga = libxxf86dga;

  libXxf86misc = libxxf86misc;

  libXxf86vm = libxxf86vm;

  mkfontdir = mkfontscale;

  twm = tab-window-manager;

  utilmacros = util-macros;

  xcbproto = xcb-proto;

  xcbutil = libxcb-util;

  xcbutilcursor = libxcb-cursor;

  xcbutilerrors = libxcb-errors;

  xcbutilimage = libxcb-image;

  xcbutilkeysyms = libxcb-keysyms;

  xcbutilrenderutil = libxcb-render-util;

  xcbutilwm = libxcb-wm;

  xcursorthemes = xcursor-themes;

  xf86inputevdev = xf86-input-evdev;

  xf86inputjoystick = xf86-input-joystick;

  xf86inputkeyboard = xf86-input-keyboard;

  xf86inputlibinput = xf86-input-libinput;

  xf86inputmouse = xf86-input-mouse;

  xf86inputsynaptics = xf86-input-synaptics;

  xf86inputvmmouse = xf86-input-vmmouse;

  xf86inputvoid = xf86-input-void;

  xf86videoamdgpu = xf86-video-amdgpu;

  xf86videoapm = xf86-video-apm;

  xf86videoark = xf86-video-ark;

  xf86videoast = xf86-video-ast;

  xf86videoati = xf86-video-ati;

  xf86videochips = xf86-video-chips;

  xf86videocirrus = xf86-video-cirrus;

  xf86videodummy = xf86-video-dummy;

  xf86videofbdev = xf86-video-fbdev;

  xf86videogeode = xf86-video-geode;

  xf86videoi128 = xf86-video-i128;

  xf86videoi740 = xf86-video-i740;

  xf86videointel = xf86-video-intel;

  xf86videomga = xf86-video-mga;

  xf86videoneomagic = xf86-video-neomagic;

  xf86videonouveau = xf86-video-nouveau;

  xf86videonv = xf86-video-nv;

  xf86videoomap = xf86-video-omap;

  xf86videoopenchrome = xf86-video-openchrome;

  xf86videoqxl = xf86-video-qxl;

  xf86videor128 = xf86-video-r128;

  xf86videos3virge = xf86-video-s3virge;

  xf86videosavage = xf86-video-savage;

  xf86videosiliconmotion = xf86-video-siliconmotion;

  xf86videosis = xf86-video-sis;

  xf86videosisusb = xf86-video-sisusb;

  xf86videosuncg6 = xf86-video-suncg6;

  xf86videosunffb = xf86-video-sunffb;

  xf86videosunleo = xf86-video-sunleo;

  xf86videotdfx = xf86-video-tdfx;

  xf86videotrident = xf86-video-trident;

  xf86videov4l = xf86-video-v4l;

  xf86videovboxvideo = xf86-video-vbox;

  xf86videovesa = xf86-video-vesa;

  xf86videovmware = xf86-video-vmware;

  xf86videovoodoo = xf86-video-voodoo;

  xkeyboardconfig = xkeyboard-config;

  xkeyboardconfig_custom = xkeyboard-config_custom;

  xorgcffiles = xorg-cf-files;

  xorgdocs = xorg-docs;

  xorgserver = xorg-server;

  xorgsgmldoctools = xorg-sgml-doctools;

  # keep-sorted end

}

# deprecate some packages

// lib.optionalAttrs config.allowAliases {

  # keep-sorted start case=no numeric=no block=yes

  fontbitstreamspeedo = throw "Bitstream Speedo is an obsolete font format that hasn't been supported by Xorg since 2005"; # added 2025-09-24

  libXtrap = throw "XTrap was a proposed X11 extension that hasn't been in Xorg since X11R6 in 1994, it is deprecated and archived upstream."; # added 2025-12-13

  xf86videoglide = throw "The Xorg Glide video driver has been archived upstream due to being obsolete"; # added 2025-12-13

  xf86videoglint = throw ''

    The Xorg GLINT/Permedia video driver has been broken since xorg 21.

    see https://gitlab.freedesktop.org/xorg/driver/xf86-video-glint/-/issues/1''; # added 2025-12-13

  xf86videonewport = throw "The Xorg Newport video driver is broken and hasn't had a release since 2012"; # added 2025-12-13

  xf86videotga = throw "The Xorg TGA (aka DEC 21030) video driver is broken and hasn't had a release since 2012"; # added 2025-12-13

  xf86videowsfb = throw "The Xorg BSD wsdisplay framebuffer video driver is broken and hasn't had a release since 2012"; # added 2025-12-13

  xtrap = throw "XTrap was a proposed X11 extension that hasn't been in Xorg since X11R6 in 1994, it is deprecated and archived upstream."; # added 2025-12-13

  # keep-sorted end

}

  xmlroff = throw "'xmlroff' has been removed as it is unmaintained and broken"; # Added 2025-05-18

  xo = throw "Use 'dbtpl' instead of 'xo'"; # Added 2025-09-28

  xonsh-unwrapped = throw "'xonsh-unwrapped' has been renamed to/replaced by 'python3Packages.xonsh'"; # Converted to throw 2025-10-27

  xorg = # Added 2026-01-29

    lib.mapAttrs

      (

        name: value:

        warnAlias "The xorg package set has been deprecated, 'xorg.${name}' has been renamed to '${name}'" value

      )

      {

        inherit

          # keep-sorted start case=no numeric=no block=yes

          appres

          bdftopcf

          bitmap

          editres

          fonttosfnt

          gccmakedep

          iceauth

          ico

          imake

          libdmx

          libfontenc

          libpciaccess

          libxcb

          libxcvt

          libxkbfile

          libxshmfence

          listres

          lndir

          luit

          makedepend

          mkfontscale

          oclock

          pixman

          sessreg

          setxkbmap

          smproxy

          transset

          viewres

          wrapWithXFileSearchPathHook

          x11perf

          xauth

          xbacklight

          xbitmaps

          xcalc

          xclock

          xcmsdb

          xcompmgr

          xconsole

          xcursorgen

          xdm

          xdpyinfo

          xdriinfo

          xev

          xeyes

          xfd

          xfontsel

          xfs

          xfsinfo

          xgamma

          xgc

          xhost

          xinit

          xinput

          xkbcomp

          xkbevd

          xkbprint

          xkbutils

          xkill

          xload

          xlsatoms

          xlsclients

          xlsfonts

          xmag

          xmessage

          xmodmap

          xmore

          xorgproto

          xpr

          xprop

          xrandr

          xrdb

          xrefresh

          xset

          xsetroot

          xsm

          xstdcmap

          xtrans

          xvfb

          xvinfo

          xwd

          xwininfo

          xwud

          # keep-sorted end

          ;

      }

    //

      lib.mapAttrs

        (

          name: value:

          warnAlias "The xorg package set has been deprecated, 'xorg.${name}' has been renamed to '${value}'"

            self.${value}

        )

        {

          # keep-sorted start case=no numeric=no block=yes

          encodings = "font-encodings";

          fontadobe100dpi = "font-adobe-100dpi";

          fontadobe75dpi = "font-adobe-75dpi";

          fontadobeutopia100dpi = "font-adobe-utopia-100dpi";

          fontadobeutopia75dpi = "font-adobe-utopia-75dpi";

          fontadobeutopiatype1 = "font-adobe-utopia-type1";

          fontalias = "font-alias";

          fontarabicmisc = "font-arabic-misc";

          fontbh100dpi = "font-bh-100dpi";

          fontbh75dpi = "font-bh-75dpi";

          fontbhlucidatypewriter100dpi = "font-bh-lucidatypewriter-100dpi";

          fontbhlucidatypewriter75dpi = "font-bh-lucidatypewriter-75dpi";

          fontbhttf = "font-bh-ttf";

          fontbhtype1 = "font-bh-type1";

          fontbitstream100dpi = "font-bitstream-100dpi";

          fontbitstream75dpi = "font-bitstream-75dpi";

          fontbitstreamtype1 = "font-bitstream-type1";

          fontcronyxcyrillic = "font-cronyx-cyrillic";

          fontcursormisc = "font-cursor-misc";

          fontdaewoomisc = "font-daewoo-misc";

          fontdecmisc = "font-dec-misc";

          fontibmtype1 = "font-ibm-type1";

          fontisasmisc = "font-isas-misc";

          fontjismisc = "font-jis-misc";

          fontmicromisc = "font-micro-misc";

          fontmisccyrillic = "font-misc-cyrillic";

          fontmiscethiopic = "font-misc-ethiopic";

          fontmiscmeltho = "font-misc-meltho";

          fontmiscmisc = "font-misc-misc";

          fontmuttmisc = "font-mutt-misc";

          fontschumachermisc = "font-schumacher-misc";

          fontscreencyrillic = "font-screen-cyrillic";

          fontsonymisc = "font-sony-misc";

          fontsunmisc = "font-sun-misc";

          fontutil = "font-util";

          fontwinitzkicyrillic = "font-winitzki-cyrillic";

          fontxfree86type1 = "font-xfree86-type1";

          libAppleWM = "libapplewm";

          libFS = "libfs";

          libICE = "libice";

          libpthreadstubs = "libpthread-stubs";

          libSM = "libsm";

          libWindowsWM = "libwindowswm";

          libX11 = "libx11";

          libXau = "libxau";

          libXaw = "libxaw";

          libXcomposite = "libxcomposite";

          libXcursor = "libxcursor";

          libXdamage = "libxdamage";

          libXdmcp = "libxdmcp";

          libXext = "libxext";

          libXfixes = "libxfixes";

          libXfont = "libxfont_1";

          libXfont2 = "libxfont_2";

          libXft = "libxft";

          libXi = "libxi";

          libXinerama = "libxinerama";

          libXmu = "libxmu";

          libXp = "libxp";

          libXpm = "libxpm";

          libXpresent = "libxpresent";

          libXrandr = "libxrandr";

          libXrender = "libxrender";

          libXres = "libxres";

          libXScrnSaver = "libxscrnsaver";

          libXt = "libxt";

          libXtst = "libxtst";

          libXv = "libxv";

          libXvMC = "libxvmc";

          libXxf86dga = "libxxf86dga";

          libXxf86misc = "libxxf86misc";

          libXxf86vm = "libxxf86vm";

          mkfontdir = "mkfontscale";

          twm = "tab-window-manager";

          utilmacros = "util-macros";

          xcbproto = "xcb-proto";

          xcbutil = "libxcb-util";

          xcbutilcursor = "libxcb-cursor";

          xcbutilerrors = "libxcb-errors";

          xcbutilimage = "libxcb-image";

          xcbutilkeysyms = "libxcb-keysyms";

          xcbutilrenderutil = "libxcb-render-util";

          xcbutilwm = "libxcb-wm";

          xcursorthemes = "xcursor-themes";

          xf86inputevdev = "xf86-input-evdev";

          xf86inputjoystick = "xf86-input-joystick";

          xf86inputkeyboard = "xf86-input-keyboard";

          xf86inputlibinput = "xf86-input-libinput";

          xf86inputmouse = "xf86-input-mouse";

          xf86inputsynaptics = "xf86-input-synaptics";

          xf86inputvmmouse = "xf86-input-vmmouse";

          xf86inputvoid = "xf86-input-void";

          xf86videoamdgpu = "xf86-video-amdgpu";

          xf86videoapm = "xf86-video-apm";

          xf86videoark = "xf86-video-ark";

          xf86videoast = "xf86-video-ast";

          xf86videoati = "xf86-video-ati";

          xf86videochips = "xf86-video-chips";

          xf86videocirrus = "xf86-video-cirrus";

          xf86videodummy = "xf86-video-dummy";

          xf86videofbdev = "xf86-video-fbdev";

          xf86videogeode = "xf86-video-geode";

          xf86videoi128 = "xf86-video-i128";

          xf86videoi740 = "xf86-video-i740";

          xf86videointel = "xf86-video-intel";

          xf86videomga = "xf86-video-mga";

          xf86videoneomagic = "xf86-video-neomagic";

          xf86videonouveau = "xf86-video-nouveau";

          xf86videonv = "xf86-video-nv";

          xf86videoomap = "xf86-video-omap";

          xf86videoopenchrome = "xf86-video-openchrome";

          xf86videoqxl = "xf86-video-qxl";

          xf86videor128 = "xf86-video-r128";

          xf86videos3virge = "xf86-video-s3virge";

          xf86videosavage = "xf86-video-savage";

          xf86videosiliconmotion = "xf86-video-siliconmotion";

          xf86videosis = "xf86-video-sis";

          xf86videosisusb = "xf86-video-sisusb";

          xf86videosuncg6 = "xf86-video-suncg6";

          xf86videosunffb = "xf86-video-sunffb";

          xf86videosunleo = "xf86-video-sunleo";

          xf86videotdfx = "xf86-video-tdfx";

          xf86videotrident = "xf86-video-trident";

          xf86videov4l = "xf86-video-v4l";

          xf86videovboxvideo = "xf86-video-vbox";

          xf86videovesa = "xf86-video-vesa";

          xf86videovmware = "xf86-video-vmware";

          xf86videovoodoo = "xf86-video-voodoo";

          xkeyboardconfig = "xkeyboard-config";

          xkeyboardconfig_custom = "xkeyboard-config_custom";

          xorgcffiles = "xorg-cf-files";

          xorgdocs = "xorg-docs";

          xorgserver = "xorg-server";

          xorgsgmldoctools = "xorg-sgml-doctools";

          # keep-sorted end

        }

    // {

      # keep-sorted start case=no numeric=no block=yes

      callPackage = throw "The xorg package set has been moved to the top level."; # Added 2026-01-29

      fontbitstreamspeedo = throw "Bitstream Speedo is an obsolete font format that hasn't been supported by Xorg since 2005"; # added 2025-09-24

      libXtrap = throw "XTrap was a proposed X11 extension that hasn't been in Xorg since X11R6 in 1994, it is deprecated and archived upstream."; # added 2025-12-13

      newScope = throw "The xorg package set has been moved to the top level."; # Added 2026-01-29

      overrideScope = throw "The xorg package set has been moved to the top level."; # Added 2026-01-29

      packages = throw "The xorg package set has been moved to the top level."; # Added 2026-01-29

      xf86videoglide = throw "The Xorg Glide video driver has been archived upstream due to being obsolete"; # added 2025-12-13

      xf86videoglint = throw ''

        The Xorg GLINT/Permedia video driver has been broken since xorg 21.

        see https://gitlab.freedesktop.org/xorg/driver/xf86-video-glint/-/issues/1''; # added 2025-12-13

      xf86videonewport = throw "The Xorg Newport video driver is broken and hasn't had a release since 2012"; # added 2025-12-13

      xf86videotga = throw "The Xorg TGA (aka DEC 21030) video driver is broken and hasn't had a release since 2012"; # added 2025-12-13

      xf86videowsfb = throw "The Xorg BSD wsdisplay framebuffer video driver is broken and hasn't had a release since 2012"; # added 2025-12-13

      xtrap = throw "XTrap was a proposed X11 extension that hasn't been in Xorg since X11R6 in 1994, it is deprecated and archived upstream."; # added 2025-12-13

      # keep-sorted end

    };

  xorg-autoconf = util-macros; # Added 2025-08-18

  xorgdocs = xorg-docs; # Added 2026-01-19

  xorgsgmldoctools = xorg-sgml-doctools; # Added 2026-01-19

  virtualenv-clone = with python3Packages; toPythonApplication virtualenv-clone;

  xorg = recurseIntoAttrs (makeScopeWithSplicing' {

    otherSplices = generateSplicesForMkScope "xorg";

    # Use `lib.callPackageWith __splicedPackages` rather than plain `callPackage`

    # so as not to have the newly bound xorg items already in scope,  which would

    # have created a cycle.

    f = lib.callPackageWith __splicedPackages ../servers/x11/xorg { };

  });

  inherit (xorg)

    fontadobe100dpi

    fontadobeutopia100dpi

    fontbh100dpi

    fontbhlucidatypewriter100dpi

    fontbitstream100dpi

    fontutil

    libAppleWM

    libFS

    libICE

    libSM

    libX11

    libXScrnSaver

    libXau

    libXaw

    libXcomposite

    libXcursor

    libXdamage

    libXdmcp

    libXext

    libXfixes

    libXfont2

    libXft

    libXi

    libXinerama

    libXmu

    libXp

    libXpm

    libXpresent

    libXrandr

    libXrender

    libXres

    libXt

    libXtst

    libXv

    libXvMC

    libXxf86dga

    libXxf86misc

    libXxf86vm

    libpthreadstubs

    mkfontdir

    utilmacros

    xcbproto

    xcbutil

    xcbutilcursor

    xcbutilerrors

    xcbutilimage

    xcbutilkeysyms

    xcbutilrenderutil

    xcbutilwm

    xf86inputevdev

    xf86inputlibinput

    xf86videonouveau

    xkeyboardconfig

    xorgcffiles