From d0d06d81682ed88e4ba59b02cedbf52f58af8155 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 11 Dec 2022 01:00:00 +0100
Subject: gnu: ncdu: Use upstream name.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/ncdu.scm (ncdu-1): New variable, renamed from…
(ncdu): …this one, itself renamed from the old ncdu-2.  Simple!
[name]: Drop suffix.
[properties]: Remove obsolete 'upstream-name.
(ncdu-2): Redefine as a DEPRECATED-PACKAGE alias of ncdu.
---
 gnu/packages/ncdu.scm | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'gnu/packages/ncdu.scm')

diff --git a/gnu/packages/ncdu.scm b/gnu/packages/ncdu.scm
index 6b802aafa0..feea8f8819 100644
--- a/gnu/packages/ncdu.scm
+++ b/gnu/packages/ncdu.scm
@@ -30,7 +30,10 @@ (define-module (gnu packages ncdu)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages zig))
 
-(define-public ncdu
+(define-public ncdu-1
+  ;; This old version is ‘LTS’.  Version 2 works fine and has more features,
+  ;; but Zig is still a fast-moving target and doesn't support cross-compilation
+  ;; yet, so we'll keep both for just a little longer.
   (package
     (name "ncdu")
     (version "1.18")
@@ -55,10 +58,10 @@ (define-public ncdu
                              version)))
     (home-page "https://dev.yorhel.nl/ncdu")))
 
-(define-public ncdu-2
+(define-public ncdu
   (package
-    (inherit ncdu)
-    (name "ncdu2")      ; To destinguish it from the C based version.
+    (inherit ncdu-1)
+    (name "ncdu")
     (version "2.2.1")
     (source (origin
               (method url-fetch)
@@ -94,5 +97,7 @@ (define-public ncdu-2
                (when tests?
                  (invoke "zig" "test" "build.zig")))))))
     (native-inputs
-     (list perl zig))
-    (properties `((upstream-name . "ncdu")))))
+     (list perl zig))))
+
+(define-public ncdu-2
+  (deprecated-package "ncdu2" ncdu))
-- 
cgit v1.2.3