From d35baae6035da03a8d82e56935a329b13a0e7e77 Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Fri, 26 Dec 2025 16:39:11 -0800 Subject: [PATCH] xfce.xfwm4: move to top-level --- .../core/xfwm4/default.nix => by-name/xf/xfwm4/package.nix} | 0 pkgs/desktops/xfce/default.nix | 3 +-- 2 files changed, 1 insertion(+), 2 deletions(-) rename pkgs/{desktops/xfce/core/xfwm4/default.nix => by-name/xf/xfwm4/package.nix} (100%) diff --git a/pkgs/desktops/xfce/core/xfwm4/default.nix b/pkgs/by-name/xf/xfwm4/package.nix similarity index 100% rename from pkgs/desktops/xfce/core/xfwm4/default.nix rename to pkgs/by-name/xf/xfwm4/package.nix diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 42755bc7b8fe..81bd74bad312 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -17,8 +17,6 @@ makeScopeWithSplicing' { { #### CORE - xfwm4 = callPackage ./core/xfwm4 { }; - xfce4-appfinder = callPackage ./core/xfce4-appfinder { }; #### APPLICATIONS @@ -100,6 +98,7 @@ makeScopeWithSplicing' { xfce4-settings = lib.warnOnInstantiate "‘xfce.xfce4-settings’ was moved to top-level. Please use ‘pkgs.xfce4-settings’ directly" pkgs.xfce4-settings; # Added on 2025-12-26 xfce4-power-manager = lib.warnOnInstantiate "‘xfce.xfce4-power-manager’ was moved to top-level. Please use ‘pkgs.xfce4-power-manager’ directly" pkgs.xfce4-power-manager; # Added on 2025-12-26 xfdesktop = lib.warnOnInstantiate "‘xfce.xfdesktop’ was moved to top-level. Please use ‘pkgs.xfdesktop’ directly" pkgs.xfdesktop; # Added on 2025-12-26 + xfwm4 = lib.warnOnInstantiate "‘xfce.xfwm4’ was moved to top-level. Please use ‘pkgs.xfwm4’ directly" pkgs.xfwm4; # Added on 2025-12-26 thunar-archive-plugin = lib.warnOnInstantiate "‘xfce.thunar-archive-plugin’ was moved to top-level. Please use ‘pkgs.thunar-archive-plugin’ directly" pkgs.thunar-archive-plugin; # Added on 2025-12-26 thunar-dropbox-plugin = lib.warnOnInstantiate "‘xfce.thunar-dropbox-plugin’ was moved to top-level. Please use ‘pkgs.thunar-dropbox-plugin’ directly" pkgs.thunar-dropbox-plugin; # Added on 2025-12-26