From 5dc27a087f6d80e51dcb1a2198fee54edfbd3945 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 14 Feb 2026 14:18:17 +0800
Subject: [PATCH] mate.{base,extra}Packages: drop

Moved to nixos module.
---
 .../services/x11/desktop-managers/mate.nix    | 70 ++++++++++++++-----
 pkgs/desktops/mate/default.nix                | 44 +-----------
 2 files changed, 55 insertions(+), 59 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix
index 2e658cb83c66..764e903cc2c5 100644
--- a/nixos/modules/services/x11/desktop-managers/mate.nix
+++ b/nixos/modules/services/x11/desktop-managers/mate.nix
@@ -70,24 +70,58 @@ in
       # Debugging
       environment.sessionVariables.MATE_SESSION_DEBUG = mkIf cfg.debug "1";
 
-      environment.systemPackages = utils.removePackagesByName (
-        pkgs.mate.basePackages
-        ++ pkgs.mate.extraPackages
-        ++ [
-          (pkgs.caja-with-extensions.override {
-            extensions = cfg.extraCajaExtensions;
-          })
-          (pkgs.mate-panel-with-applets.override {
-            applets = cfg.extraPanelApplets;
-          })
-          pkgs.desktop-file-utils
-          pkgs.glib
-          pkgs.gtk3.out
-          pkgs.shared-mime-info
-          pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
-          pkgs.yelp # for 'Contents' in 'Help' menus
-        ]
-      ) config.environment.mate.excludePackages;
+      environment.systemPackages = utils.removePackagesByName (with pkgs; [
+        # Base packages.
+        libmatekbd
+        libmatemixer
+        libmateweather
+        marco
+        mate-common
+        mate-control-center
+        mate-desktop
+        mate-icon-theme
+        mate-menus
+        mate-notification-daemon
+        mate-polkit
+        mate-session-manager
+        mate-settings-daemon
+        mate-settings-daemon-wrapped
+        mate-themes
+
+        # Extra packages.
+        atril
+        caja-extensions # for caja-sendto
+        engrampa
+        eom
+        mate-applets
+        mate-backgrounds
+        mate-calc
+        mate-indicator-applet
+        mate-media
+        mate-netbook
+        mate-power-manager
+        mate-screensaver
+        mate-system-monitor
+        mate-terminal
+        mate-user-guide
+        # mate-user-share
+        mate-utils
+        mozo
+        pluma
+
+        (caja-with-extensions.override {
+          extensions = cfg.extraCajaExtensions;
+        })
+        (mate-panel-with-applets.override {
+          applets = cfg.extraPanelApplets;
+        })
+        desktop-file-utils
+        glib
+        gtk3.out
+        shared-mime-info
+        xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
+        yelp # for 'Contents' in 'Help' menus
+      ]) config.environment.mate.excludePackages;
 
       programs.dconf.enable = true;
       # Shell integration for VTE terminals
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index f4b59506712f..7d4ab54139a9 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -21,47 +21,6 @@ let
           url = if url == null then "https://git.mate-desktop.org/${pname}" else url;
         };
 
-      # Caja and mate-panel are managed in NixOS module.
-      basePackages = with pkgs; [
-        libmatekbd
-        libmatemixer
-        libmateweather
-        marco
-        mate-common
-        mate-control-center
-        mate-desktop
-        mate-icon-theme
-        mate-menus
-        mate-notification-daemon
-        mate-polkit
-        mate-session-manager
-        mate-settings-daemon
-        mate-settings-daemon-wrapped
-        mate-themes
-      ];
-
-      extraPackages = with pkgs; [
-        atril
-        caja-extensions # for caja-sendto
-        engrampa
-        eom
-        mate-applets
-        mate-backgrounds
-        mate-calc
-        mate-indicator-applet
-        mate-media
-        mate-netbook
-        mate-power-manager
-        mate-screensaver
-        mate-system-monitor
-        mate-terminal
-        mate-user-guide
-        # mate-user-share
-        mate-utils
-        mozo
-        pluma
-      ];
-
       cajaExtensions = [ pkgs.caja-extensions ];
 
       panelApplets = with pkgs; [
@@ -79,6 +38,9 @@ let
 in
 lib.makeScope pkgs.newScope packages
 // lib.optionalAttrs config.allowAliases {
+  basePackages = throw "‘mate.basePackages’ was removed. Please list the packages 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
+
   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
   eom = lib.warnOnInstantiate "‘mate.eom’ was moved to top-level. Please use ‘pkgs.eom’ directly" pkgs.eom; # Added on 2026-02-08