From ffe8b46fecdc1cb6f87ee814d784a1ddc4e3bda5 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 14 Feb 2026 14:29:09 +0800
Subject: [PATCH] mate.{cajaExtensions,panelApplets}: drop

Moved to corresponding packages.
---
 .../ca/caja-with-extensions/package.nix       |  4 ++--
 .../ma/mate-panel-with-applets/package.nix    | 22 +++++++++++++++++--
 pkgs/desktops/mate/default.nix                | 22 +++----------------
 3 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/pkgs/by-name/ca/caja-with-extensions/package.nix b/pkgs/by-name/ca/caja-with-extensions/package.nix
index 991880e57784..43034921a6de 100644
--- a/pkgs/by-name/ca/caja-with-extensions/package.nix
+++ b/pkgs/by-name/ca/caja-with-extensions/package.nix
@@ -5,13 +5,13 @@
   wrapGAppsHook3,
   lndir,
   caja,
-  mate,
+  caja-extensions,
   extensions ? [ ],
   useDefaultExtensions ? true,
 }:
 
 let
-  selectedExtensions = extensions ++ (lib.optionals useDefaultExtensions mate.cajaExtensions);
+  selectedExtensions = extensions ++ (lib.optionals useDefaultExtensions [ caja-extensions ]);
 in
 stdenv.mkDerivation {
   pname = "${caja.pname}-with-extensions";
diff --git a/pkgs/by-name/ma/mate-panel-with-applets/package.nix b/pkgs/by-name/ma/mate-panel-with-applets/package.nix
index ba0ee5298705..f82cecaef779 100644
--- a/pkgs/by-name/ma/mate-panel-with-applets/package.nix
+++ b/pkgs/by-name/ma/mate-panel-with-applets/package.nix
@@ -5,14 +5,32 @@
   wrapGAppsHook3,
   lndir,
   marco,
+  mate-applets,
+  mate-indicator-applet,
+  mate-netbook,
+  mate-notification-daemon,
+  mate-media,
   mate-panel,
-  mate,
+  mate-power-manager,
+  mate-sensors-applet,
+  mate-utils,
   applets ? [ ],
   useDefaultApplets ? true,
 }:
 
 let
-  selectedApplets = applets ++ (lib.optionals useDefaultApplets mate.panelApplets);
+  selectedApplets =
+    applets
+    ++ (lib.optionals useDefaultApplets [
+      mate-applets
+      mate-indicator-applet
+      mate-netbook
+      mate-notification-daemon
+      mate-media
+      mate-power-manager
+      mate-sensors-applet
+      mate-utils
+    ]);
 in
 stdenv.mkDerivation {
   pname = "${mate-panel.pname}-with-applets";
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 792c7f082922..910af1b27c00 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -4,29 +4,13 @@
   config,
 }:
 
-let
-  packages =
-    self: with self; {
-      cajaExtensions = [ pkgs.caja-extensions ];
-
-      panelApplets = with pkgs; [
-        mate-applets
-        mate-indicator-applet
-        mate-netbook
-        mate-notification-daemon
-        mate-media
-        mate-power-manager
-        mate-sensors-applet
-        mate-utils
-      ];
-    };
-
-in
-lib.makeScope pkgs.newScope packages
+lib.makeScope pkgs.newScope (self: { })
 // lib.optionalAttrs config.allowAliases {
   basePackages = throw "‘mate.basePackages’ was removed. Please list the packages you need explicitly"; # Added on 2026-02-14
+  cajaExtensions = throw "‘mate.cajaExtensions’ was removed. Please list the extensions you need explicitly"; # Added on 2026-02-14
   extraPackages = throw "‘mate.extraPackages’ was removed. Please list the packages you need explicitly"; # Added on 2026-02-14
   mateUpdateScript = throw "‘mate.mateUpdateScript’ was removed. Please use ‘pkgs.gitUpdater’ directly"; # Added on 2026-02-14
+  panelApplets = throw "‘mate.panelApplets’ was removed. Please list the applets you need explicitly"; # Added on 2026-02-14
 
   atril = lib.warnOnInstantiate "‘mate.atril’ was moved to top-level. Please use ‘pkgs.atril’ directly" pkgs.atril; # Added on 2026-02-08
   engrampa = lib.warnOnInstantiate "‘mate.engrampa’ was moved to top-level. Please use ‘pkgs.engrampa’ directly" pkgs.engrampa; # Added on 2026-02-08