[PATCH] guix: package: Fix recutils output for non-package inputs.

[PATCH] guix: package: Fix recutils output for non-package inputs.

[Eric Bavier]

[-- Attachment #1.1: Type: text/plain, Size: 44 bytes --]

This is necessary e.g. for texlive.

`~Eric

[-- Attachment #1.2: Type: text/html, Size: 87 bytes --]

[-- Attachment #2: 0001-guix-package-Fix-recutils-output-for-non-package-inp.patch --]
[-- Type: text/x-patch, Size: 996 bytes --]

From 58f3eec4191b94db440d1689edc58e2d551a4722 Mon Sep 17 00:00:00 2001
From: Eric Bavier <bavier@member.fsf.org>
Date: Thu, 24 Jul 2014 23:59:00 -0500
Subject: [PATCH] guix: package: Fix recutils output for non-package inputs.

* guix/ui.scm (package->recutils)[dependencies]: Ignore non-package inputs.
---
 guix/ui.scm |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/guix/ui.scm b/guix/ui.scm
index 1b7d334..9112d55 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -468,8 +468,8 @@ WIDTH columns."
   (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")))
-- 
1.7.9.5

Re: [PATCH] guix: package: Fix recutils output for non-package inputs.

[Ludovic Courtès]

Eric Bavier <ericbavier@gmail.com> skribis:

> From 58f3eec4191b94db440d1689edc58e2d551a4722 Mon Sep 17 00:00:00 2001
> From: Eric Bavier <bavier@member.fsf.org>
> Date: Thu, 24 Jul 2014 23:59:00 -0500
> Subject: [PATCH] guix: package: Fix recutils output for non-package inputs.
>
> * guix/ui.scm (package->recutils)[dependencies]: Ignore non-package inputs.

Argh, good catch.

Can you also add this in tests/guix-package.sh:

  # Make sure the recutils output is valid for all the packages.
  guix package --search "" > /dev/null

Thanks,
Ludo’.