[bug#58358] [PATCH 0/3] Update btop.

[bug#58358] [PATCH 0/3] Update btop.

[Greg Hogan]

Update btop and set the superseded flags for the developer's earlier
iterations, bashtop and bpytop, for which development is frozen.

Greg Hogan (3):
  gnu: bashtop: Deprecate for bpytop.
  gnu: bpytop: Deprecate for btop.
  gnu: btop: Update to 1.2.11.

 gnu/packages/admin.scm | 56 ++++++++++++++++++++++--------------------
 1 file changed, 29 insertions(+), 27 deletions(-)

-- 
2.37.3

[bug#58358] [PATCH 1/3] gnu: bashtop: Deprecate for bpytop.

[Greg Hogan]

* gnu/packages/admin.scm (bashtop): Deprecate for bpytop.
---
 gnu/packages/admin.scm | 49 +++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 13d582403b..0f3fcaa5e3 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -751,30 +751,6 @@ (define-public htop
 application (for console or X terminals) and requires ncurses.")
     (license license:gpl2)))
 
-(define-public bashtop
-  (package
-    (name "bashtop")
-    (version "0.9.25")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/aristocratos/bashtop")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "07nlr6vmyb7yihaxj1fp424lmhwkdjl6mls92v90f6gsvikpa13v"))))
-    (build-system gnu-build-system)
-    (arguments
-     '(#:make-flags (list (string-append "PREFIX=" %output))
-       #:tests? #f      ; bats test fails with loading load.bash
-       #:phases (modify-phases %standard-phases (delete 'configure))))
-    (home-page "https://github.com/aristocratos/bashtop")
-    (synopsis "Linux/OSX/FreeBSD resource monitor")
-    (description "Resource monitor that shows usage and stats for processor,
-memory, disks, network and processes.")
-    (license license:asl2.0)))
-
 (define-public bpytop
   (package
     (name "bpytop")
@@ -810,6 +786,31 @@ (define-public bpytop
 @command{bashtop}.")
     (license license:asl2.0)))
 
+(define-public bashtop
+  (package
+    (name "bashtop")
+    (version "0.9.25")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/aristocratos/bashtop")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "07nlr6vmyb7yihaxj1fp424lmhwkdjl6mls92v90f6gsvikpa13v"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:make-flags (list (string-append "PREFIX=" %output))
+       #:tests? #f      ; bats test fails with loading load.bash
+       #:phases (modify-phases %standard-phases (delete 'configure))))
+    (home-page "https://github.com/aristocratos/bashtop")
+    (synopsis "Linux/OSX/FreeBSD resource monitor")
+    (description "Resource monitor that shows usage and stats for processor,
+memory, disks, network and processes.")
+    (license license:asl2.0)
+    (properties `((superseded . ,bpytop)))))
+
 (define-public pies
   (package
     (name "pies")
-- 
2.37.3

[bug#58358] [PATCH 2/3] gnu: bpytop: Deprecate for btop.

[Greg Hogan]

* gnu/packages/admin.scm (bpytop): Deprecate for btop.
---
 gnu/packages/admin.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 0f3fcaa5e3..90858e1282 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -784,7 +784,8 @@ (define-public bpytop
     (description "Resource monitor that shows usage and stats for processor,
 memory, disks, network and processes.  It's a Python port and continuation of
 @command{bashtop}.")
-    (license license:asl2.0)))
+    (license license:asl2.0)
+    (properties `((superseded . ,btop)))))
 
 (define-public bashtop
   (package
-- 
2.37.3

[bug#58358] [PATCH 3/3] gnu: btop: Update to 1.2.11.

[Greg Hogan]

* gnu/packages/admin.scm (btop): Update to 1.2.11.
---
 gnu/packages/admin.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 90858e1282..6f4a5304cf 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -705,7 +705,7 @@ (define-public ttyload
 (define-public btop
   (package
     (name "btop")
-    (version "1.2.9")
+    (version "1.2.11")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -713,7 +713,7 @@ (define-public btop
                     version ".tar.gz"))
               (sha256
                (base32
-                "0cb5q7hrb9y378i98km9s6jbi5c50i7wra8m8jik5hf4m4s3930g"))))
+                "0z0960q44jkjam93wyrizf21bhn7khhf1rz8ykxsvaxmxya6cnl1"))))
     (build-system gnu-build-system)
     (arguments
      (list #:tests? #f ;no test suite
-- 
2.37.3

bug#58358: [PATCH 0/3] Update btop.

[Greg Hogan]

Now that I think more on this, Guix's "superseded by" is not a
deprecation warning but forces installation of the superseded package.
These are three different packages, and some day the unsupported
packages can be evaluated for removal. Closing.

Greg

On Fri, Oct 7, 2022 at 10:57 AM Greg Hogan <code@greghogan.com> wrote:
>
> Update btop and set the superseded flags for the developer's earlier
> iterations, bashtop and bpytop, for which development is frozen.
>
> Greg Hogan (3):
>   gnu: bashtop: Deprecate for bpytop.
>   gnu: bpytop: Deprecate for btop.
>   gnu: btop: Update to 1.2.11.
>
>  gnu/packages/admin.scm | 56 ++++++++++++++++++++++--------------------
>  1 file changed, 29 insertions(+), 27 deletions(-)
>
> --
> 2.37.3
>