From 5e6feee61793a6b60aa352dcdbbed0155eb42e7f Mon Sep 17 00:00:00 2001
From: Eric Bavier <bavier@member.fsf.org>
Date: Fri, 25 Jul 2014 07:38:20 -0500
Subject: guix: package: Fix recutils output for non-package inputs.

* guix/ui.scm (package->recutils)[dependencies]: Ignore non-package inputs.
* tests/guix-package.sh: New test.
---
 guix/ui.scm           | 4 ++--
 tests/guix-package.sh | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/guix/ui.scm b/guix/ui.scm
index 1b7d334757..9112d55daf 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -468,8 +468,8 @@ (define (package<? p1 p2)
   (format port "version: ~a~%" (package-version p))
   (format port "dependencies: ~a~%"
           (match (package-direct-inputs p)
-            (((labels packages . _) ...)
-             (dependencies->recutils packages))))
+            (((labels inputs . _) ...)
+             (dependencies->recutils (filter package? inputs)))))
   (format port "location: ~a~%"
           (or (and=> (package-location p) location->string)
               (_ "unknown")))
diff --git a/tests/guix-package.sh b/tests/guix-package.sh
index 99debb936b..e8ff7a88a8 100644
--- a/tests/guix-package.sh
+++ b/tests/guix-package.sh
@@ -179,6 +179,9 @@ guix package -p "$profile" -A 'gui.*e' | grep guile
 # Check whether `--show' returns something sensible.
 guix package --show=guile | grep "^name: guile"
 
+# Check show doesn't fail for packages with non-package inputs.
+guix package --show=texlive
+
 # There's no generation older than 12 months, so the following command should
 # have no effect.
 generation="`readlink_base "$profile"`"
-- 
cgit v1.2.3