From db7a3606d45f02816b0f5f39143eafc25d577c6c Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 23 Dec 2025 22:54:22 +0800
Subject: [PATCH] xfce4-panel: Move to top-level

---
 nixos/modules/services/x11/desktop-managers/xfce.nix          | 2 +-
 pkgs/by-name/jg/jgmenu/package.nix                            | 4 ++--
 .../default.nix => by-name/xf/xfce4-panel/package.nix}        | 0
 pkgs/desktops/xfce/default.nix                                | 3 +--
 .../xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix      | 4 ++--
 pkgs/top-level/all-packages.nix                               | 4 +---
 6 files changed, 7 insertions(+), 10 deletions(-)
 rename pkgs/{desktops/xfce/core/xfce4-panel/default.nix => by-name/xf/xfce4-panel/package.nix} (100%)

diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
index 46e5cf358d13..c40721d7a013 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -160,7 +160,7 @@ in
         xfce.xfwm4-themes
       ]
       ++ lib.optionals (!cfg.noDesktop) [
-        xfce.xfce4-panel
+        xfce4-panel
         xfce.xfdesktop
       ]
       ++ lib.optional cfg.enableScreensaver xfce.xfce4-screensaver
diff --git a/pkgs/by-name/jg/jgmenu/package.nix b/pkgs/by-name/jg/jgmenu/package.nix
index ca8100c20bcf..ce599c2efc51 100644
--- a/pkgs/by-name/jg/jgmenu/package.nix
+++ b/pkgs/by-name/jg/jgmenu/package.nix
@@ -12,7 +12,7 @@
   xorg,
   makeWrapper,
   enableXfcePanelApplet ? false,
-  xfce,
+  xfce4-panel,
   gtk3,
   gitUpdater,
 }:
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
   ++ lib.optionals enableXfcePanelApplet [
     gtk3
     libxfce4util
-    xfce.xfce4-panel
+    xfce4-panel
   ];
 
   configureFlags = [
diff --git a/pkgs/desktops/xfce/core/xfce4-panel/default.nix b/pkgs/by-name/xf/xfce4-panel/package.nix
similarity index 100%
rename from pkgs/desktops/xfce/core/xfce4-panel/default.nix
rename to pkgs/by-name/xf/xfce4-panel/package.nix
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 12989e8332c1..a232610d7bcb 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -33,8 +33,6 @@ makeScopeWithSplicing' {
 
       tumbler = callPackage ./core/tumbler { };
 
-      xfce4-panel = callPackage ./core/xfce4-panel { };
-
       xfce4-session = callPackage ./core/xfce4-session { };
 
       xfce4-settings = callPackage ./core/xfce4-settings { };
@@ -170,5 +168,6 @@ makeScopeWithSplicing' {
   libxfce4util = lib.warnOnInstantiate "‘xfce.libxfce4util’ was moved to top-level. Please use ‘pkgs.libxfce4util’ directly" pkgs.libxfce4util; # Added on 2025-12-23
   libxfce4windowing = lib.warnOnInstantiate "‘xfce.libxfce4windowing’ was moved to top-level. Please use ‘pkgs.libxfce4windowing’ directly" pkgs.libxfce4windowing; # Added on 2025-12-23
   xfce4-dev-tools = lib.warnOnInstantiate "‘xfce.xfce4-dev-tools’ was moved to top-level. Please use ‘pkgs.xfce4-dev-tools’ directly" pkgs.xfce4-dev-tools; # Added on 2025-12-23
+  xfce4-panel = lib.warnOnInstantiate "‘xfce.xfce4-panel’ was moved to top-level. Please use ‘pkgs.xfce4-panel’ directly" pkgs.xfce4-panel; # Added on 2025-12-23
   xfconf = lib.warnOnInstantiate "‘xfce.xfconf’ was moved to top-level. Please use ‘pkgs.xfconf’ directly" pkgs.xfconf; # Added on 2025-12-23
 }
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix
index fd4ece28a56f..cdf9fad0adc6 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix
@@ -10,7 +10,7 @@
   pkg-config,
   python3Packages,
   wrapGAppsHook3,
-  xfce,
+  xfce4-panel,
   xfconf,
 }:
 
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     keybinder3
     python3Packages.python
-    xfce.xfce4-panel
+    xfce4-panel
     xfconf
   ]
   ++ pythonPath;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6048d076b74c..3b16a60afbfc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12466,9 +12466,7 @@ with pkgs;
     inherit (haskellPackages) ghcWithPackages;
   };
 
-  xmonad_log_applet = callPackage ../applications/window-managers/xmonad/log-applet {
-    inherit (xfce) xfce4-panel;
-  };
+  xmonad_log_applet = callPackage ../applications/window-managers/xmonad/log-applet { };
 
   xmonad_log_applet_mate = xmonad_log_applet.override {
     desktopSupport = "mate";