ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

guix: package: Fix recutils output for non-package inputs.

Browse source 
* guix/ui.scm (package->recutils)[dependencies]: Ignore non-package inputs.
* tests/guix-package.sh: New test.
This commit is contained in:
Eric Bavier 2014-07-25 07:38:20 -05:00
parent 7eade0ee03
commit 5e6feee617
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
guix/ui.scm
View file

@ -468,8 +468,8 @@ (define (package<? p1 p2)
(format port "version: ~a~%" (package-version p)) (format port "version: ~a~%" (package-version p))
(format port "dependencies: ~a~%" (format port "dependencies: ~a~%"
(match (package-direct-inputs p) (match (package-direct-inputs p)
(((labels packages . _) ...) (((labels inputs . _) ...)
(dependencies->recutils packages)))) (dependencies->recutils (filter package? inputs)))))
(format port "location: ~a~%" (format port "location: ~a~%"
(or (and=> (package-location p) location->string) (or (and=> (package-location p) location->string)
(_ "unknown"))) (_ "unknown")))

3
tests/guix-package.sh
View file

@ -179,6 +179,9 @@ guix package -p "$profile" -A 'gui.*e' | grep guile
# Check whether `--show' returns something sensible. # Check whether `--show' returns something sensible.
guix package --show=guile | grep "^name: guile" 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 # There's no generation older than 12 months, so the following command should
# have no effect. # have no effect.
generation="`readlink_base "$profile"`" generation="`readlink_base "$profile"`"