From 4a2cbd772b9e55522bf742989640d10834cfc0f8 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 8 Feb 2026 12:42:27 -0800
Subject: [PATCH] mate.caja{,-with-extensions}: move to top-level

---
 .../ca/caja-with-extensions/package.nix}                      | 0
 .../mate/caja/default.nix => by-name/ca/caja/package.nix}     | 0
 pkgs/desktops/mate/default.nix                                | 4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename pkgs/{desktops/mate/caja/with-extensions.nix => by-name/ca/caja-with-extensions/package.nix} (100%)
 rename pkgs/{desktops/mate/caja/default.nix => by-name/ca/caja/package.nix} (100%)

diff --git a/pkgs/desktops/mate/caja/with-extensions.nix b/pkgs/by-name/ca/caja-with-extensions/package.nix
similarity index 100%
rename from pkgs/desktops/mate/caja/with-extensions.nix
rename to pkgs/by-name/ca/caja-with-extensions/package.nix
diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/by-name/ca/caja/package.nix
similarity index 100%
rename from pkgs/desktops/mate/caja/default.nix
rename to pkgs/by-name/ca/caja/package.nix
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 0aeb0cd23f70..88a9375640fb 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -21,8 +21,6 @@ let
           url = if url == null then "https://git.mate-desktop.org/${pname}" else url;
         };
 
-      caja = callPackage ./caja { };
-      caja-with-extensions = callPackage ./caja/with-extensions.nix { };
       mate-panel = callPackage ./mate-panel { };
       mate-panel-with-applets = callPackage ./mate-panel/with-applets.nix { };
       mate-settings-daemon = callPackage ./mate-settings-daemon { };
@@ -127,4 +125,6 @@ lib.makeScope pkgs.newScope packages
   python-caja = lib.warnOnInstantiate "‘mate.python-caja’ was moved to top-level. Please use ‘pkgs.python-caja’ directly" pkgs.python-caja; # Added on 2026-02-08
   caja-dropbox = lib.warnOnInstantiate "‘mate.caja-dropbox’ was moved to top-level. Please use ‘pkgs.caja-dropbox’ directly" pkgs.caja-dropbox; # Added on 2026-02-08
   caja-extensions = lib.warnOnInstantiate "‘mate.caja-extensions’ was moved to top-level. Please use ‘pkgs.caja-extensions’ directly" pkgs.caja-extensions; # Added on 2026-02-08
+  caja = lib.warnOnInstantiate "‘mate.caja’ was moved to top-level. Please use ‘pkgs.caja’ directly" pkgs.caja; # Added on 2026-02-08
+  caja-with-extensions = lib.warnOnInstantiate "‘mate.caja-with-extensions’ was moved to top-level. Please use ‘pkgs.caja-with-extensions’ directly" pkgs.caja-with-extensions; # Added on 2026-02-08
 }