From 02fbf7e201db4b442c70ee0f5d072e83c5b67e6f Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 31 Aug 2025 00:20:08 +0200 Subject: [PATCH 1/8] lxrandr: move from lxde.lxrandr --- .../core/lxrandr/default.nix => by-name/lx/lxrandr/package.nix} | 0 .../lx}/lxrandr/respect-xml-catalog-files-var.patch | 0 pkgs/desktops/lxde/default.nix | 2 +- pkgs/top-level/all-packages.nix | 1 - 4 files changed, 1 insertion(+), 2 deletions(-) rename pkgs/{desktops/lxde/core/lxrandr/default.nix => by-name/lx/lxrandr/package.nix} (100%) rename pkgs/{desktops/lxde/core => by-name/lx}/lxrandr/respect-xml-catalog-files-var.patch (100%) 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/default.nix b/pkgs/desktops/lxde/default.nix index 3b701cadd12b..2c8a62e959ab 100644 --- a/pkgs/desktops/lxde/default.nix +++ b/pkgs/desktops/lxde/default.nix @@ -22,7 +22,7 @@ lib.makeScope pkgs.newScope ( gtk2 = gtk2-x11; }; - lxrandr = callPackage ./core/lxrandr { }; + lxrandr = throw "'lxrandr' has been moved to top-level."; # added 2025-08-31 lxsession = callPackage ./core/lxsession { }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 325ae8a848eb..bced3ec81eb4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14428,7 +14428,6 @@ with pkgs; lxappearance-gtk2 lxmenu-data lxpanel - lxrandr lxsession lxtask ; From 126a57d77a72c78e5b225fe698714b0379ee7d40 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 31 Aug 2025 00:30:43 +0200 Subject: [PATCH 2/8] lxpanel: move from lxde.lxpanel --- .../lxpanel/default.nix => by-name/lx/lxpanel/package.nix} | 4 ++-- pkgs/desktops/lxde/default.nix | 4 +--- pkgs/top-level/all-packages.nix | 1 - 3 files changed, 3 insertions(+), 6 deletions(-) rename pkgs/{desktops/lxde/core/lxpanel/default.nix => by-name/lx/lxpanel/package.nix} (96%) 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/default.nix b/pkgs/desktops/lxde/default.nix index 2c8a62e959ab..75d78e3e3d73 100644 --- a/pkgs/desktops/lxde/default.nix +++ b/pkgs/desktops/lxde/default.nix @@ -18,9 +18,7 @@ lib.makeScope pkgs.newScope ( lxmenu-data = callPackage ./core/lxmenu-data { }; - lxpanel = callPackage ./core/lxpanel { - gtk2 = gtk2-x11; - }; + lxpanel = throw "'lxpanel' has been moved to top-level."; # added 2025-08-31 lxrandr = throw "'lxrandr' has been moved to top-level."; # added 2025-08-31 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bced3ec81eb4..bef4b128e4c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14427,7 +14427,6 @@ with pkgs; lxappearance lxappearance-gtk2 lxmenu-data - lxpanel lxsession lxtask ; From 98e2c2d56dd9ec149b7d2f03f789e191d879dbf5 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 31 Aug 2025 00:42:21 +0200 Subject: [PATCH 3/8] lxsession: move from lxde.lxsession --- .../lxsession/default.nix => by-name/lx/lxsession/package.nix} | 0 .../lx}/lxsession/repect-xml-catalog-file-var.patch | 0 pkgs/desktops/lxde/default.nix | 2 +- pkgs/top-level/all-packages.nix | 1 - 4 files changed, 1 insertion(+), 2 deletions(-) rename pkgs/{desktops/lxde/core/lxsession/default.nix => by-name/lx/lxsession/package.nix} (100%) rename pkgs/{desktops/lxde/core => by-name/lx}/lxsession/repect-xml-catalog-file-var.patch (100%) 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/default.nix b/pkgs/desktops/lxde/default.nix index 75d78e3e3d73..82c271cbd209 100644 --- a/pkgs/desktops/lxde/default.nix +++ b/pkgs/desktops/lxde/default.nix @@ -22,7 +22,7 @@ lib.makeScope pkgs.newScope ( lxrandr = throw "'lxrandr' has been moved to top-level."; # added 2025-08-31 - lxsession = callPackage ./core/lxsession { }; + lxsession = throw "'lxsession' has been moved to top-level."; # added 2025-08-31 lxtask = callPackage ./core/lxtask { }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bef4b128e4c9..32e309891a97 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14427,7 +14427,6 @@ with pkgs; lxappearance lxappearance-gtk2 lxmenu-data - lxsession lxtask ; From 67b69746bce45b68533b4ce2c74366796cd19fbb Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 31 Aug 2025 00:46:53 +0200 Subject: [PATCH 4/8] lxtask: move from lxde.lxtask --- .../core/lxtask/default.nix => by-name/lx/lxtask/package.nix} | 0 pkgs/desktops/lxde/default.nix | 2 +- pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) rename pkgs/{desktops/lxde/core/lxtask/default.nix => by-name/lx/lxtask/package.nix} (100%) 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 index 82c271cbd209..9feb3cfa734e 100644 --- a/pkgs/desktops/lxde/default.nix +++ b/pkgs/desktops/lxde/default.nix @@ -24,6 +24,6 @@ lib.makeScope pkgs.newScope ( lxsession = throw "'lxsession' has been moved to top-level."; # added 2025-08-31 - lxtask = callPackage ./core/lxtask { }; + lxtask = throw "'lxtask' has been moved to top-level."; # added 2025-08-31 } ) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 32e309891a97..36d63518190d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14427,7 +14427,6 @@ with pkgs; lxappearance lxappearance-gtk2 lxmenu-data - lxtask ; lxqt = recurseIntoAttrs ( From 8e217aa17eac35c6e23aaafec237b470f493df7e Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 31 Aug 2025 00:48:26 +0200 Subject: [PATCH 5/8] lxmenu-data: move from lxde.lxmenu-data --- .../default.nix => by-name/lx/lxmenu-data/package.nix} | 0 pkgs/desktops/lxde/default.nix | 2 +- pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) rename pkgs/{desktops/lxde/core/lxmenu-data/default.nix => by-name/lx/lxmenu-data/package.nix} (100%) 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/default.nix b/pkgs/desktops/lxde/default.nix index 9feb3cfa734e..f6fdf02f3643 100644 --- a/pkgs/desktops/lxde/default.nix +++ b/pkgs/desktops/lxde/default.nix @@ -16,7 +16,7 @@ lib.makeScope pkgs.newScope ( withGtk3 = false; }; - lxmenu-data = callPackage ./core/lxmenu-data { }; + lxmenu-data = throw "'lxmenu-data' has been moved to top-level."; # added 2025-08-31 lxpanel = throw "'lxpanel' has been moved to top-level."; # added 2025-08-31 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 36d63518190d..afa7e0da07e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14426,7 +14426,6 @@ with pkgs; inherit (lxde) lxappearance lxappearance-gtk2 - lxmenu-data ; lxqt = recurseIntoAttrs ( From 4cb0b20affdcad4f2016521539ada5d5ec545904 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 31 Aug 2025 00:51:36 +0200 Subject: [PATCH 6/8] lxappearance{,-gtk2}: move from lxde.lxappearance{,-gtk2} --- .../lxappearance-0.6.3-xdg.system.data.dirs.patch | 0 .../lx/lxappearance/package.nix} | 0 pkgs/desktops/lxde/default.nix | 7 ++----- pkgs/top-level/all-packages.nix | 10 +++++----- 4 files changed, 7 insertions(+), 10 deletions(-) rename pkgs/{desktops/lxde/core => by-name/lx}/lxappearance/lxappearance-0.6.3-xdg.system.data.dirs.patch (100%) rename pkgs/{desktops/lxde/core/lxappearance/default.nix => by-name/lx/lxappearance/package.nix} (100%) 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/default.nix b/pkgs/desktops/lxde/default.nix index f6fdf02f3643..ae365d7d7d2c 100644 --- a/pkgs/desktops/lxde/default.nix +++ b/pkgs/desktops/lxde/default.nix @@ -9,12 +9,9 @@ lib.makeScope pkgs.newScope ( inherit (pkgs) gtk2-x11; - lxappearance = callPackage ./core/lxappearance { }; + lxappearance = throw "'lxappearance' has been moved to top-level."; # added 2025-08-31 - lxappearance-gtk2 = callPackage ./core/lxappearance { - gtk2 = gtk2-x11; - withGtk3 = false; - }; + lxappearance-gtk2 = throw "'lxappearance-gtk2' has been moved to top-level."; # added 2025-08-31 lxmenu-data = throw "'lxmenu-data' has been moved to top-level."; # added 2025-08-31 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index afa7e0da07e6..be2f0d876c39 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14422,11 +14422,11 @@ with pkgs; ### DESKTOPS/LXDE lxde = recurseIntoAttrs (callPackage ../desktops/lxde { }); - # Backwards compatibility aliases - inherit (lxde) - lxappearance - lxappearance-gtk2 - ; + + lxappearance-gtk2 = callPackage ../by-name/lx/lxappearance/package.nix { + gtk2 = gtk2-x11; + withGtk3 = false; + }; lxqt = recurseIntoAttrs ( import ../desktops/lxqt { From 3765c4c455bfbafc991c7cc168db7f3c0e96e703 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 31 Aug 2025 00:57:15 +0200 Subject: [PATCH 7/8] lxde.gtk2-x11: drop alias --- pkgs/desktops/lxde/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/lxde/default.nix b/pkgs/desktops/lxde/default.nix index ae365d7d7d2c..80fe6384b877 100644 --- a/pkgs/desktops/lxde/default.nix +++ b/pkgs/desktops/lxde/default.nix @@ -7,7 +7,7 @@ lib.makeScope pkgs.newScope ( self: with self; { - inherit (pkgs) gtk2-x11; + gtk2-x11 = throw "'lxde.gtk2-x11' has been removed. Use 'gtk2-x11' directly."; # added 2025-08-31 lxappearance = throw "'lxappearance' has been moved to top-level."; # added 2025-08-31 From e85dba0ea9241d69b823291a79ff5bf254436f38 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 31 Aug 2025 01:00:12 +0200 Subject: [PATCH 8/8] lxde: remove scope --- doc/release-notes/rl-2511.section.md | 2 ++ pkgs/desktops/lxde/default.nix | 26 -------------------------- pkgs/top-level/aliases.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 21 insertions(+), 28 deletions(-) delete mode 100644 pkgs/desktops/lxde/default.nix diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index a62e6bc0c001..a1498103e622 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -110,6 +110,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/default.nix b/pkgs/desktops/lxde/default.nix deleted file mode 100644 index 80fe6384b877..000000000000 --- a/pkgs/desktops/lxde/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - config, - lib, - pkgs, -}: - -lib.makeScope pkgs.newScope ( - self: with self; { - - gtk2-x11 = throw "'lxde.gtk2-x11' has been removed. Use 'gtk2-x11' directly."; # added 2025-08-31 - - lxappearance = throw "'lxappearance' has been moved to top-level."; # added 2025-08-31 - - lxappearance-gtk2 = throw "'lxappearance-gtk2' has been moved to top-level."; # added 2025-08-31 - - lxmenu-data = throw "'lxmenu-data' has been moved to top-level."; # added 2025-08-31 - - lxpanel = throw "'lxpanel' has been moved to top-level."; # added 2025-08-31 - - lxrandr = throw "'lxrandr' has been moved to top-level."; # added 2025-08-31 - - lxsession = throw "'lxsession' has been moved to top-level."; # added 2025-08-31 - - lxtask = throw "'lxtask' has been moved to top-level."; # added 2025-08-31 - } -) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 06decd7bd8db..9c4238a8848f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1471,6 +1471,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 be2f0d876c39..f5debb8cafa4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14421,8 +14421,6 @@ with pkgs; ### DESKTOPS/LXDE - lxde = recurseIntoAttrs (callPackage ../desktops/lxde { }); - lxappearance-gtk2 = callPackage ../by-name/lx/lxappearance/package.nix { gtk2 = gtk2-x11; withGtk3 = false;