From 886d8b7ecfc600fc57047898ed3b1fceef39b613 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Tue, 24 May 2022 15:07:00 -0300 Subject: [PATCH] xfce: convert old aliases to throws, and remove old throws --- pkgs/desktops/xfce/default.nix | 110 +++++++++++++++------------------ 1 file changed, 51 insertions(+), 59 deletions(-) diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index acdddd7d1e69..8ab14656690e 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -159,66 +159,58 @@ lib.makeScope pkgs.newScope (self: with self; { xfce4-pulseaudio-plugin = callPackage ./panel-plugins/xfce4-pulseaudio-plugin { }; } // lib.optionalAttrs config.allowAliases { - #### ALIASES - added 2018-01 + #### ALIASES - terminal = xfce4-terminal; - thunar-build = thunar-bare; - thunarx-2-dev = thunar-build; - thunar_volman = thunar-volman; - xfce4panel = xfce4-panel; - xfce4session = xfce4-session; - xfce4settings = xfce4-settings; - xfce4_power_manager = xfce4-power-manager; - xfce4_appfinder = xfce4-appfinder; - xfce4_dev_tools = xfce4-dev-tools; - xfce4notifyd = xfce4-notifyd; - xfce4taskmanager = xfce4-taskmanager; - xfce4terminal = xfce4-terminal; - xfce4volumed_pulse = xfce4-volumed-pulse; - xfce4icontheme = xfce4-icon-theme; - xfwm4themes = xfwm4-themes; + terminal = throw "xfce.terminal has been removed, use xfce.xfce4-terminal instead"; # added 2022-05-24 + thunar-build = throw "xfce.thunar-build has been removed, use xfce.thunar-bare instead"; # added 2022-05-24 + thunarx-2-dev = throw "xfce.thunarx-2-dev has been removed, use xfce.thunar-bare instead"; # added 2022-05-24 + thunar_volman = throw "xfce.thunar_volman has been removed, use xfce.thunar-volman instead"; # added 2022-05-24 + xfce4panel = throw "xfce.xfce4panel has been removed, use xfce.xfce4-panel instead"; # added 2022-05-24 + xfce4session = throw "xfce.xfce4session has been removed, use xfce.xfce4-session instead"; # added 2022-05-24 + xfce4settings = throw "xfce.xfce4settings has been removed, use xfce.xfce4-settings instead"; # added 2022-05-24 + xfce4_power_manager = throw "xfce.xfce4_power_manager has been removed, use xfce.xfce4-power-manager instead"; # added 2022-05-24 + xfce4_appfinder = throw "xfce.xfce4_appfinder has been removed, use xfce.xfce4-appfinder instead"; # added 2022-05-24 + xfce4_dev_tools = throw "xfce.xfce4_dev_tools has been removed, use xfce.xfce4-dev-tools instead"; # added 2022-05-24 + xfce4notifyd = throw "xfce.xfce4notifyd has been removed, use xfce.xfce4-notifyd instead"; # added 2022-05-24 + xfce4taskmanager = throw "xfce.xfce4taskmanager has been removed, use xfce.xfce4-taskmanager instead"; # added 2022-05-24 + xfce4terminal = throw "xfce.xfce4terminal has been removed, use xfce.xfce4-terminal instead"; # added 2022-05-24 + xfce4volumed_pulse = throw "xfce.xfce4volumed_pulse has been removed, use xfce.xfce4-volumed-pulse instead"; # added 2022-05-24 + xfce4icontheme = throw "xfce.xfce4icontheme has been removed, use xfce.xfce4-icon-theme instead"; # added 2022-05-24 + xfwm4themes = throw "xfce.xfwm4themes has been removed, use xfce.xfwm4-themes instead"; # added 2022-05-24 + xfce4_battery_plugin = throw "xfce.xfce4_battery_plugin has been removed, use xfce.xfce4-battery-plugin instead"; # added 2022-05-24 + xfce4_clipman_plugin = throw "xfce.xfce4_clipman_plugin has been removed, use xfce.xfce4-clipman-plugin instead"; # added 2022-05-24 + xfce4_cpufreq_plugin = throw "xfce.xfce4_cpufreq_plugin has been removed, use xfce.xfce4-cpufreq-plugin instead"; # added 2022-05-24 + xfce4_cpugraph_plugin = throw "xfce.xfce4_cpugraph_plugin has been removed, use xfce.xfce4-cpugraph-plugin instead"; # added 2022-05-24 + xfce4_datetime_plugin = throw "xfce.xfce4_datetime_plugin has been removed, use xfce.xfce4-datetime-plugin instead"; # added 2022-05-24 + xfce4_dockbarx_plugin = throw "xfce.xfce4_dockbarx_plugin has been removed, use xfce.xfce4-dockbarx-plugin instead"; # added 2022-05-24 + xfce4_embed_plugin = throw "xfce.xfce4_embed_plugin has been removed, use xfce.xfce4-embed-plugin instead"; # added 2022-05-24 + xfce4_eyes_plugin = throw "xfce.xfce4_eyes_plugin has been removed, use xfce.xfce4-eyes-plugin instead"; # added 2022-05-24 + xfce4_fsguard_plugin = throw "xfce.xfce4_fsguard_plugin has been removed, use xfce.xfce4-fsguard-plugin instead"; # added 2022-05-24 + xfce4_genmon_plugin = throw "xfce.xfce4_genmon_plugin has been removed, use xfce.xfce4-genmon-plugin instead"; # added 2022-05-24 + xfce4_hardware_monitor_plugin = throw "xfce.xfce4_hardware_monitor_plugin has been removed, use xfce.xfce4-hardware-monitor-plugin instead"; # added 2022-05-24 + xfce4_namebar_plugin = throw "xfce.xfce4_namebar_plugin has been removed, use xfce.xfce4-namebar-plugin instead"; # added 2022-05-24 + xfce4_netload_plugin = throw "xfce.xfce4_netload_plugin has been removed, use xfce.xfce4-netload-plugin instead"; # added 2022-05-24 + xfce4_notes_plugin = throw "xfce.xfce4_notes_plugin has been removed, use xfce.xfce4-notes-plugin instead"; # added 2022-05-24 + xfce4_mailwatch_plugin = throw "xfce.xfce4_mailwatch_plugin has been removed, use xfce.xfce4-mailwatch-plugin instead"; # added 2022-05-24 + xfce4_mpc_plugin = throw "xfce.xfce4_mpc_plugin has been removed, use xfce.xfce4-mpc-plugin instead"; # added 2022-05-24 + xfce4_sensors_plugin = throw "xfce.xfce4_sensors_plugin has been removed, use xfce.xfce4-sensors-plugin instead"; # added 2022-05-24 + xfce4_systemload_plugin = throw "xfce.xfce4_systemload_plugin has been removed, use xfce.xfce4-systemload-plugin instead"; # added 2022-05-24 + xfce4_timer_plugin = throw "xfce.xfce4_timer_plugin has been removed, use xfce.xfce4-timer-plugin instead"; # added 2022-05-24 + xfce4_verve_plugin = throw "xfce.xfce4_verve_plugin has been removed, use xfce.xfce4-verve-plugin instead"; # added 2022-05-24 + xfce4_xkb_plugin = throw "xfce.xfce4_xkb_plugin has been removed, use xfce.xfce4-xkb-plugin instead"; # added 2022-05-24 + xfce4_weather_plugin = throw "xfce.xfce4_weather_plugin has been removed, use xfce.xfce4-weather-plugin instead"; # added 2022-05-24 + xfce4_whiskermenu_plugin = throw "xfce.xfce4_whiskermenu_plugin has been removed, use xfce.xfce4-whiskermenu-plugin instead"; # added 2022-05-24 + xfce4_windowck_plugin = throw "xfce.xfce4_windowck_plugin has been removed, use xfce.xfce4-windowck-plugin instead"; # added 2022-05-24 + xfce4_pulseaudio_plugin = throw "xfce.xfce4_pulseaudio_plugin has been removed, use xfce.xfce4-pulseaudio-plugin instead"; # added 2022-05-24 + libxfce4ui_gtk3 = throw "xfce.libxfce4ui_gtk3 has been removed, use xfce.libxfce4ui instead"; # added 2022-05-24 + xfce4panel_gtk3 = throw "xfce.xfce4panel_gtk3 has been removed, use xfce.xfce4-panel instead"; # added 2022-05-24 + xfce4_power_manager_gtk3 = throw "xfce.xfce4_power_manager_gtk3 has been removed, use xfce.xfce4-power-manager instead"; # added 2022-05-24 + gtk = throw "xfce.gtk has been removed, use gtk2 instead"; # added 2022-05-24 + gtksourceview = throw "xfce.gtksourceview has been removed, use gtksourceview instead"; # added 2022-05-24 + dconf = throw "xfce.dconf has been removed, use dconf instead"; # added 2022-05-24 + vte = throw "xfce.vte has been removed, use vte instead"; # added 2022-05-24 - xfce4_battery_plugin = xfce4-battery-plugin; - xfce4_clipman_plugin = xfce4-clipman-plugin; - xfce4_cpufreq_plugin = xfce4-cpufreq-plugin; - xfce4_cpugraph_plugin = xfce4-cpugraph-plugin; - xfce4_datetime_plugin = xfce4-datetime-plugin; - xfce4_dockbarx_plugin = xfce4-dockbarx-plugin; - xfce4_embed_plugin = xfce4-embed-plugin; - xfce4_eyes_plugin = xfce4-eyes-plugin; - xfce4_fsguard_plugin = xfce4-fsguard-plugin; - xfce4_genmon_plugin = xfce4-genmon-plugin; - xfce4_hardware_monitor_plugin = xfce4-hardware-monitor-plugin; - xfce4_namebar_plugin = xfce4-namebar-plugin; - xfce4_netload_plugin = xfce4-netload-plugin; - xfce4_notes_plugin = xfce4-notes-plugin; - xfce4_mailwatch_plugin = xfce4-mailwatch-plugin; - xfce4_mpc_plugin = xfce4-mpc-plugin; - xfce4_sensors_plugin = xfce4-sensors-plugin; - xfce4_systemload_plugin = xfce4-systemload-plugin; - xfce4_timer_plugin = xfce4-timer-plugin; - xfce4_verve_plugin = xfce4-verve-plugin; - xfce4_xkb_plugin = xfce4-xkb-plugin; - xfce4_weather_plugin = xfce4-weather-plugin; - xfce4_whiskermenu_plugin = xfce4-whiskermenu-plugin; - xfce4_windowck_plugin = xfce4-windowck-plugin; - xfce4_pulseaudio_plugin = xfce4-pulseaudio-plugin; + xinitrc = xfce4-session.xinitrc; # added 2019-11-04 - xfce4-dict-plugin = throw "deprecated 2020-04-19: xfce4-dict-plugin is now part of xfce4-dict."; # added 2020-04-19 - - # added 2019-11-04 - libxfce4ui_gtk3 = libxfce4ui; - xfce4panel_gtk3 = xfce4-panel; - xfce4_power_manager_gtk3 = xfce4-power-manager; - gtk = pkgs.gtk2; - libxfcegui4 = throw "libxfcegui4 is the deprecated Xfce GUI library. It has been superseded by the libxfce4ui library"; - xinitrc = xfce4-session.xinitrc; - libglade = throw "libglade has been removed"; - inherit (pkgs.gnome) gtksourceview; - thunar-bare = thunar.override { - thunarPlugins = []; - }; - - # added 2019-11-30 - inherit (pkgs) dconf vte; + thunar-bare = thunar.override { thunarPlugins = []; }; # added 2019-11-04 })