me
/
guix
Archived
1
0
Fork 0
Code

packages: 'package-direct-sources' correctly handles non-origin sources. 

Previously 'package-direct-sources' would trigger a wrong-type-arg error
when passed a package whose 'source' is not an origin, such as
'ruby-sorbet-runtime'.

* guix/packages.scm (package-direct-sources): Call 'expand' if and only
if (package-source package) is an origin.
master
Ludovic Courtès 2023-04-21 16:27:07 +02:00
parent 61a6b05850
commit 1df54ceab3
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
guix/packages.scm
View File

@ -1234,11 +1234,14 @@ input list."
"Return all source origins associated with PACKAGE; including origins in "Return all source origins associated with PACKAGE; including origins in
PACKAGE's inputs and patches." PACKAGE's inputs and patches."
(define (expand source) (define (expand source)
(cons (cons source
source (filter origin? (origin-patches source))))
(filter origin? (origin-patches source))))
`(,@(or (and=> (package-source package) expand) '()) `(,@(match (package-source package)
((? origin? origin)
(expand origin))
(_
'()))
,@(filter-map (match-lambda ,@(filter-map (match-lambda
((_ (? origin? orig) _ ...) ((_ (? origin? orig) _ ...)
orig) orig)