From 39fd70308c3aef5402abe7152ade76ff7bb331bb Mon Sep 17 00:00:00 2001 From: Enrico Maria De Angelis Date: Sat, 28 Feb 2026 08:51:16 +0100 Subject: Remove deprecated ArchUpdates plugin Users should have long switched to PacmanUpdates, as communicated in #723. Furthemore, we had forgotten to list PacmanUpdates in the plugins wrappable in Runnable. Fixed now. --- doc/plugins.org | 21 ++++----------------- src/Xmobar.hs | 2 -- src/Xmobar/Plugins/ArchUpdates.hs | 36 ------------------------------------ src/Xmobar/Run/Types.hs | 4 ++-- xmobar.cabal | 1 - 5 files changed, 6 insertions(+), 58 deletions(-) delete mode 100644 src/Xmobar/Plugins/ArchUpdates.hs diff --git a/doc/plugins.org b/doc/plugins.org index 5cc7e79..8ff9d7d 100644 --- a/doc/plugins.org +++ b/doc/plugins.org @@ -1364,26 +1364,13 @@ network error) - Example: #+begin_src haskell - ArchUpdates ("up to date", - "1 update, - "? updates", - "!Pacman Error!") + PacmanUpdates ("up to date", + "1 update, + "? updates", + "!Pacman Error!") 600 #+end_src -*** =ArchUpdates (Zero, One, Many) Rate= - - - *This plugin is deprecated. Use =PacmanUpdates= instead.* - - Aliases to =arch= - - Same As: - #+begin_src haskell - PacmanUpdates (Zero, - One, - Many, - "pacman: Unknown cause of failure.") - Rate - #+end_src - *** =makeAccordion Tuning [Runnable]= - Wraps other =Runnable= plugins and makes them all collapsible to a single string: diff --git a/src/Xmobar.hs b/src/Xmobar.hs index a6f86eb..5a31d80 100644 --- a/src/Xmobar.hs +++ b/src/Xmobar.hs @@ -26,7 +26,6 @@ module Xmobar (xmobar , module Xmobar.Config.Types , module Xmobar.Config.Parse , module Xmobar.Plugins.Accordion - , module Xmobar.Plugins.ArchUpdates , module Xmobar.Plugins.BufferedPipeReader , module Xmobar.Plugins.CommandReader , module Xmobar.Plugins.Date @@ -56,7 +55,6 @@ import Xmobar.Run.Exec import Xmobar.Config.Types import Xmobar.Config.Parse import Xmobar.Plugins.Accordion -import Xmobar.Plugins.ArchUpdates import Xmobar.Plugins.Command import Xmobar.Plugins.BufferedPipeReader import Xmobar.Plugins.CommandReader diff --git a/src/Xmobar/Plugins/ArchUpdates.hs b/src/Xmobar/Plugins/ArchUpdates.hs deleted file mode 100644 index 0dcfd04..0000000 --- a/src/Xmobar/Plugins/ArchUpdates.hs +++ /dev/null @@ -1,36 +0,0 @@ -{-# LANGUAGE CPP #-} - ------------------------------------------------------------------------------ - ------------------------------------------------------------------------------ - -{- | -Module : Plugins.Monitors.ArchUpdates -Copyright : (c) 2024 Enrico Maria De Angelis -License : BSD-style (see LICENSE) - -Maintainer : Enrico Maria De Angelis -Stability : unstable -Portability : unportable - -An ArchLinux updates availablility plugin for Xmobar --} -module Xmobar.Plugins.ArchUpdates (ArchUpdates (..)) where - -import Xmobar.Plugins.Command (Rate) -import Xmobar.Plugins.PacmanUpdates (PacmanUpdates (PacmanUpdates)) -import Xmobar.Run.Exec - -data ArchUpdates = ArchUpdates (String, String, String) Rate - deriving (Read, Show) - -intoPacmanUpdates :: ArchUpdates -> PacmanUpdates -intoPacmanUpdates (ArchUpdates (z, o, m) r) = - PacmanUpdates (z <> deprecation, o, m, "pacman: Unknown cause of failure.") r - where - deprecation = " (deprecated plugin, click here)" - -instance Exec ArchUpdates where - alias = const "arch" - rate = rate . intoPacmanUpdates - run = run . intoPacmanUpdates diff --git a/src/Xmobar/Run/Types.hs b/src/Xmobar/Run/Types.hs index bb573c8..6b51b2d 100644 --- a/src/Xmobar/Run/Types.hs +++ b/src/Xmobar/Run/Types.hs @@ -19,7 +19,7 @@ module Xmobar.Run.Types(runnableTypes) where import {-# SOURCE #-} Xmobar.Run.Runnable() -import Xmobar.Plugins.ArchUpdates +import Xmobar.Plugins.PacmanUpdates import Xmobar.Plugins.Command import Xmobar.Plugins.Monitors import Xmobar.Plugins.Date @@ -60,7 +60,7 @@ infixr :*: runnableTypes :: Command :*: Monitors :*: Date :*: PipeReader :*: BufferedPipeReader :*: CommandReader :*: StdinReader :*: XMonadLog :*: EWMH :*: Kbd :*: Locks :*: NotmuchMail :*: - ArchUpdates :*: + PacmanUpdates :*: #ifdef INOTIFY Mail :*: MBox :*: #endif diff --git a/xmobar.cabal b/xmobar.cabal index 6c21fc7..4d4cb8d 100644 --- a/xmobar.cabal +++ b/xmobar.cabal @@ -150,7 +150,6 @@ library Xmobar.X11.Text, Xmobar.X11.Types, Xmobar.X11.Window, - Xmobar.Plugins.ArchUpdates, Xmobar.Plugins.Command, Xmobar.Plugins.BufferedPipeReader, Xmobar.Plugins.CommandReader, -- cgit v1.2.3