diff --git a/pkgs/by-name/gd/gdb/package.nix b/pkgs/by-name/gd/gdb/package.nix index bfb1f76270da..8b1d613b8043 100644 --- a/pkgs/by-name/gd/gdb/package.nix +++ b/pkgs/by-name/gd/gdb/package.nix @@ -181,7 +181,9 @@ stdenv.mkDerivation (finalAttrs: { (withFeatureAs true "auto-load-safe-path" (builtins.concatStringsSep ":" safePaths)) (withFeature enableDebuginfod "debuginfod") (enableFeature (!stdenv.hostPlatform.isMusl) "nls") - (enableFeature (!stdenv.hostPlatform.isStatic) "inprocess-agent") + (enableFeature ( + !stdenv.hostPlatform.isStatic && !stdenv.hostPlatform.isLoongArch64 + ) "inprocess-agent") ] ++ optional (!hostCpuOnly) "--enable-targets=all" # Workaround for Apple Silicon, "--target" must be "faked", see eg: https://github.com/Homebrew/homebrew-core/pull/209753 diff --git a/pkgs/by-name/xs/xsm/package.nix b/pkgs/by-name/xs/xsm/package.nix index a8bc165c4991..e79b84e9b6f0 100644 --- a/pkgs/by-name/xs/xsm/package.nix +++ b/pkgs/by-name/xs/xsm/package.nix @@ -15,7 +15,7 @@ # run time dependencies iceauth, smproxy, - twm, + tab-window-manager, xterm, }: stdenv.mkDerivation (finalAttrs: { @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { lib.makeBinPath [ iceauth smproxy - twm + tab-window-manager xterm ] } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a593630b0f1b..eb583a18f861 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -600,6 +600,7 @@ mapAliases { emulationstation = throw "emulationstation was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23 emulationstation-de = throw "emulationstation-de was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23 enchant2 = warnAlias "'enchant2' has been renamed to 'enchant_2'" enchant_2; # Added 2026-01-14 + encodings = font-encodings; # Added 2026-01-19 enyo-doom = throw "'enyo-doom' has been renamed to/replaced by 'enyo-launcher'"; # Converted to throw 2025-10-27 epapirus-icon-theme = throw "'epapirus-icon-theme' has been removed because 'papirus-icon-theme' no longer supports building with elementaryOS icon support"; # Added 2025-06-15 eris-go = throw "'eris-go' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01 @@ -652,6 +653,37 @@ mapAliases { flutter327 = throw "flutter327 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2025-10-28 fmsynth = throw "'fmsynth' has been removed as it was broken and unmaintained both upstream and in nixpkgs."; # Added 2025-09-01 follow = warnAlias "follow has been renamed to folo" folo; # Added 2025-05-18 + fontadobe75dpi = font-adobe-75dpi; # Added 2026-01-19 + fontadobeutopia75dpi = font-adobe-utopia-75dpi; # Added 2026-01-19 + fontadobeutopiatype1 = font-adobe-utopia-type1; # Added 2026-01-19 + fontalias = font-alias; # Added 2026-01-19 + fontarabicmisc = font-arabic-misc; # Added 2026-01-19 + fontbh75dpi = font-bh-75dpi; # Added 2026-01-19 + fontbhlucidatypewriter75dpi = font-bh-lucidatypewriter-75dpi; # Added 2026-01-19 + fontbhttf = font-bh-ttf; # Added 2026-01-19 + fontbhtype1 = font-bh-type1; # Added 2026-01-19 + fontbitstream75dpi = font-bitstream-75dpi; # Added 2026-01-19 + fontbitstreamspeedo = throw "Bitstream Speedo is an obsolete font format that hasn't been supported by Xorg since 2005"; # added 2025-09-24 + fontbitstreamtype1 = font-bitstream-type1; # Added 2026-01-19 + fontcronyxcyrillic = font-cronyx-cyrillic; # Added 2026-01-19 + fontcursormisc = font-cursor-misc; # Added 2026-01-19 + fontdaewoomisc = font-daewoo-misc; # Added 2026-01-19 + fontdecmisc = font-dec-misc; # Added 2026-01-19 + fontibmtype1 = font-ibm-type1; # Added 2026-01-19 + fontisasmisc = font-isas-misc; # Added 2026-01-19 + fontjismisc = font-jis-misc; # Added 2026-01-19 + fontmicromisc = font-micro-misc; # Added 2026-01-19 + fontmisccyrillic = font-misc-cyrillic; # Added 2026-01-19 + fontmiscethiopic = font-misc-ethiopic; # Added 2026-01-19 + fontmiscmeltho = font-misc-meltho; # Added 2026-01-19 + fontmiscmisc = font-misc-misc; # Added 2026-01-19 + fontmuttmisc = font-mutt-misc; # Added 2026-01-19 + fontschumachermisc = font-schumacher-misc; # Added 2026-01-19 + fontscreencyrillic = font-screen-cyrillic; # Added 2026-01-19 + fontsonymisc = font-sony-misc; # Added 2026-01-19 + fontsunmisc = font-sun-misc; # Added 2026-01-19 + fontwinitzkicyrillic = font-winitzki-cyrillic; # Added 2026-01-19 + fontxfree86type1 = font-xfree86-type1; # Added 2026-01-19 forceSystem = warnAlias "forceSystem is deprecated in favour of explicitly importing Nixpkgs" ( system: _: (import self.path { localSystem = { inherit system; }; }) ); # Converted to warning 2025-10-28 @@ -944,7 +976,10 @@ mapAliases { libtransmission_3 = throw "libtransmission_3 has been removed in favour of libtransmission_4. Note that upgrade caused data loss for some users so backup is recommended (see NixOS 24.11 release notes for details)"; # Converted to throw 2025-10-26 libuinputplus = throw "'libuinputplus' has been removed, as it was unmaintained upstream since 2021, no longer builds, and is no longer used by anything"; # Added 2025-11-02 libviper = throw "'libviper' was removed as it is broken and not maintained upstream"; # Added 2025-05-17 + libWindowsWM = libwindowswm; # Added 2026-01-19 libwnck3 = throw "'libwnck3' has been renamed to/replaced by 'libwnck'"; # Converted to throw 2025-10-27 + libXfont = libxfont_1; # Added 2026-01-19 + 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 lightdm_gtk_greeter = throw "'lightdm_gtk_greeter' has been renamed to/replaced by 'lightdm-gtk-greeter'"; # Converted to throw 2025-10-27 lightly-boehs = throw "'lightly-boehs' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20 lightly-qt = throw "'lightly-qt' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20 @@ -1822,19 +1857,70 @@ mapAliases { xbrightness = throw "'xbrightness' has been removed as it is unmaintained"; # Added 2025-08-28 xbursttools = throw "'xbursttools' has been removed as it is broken and unmaintained upstream."; # Added 2025-06-12 xcb-util-cursor-HEAD = warnAlias "'xcb-util-cursor-HEAD' has been removed; use 'libxcb-cursor' instead" libxcb-cursor; # added 2026-01-12 + 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 xf86_input_wacom = xf86-input-wacom; # Added 2025-12-12 + xf86inputjoystick = xf86-input-joystick; # Added 2026-01-19 + xf86inputkeyboard = xf86-input-keyboard; # Added 2026-01-19 + xf86inputmouse = xf86-input-mouse; # Added 2026-01-19 + xf86inputsynaptics = xf86-input-synaptics; # Added 2026-01-19 + xf86inputvmmouse = xf86-input-vmmouse; # Added 2026-01-19 + xf86inputvoid = xf86-input-void; # Added 2026-01-19 + xf86videoamdgpu = xf86-video-amdgpu; # Added 2026-01-19 + xf86videoapm = xf86-video-apm; # Added 2026-01-19 + xf86videoark = xf86-video-ark; # Added 2026-01-19 + xf86videoast = xf86-video-ast; # Added 2026-01-19 + xf86videoati = xf86-video-ati; # Added 2026-01-19 + xf86videochips = xf86-video-chips; # Added 2026-01-19 + xf86videocirrus = xf86-video-cirrus; # Added 2026-01-19 + xf86videodummy = xf86-video-dummy; # Added 2026-01-19 + xf86videofbdev = xf86-video-fbdev; # Added 2026-01-19 + xf86videogeode = xf86-video-geode; # Added 2026-01-19 + 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 + xf86videoi128 = xf86-video-i128; # Added 2026-01-19 + xf86videoi740 = xf86-video-i740; # Added 2026-01-19 + xf86videointel = xf86-video-intel; # Added 2026-01-19 + 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 + xf86videonv = xf86-video-nv; # Added 2026-01-19 + xf86videoomap = xf86-video-omap; # Added 2026-01-19 + xf86videoopenchrome = xf86-video-openchrome; # Added 2026-01-19 + xf86videoqxl = xf86-video-qxl; # Added 2026-01-19 + xf86videor128 = xf86-video-r128; # Added 2026-01-19 + xf86videos3virge = xf86-video-s3virge; # Added 2026-01-19 + xf86videosavage = xf86-video-savage; # Added 2026-01-19 + xf86videosiliconmotion = xf86-video-siliconmotion; # Added 2026-01-19 + xf86videosis = xf86-video-sis; # Added 2026-01-19 + xf86videosisusb = xf86-video-sisusb; # Added 2026-01-19 + xf86videosuncg6 = xf86-video-suncg6; # Added 2026-01-19 + xf86videosunffb = xf86-video-sunffb; # Added 2026-01-19 + xf86videosunleo = xf86-video-sunleo; # Added 2026-01-19 + xf86videotdfx = xf86-video-tdfx; # Added 2026-01-19 + xf86videotga = throw "The Xorg TGA (aka DEC 21030) video driver is broken and hasn't had a release since 2012"; # added 2025-12-13 + xf86videotrident = xf86-video-trident; # Added 2026-01-19 + xf86videov4l = xf86-video-v4l; # Added 2026-01-19 + xf86videovboxvideo = xf86-video-vbox; # Added 2026-01-19 + xf86videovesa = xf86-video-vesa; # Added 2026-01-19 + xf86videovmware = xf86-video-vmware; # Added 2026-01-19 + xf86videovoodoo = xf86-video-voodoo; # Added 2026-01-19 + xf86videowsfb = throw "The Xorg BSD wsdisplay framebuffer video driver is broken and hasn't had a release since 2012"; # added 2025-12-13 xflux = throw "'xflux' has been removed as it was unmaintained"; # Added 2025-08-22 xflux-gui = throw "'xflux-gui' has been removed as it was unmaintained"; # Added 2025-08-22 xinput_calibrator = xinput-calibrator; # Added 2025-08-28 xjump = throw "'xjump' has been removed as it is unmaintained"; # Added 2025-08-22 + xkeyboardconfig_custom = xkeyboard-config_custom; # Added 2026-01-19 xmlada = throw "'xmlada' has been renamed to/replaced by 'gnatPackages.xmlada'"; # Converted to throw 2025-10-27 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-autoconf = util-macros; # Added 2025-08-18 + xorgdocs = xorg-docs; # Added 2026-01-19 + xorgsgmldoctools = xorg-sgml-doctools; # Added 2026-01-19 xsw = throw "'xsw' has been removed due to lack of upstream maintenance"; # Added 2025-08-22 + 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 xulrunner = throw "'xulrunner' has been renamed to/replaced by 'firefox-unwrapped'"; # Converted to throw 2025-10-27 xxgdb = throw "'xxgdb' seems inactive and doesn't compile with glibc 2.42"; # Added 2025-09-28 yabar = throw "'yabar' has been removed as the upstream project was archived"; # Added 2025-06-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 107423dc9d20..b61cd9ebe4a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9143,6 +9143,64 @@ with pkgs; 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 + xorgserver + ; + zabbixFor = version: rec { agent = (callPackages ../servers/monitoring/zabbix/agent.nix { }).${version}; proxy-mysql = diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix index 66721e3bee56..50adc32168e5 100644 --- a/pkgs/top-level/splice.nix +++ b/pkgs/top-level/splice.nix @@ -106,25 +106,7 @@ let ; }; - splicedPackagesWithXorg = - splicedPackages - // removeAttrs splicedPackages.xorg [ - "callPackage" - "newScope" - "overrideScope" - "packages" - ]; - - packagesWithXorg = - pkgs - // removeAttrs pkgs.xorg [ - "callPackage" - "newScope" - "overrideScope" - "packages" - ]; - - pkgsForCall = if actuallySplice then splicedPackagesWithXorg else packagesWithXorg; + pkgsForCall = if actuallySplice then splicedPackages else pkgs; in