diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 65987af6db14..5c3751767271 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -112,6 +112,8 @@ - [private-gpt](https://github.com/zylon-ai/private-gpt) service has been removed by lack of maintenance upstream. +- `lxde` scope has been removed, and its packages have been moved the top-level. + ## Other Notable Changes {#sec-nixpkgs-release-25.11-notable-changes} diff --git a/pkgs/desktops/lxde/core/lxappearance/lxappearance-0.6.3-xdg.system.data.dirs.patch b/pkgs/by-name/lx/lxappearance/lxappearance-0.6.3-xdg.system.data.dirs.patch similarity index 100% rename from pkgs/desktops/lxde/core/lxappearance/lxappearance-0.6.3-xdg.system.data.dirs.patch rename to pkgs/by-name/lx/lxappearance/lxappearance-0.6.3-xdg.system.data.dirs.patch diff --git a/pkgs/desktops/lxde/core/lxappearance/default.nix b/pkgs/by-name/lx/lxappearance/package.nix similarity index 100% rename from pkgs/desktops/lxde/core/lxappearance/default.nix rename to pkgs/by-name/lx/lxappearance/package.nix diff --git a/pkgs/desktops/lxde/core/lxmenu-data/default.nix b/pkgs/by-name/lx/lxmenu-data/package.nix similarity index 100% rename from pkgs/desktops/lxde/core/lxmenu-data/default.nix rename to pkgs/by-name/lx/lxmenu-data/package.nix diff --git a/pkgs/desktops/lxde/core/lxpanel/default.nix b/pkgs/by-name/lx/lxpanel/package.nix similarity index 96% rename from pkgs/desktops/lxde/core/lxpanel/default.nix rename to pkgs/by-name/lx/lxpanel/package.nix index c970ea9e4ac3..dd55e41bb898 100644 --- a/pkgs/desktops/lxde/core/lxpanel/default.nix +++ b/pkgs/by-name/lx/lxpanel/package.nix @@ -10,7 +10,7 @@ libxmlxx, keybinder, keybinder3, - gtk2, + gtk2-x11, gtk3, libX11, libfm, @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ (if withGtk3 then keybinder3 else keybinder) - (if withGtk3 then gtk3 else gtk2) + (if withGtk3 then gtk3 else gtk2-x11) libX11 (libfm.override { inherit withGtk3; }) (if withGtk3 then libwnck else libwnck2) diff --git a/pkgs/desktops/lxde/core/lxrandr/default.nix b/pkgs/by-name/lx/lxrandr/package.nix similarity index 100% rename from pkgs/desktops/lxde/core/lxrandr/default.nix rename to pkgs/by-name/lx/lxrandr/package.nix diff --git a/pkgs/desktops/lxde/core/lxrandr/respect-xml-catalog-files-var.patch b/pkgs/by-name/lx/lxrandr/respect-xml-catalog-files-var.patch similarity index 100% rename from pkgs/desktops/lxde/core/lxrandr/respect-xml-catalog-files-var.patch rename to pkgs/by-name/lx/lxrandr/respect-xml-catalog-files-var.patch diff --git a/pkgs/desktops/lxde/core/lxsession/default.nix b/pkgs/by-name/lx/lxsession/package.nix similarity index 100% rename from pkgs/desktops/lxde/core/lxsession/default.nix rename to pkgs/by-name/lx/lxsession/package.nix diff --git a/pkgs/desktops/lxde/core/lxsession/repect-xml-catalog-file-var.patch b/pkgs/by-name/lx/lxsession/repect-xml-catalog-file-var.patch similarity index 100% rename from pkgs/desktops/lxde/core/lxsession/repect-xml-catalog-file-var.patch rename to pkgs/by-name/lx/lxsession/repect-xml-catalog-file-var.patch diff --git a/pkgs/desktops/lxde/core/lxtask/default.nix b/pkgs/by-name/lx/lxtask/package.nix similarity index 100% rename from pkgs/desktops/lxde/core/lxtask/default.nix rename to pkgs/by-name/lx/lxtask/package.nix diff --git a/pkgs/desktops/lxde/default.nix b/pkgs/desktops/lxde/default.nix deleted file mode 100644 index 3b701cadd12b..000000000000 --- a/pkgs/desktops/lxde/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - config, - lib, - pkgs, -}: - -lib.makeScope pkgs.newScope ( - self: with self; { - - inherit (pkgs) gtk2-x11; - - lxappearance = callPackage ./core/lxappearance { }; - - lxappearance-gtk2 = callPackage ./core/lxappearance { - gtk2 = gtk2-x11; - withGtk3 = false; - }; - - lxmenu-data = callPackage ./core/lxmenu-data { }; - - lxpanel = callPackage ./core/lxpanel { - gtk2 = gtk2-x11; - }; - - lxrandr = callPackage ./core/lxrandr { }; - - lxsession = callPackage ./core/lxsession { }; - - lxtask = callPackage ./core/lxtask { }; - } -) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1f0df83346ba..323b9cdc255d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1487,6 +1487,25 @@ mapAliases { lumail = throw "'lumail' has been removed since its upstream is unavailable"; # Added 2025-05-07 lv_img_conv = throw "'lv_img_conv' has been removed from nixpkgs as it is broken"; # Added 2024-06-18 lxd = lib.warnOnInstantiate "lxd has been renamed to lxd-lts" lxd-lts; # Added 2024-04-01 + + lxde = { + gtk2-x11 = throw "'lxde.gtk2-x11' has been removed. Use 'gtk2-x11' directly."; + + lxappearance = throw "'lxappearance' has been moved to top-level. Use 'lxappearance' directly"; # added 2025-08-31 + + lxappearance-gtk2 = throw "'lxappearance-gtk2' has been moved to top-level. Use 'lxappearance-gtk2' directly"; # added 2025-08-31 + + lxmenu-data = throw "'lxmenu-data' has been moved to top-level. Use 'lxmenu-data' directly"; # added 2025-08-31 + + lxpanel = throw "'lxpanel' has been moved to top-level. Use 'lxpanel' directly"; # added 2025-08-31 + + lxrandr = throw "'lxrandr' has been moved to top-level. Use 'lxrandr' directly"; # added 2025-08-31 + + lxsession = throw "'lxsession' has been moved to top-level. Use 'lxsession' directly"; # added 2025-08-31 + + lxtask = throw "'lxtask' has been moved to top-level. Use 'lxtask' directly"; # added 2025-08-31 + }; + lxd-unwrapped = lib.warnOnInstantiate "lxd-unwrapped has been renamed to lxd-unwrapped-lts" lxd-unwrapped-lts; # Added 2024-04-01 lxdvdrip = throw "'lxdvdrip' has been removed due to lack of upstream maintenance."; # Added 2025-06-09 lzma = throw "'lzma' has been renamed to/replaced by 'xz'"; # Converted to throw 2024-10-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 208928012475..8e6905f92645 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14374,17 +14374,10 @@ with pkgs; ### DESKTOPS/LXDE - lxde = recurseIntoAttrs (callPackage ../desktops/lxde { }); - # Backwards compatibility aliases - inherit (lxde) - lxappearance - lxappearance-gtk2 - lxmenu-data - lxpanel - lxrandr - lxsession - lxtask - ; + lxappearance-gtk2 = callPackage ../by-name/lx/lxappearance/package.nix { + gtk2 = gtk2-x11; + withGtk3 = false; + }; lxqt = recurseIntoAttrs ( import ../desktops/lxqt {