From 660dbe65641851aa99b810e4ae065a5f72dc37d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 20 Sep 2019 23:02:30 +0200
Subject: [PATCH] guix package: '--show' ignores deprecated packages.
* guix/scripts/package.scm (process-query) <'show>: Remove superseded
packages.
* tests/guix-package-aliases.sh: Add test.
---
guix/scripts/package.scm | 3 ++-
tests/guix-package-aliases.sh | 3 +++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm
index 21737f43da4..f03741aa9e2 100644
--- a/guix/scripts/package.scm
+++ b/guix/scripts/package.scm
@@ -764,7 +764,8 @@ (define (diff-profiles profile numbers)
(('show requested-name)
(let-values (((name version)
(package-name->name+version requested-name)))
- (match (find-packages-by-name name version)
+ (match (remove package-superseded
+ (find-packages-by-name name version))
(()
(leave (G_ "~a~@[@~a~]: package not found~%") name version))
(packages
diff --git a/tests/guix-package-aliases.sh b/tests/guix-package-aliases.sh
index 9c038b99a51..4beed2e5b71 100644
--- a/tests/guix-package-aliases.sh
+++ b/tests/guix-package-aliases.sh
@@ -62,3 +62,6 @@ guix search '\<board\>' game | grep '^name: gnubg'
guix show --version
guix show guile
guix show python@3 | grep "^name: python"
+
+# "python@2" exists but is deprecated; make sure it doesn't show up.
+if guix show python@2; then false; else true; fi
--
GitLab