diff options
| author | Andreas Enge <andreas@enge.fr> | 2023-04-22 09:21:22 +0200 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2023-04-22 09:21:22 +0200 |
| commit | d1252b597d8b6c77746da7b7417d958f00d01dc6 (patch) | |
| tree | e2cdc9b0938e5ed7ac1b095b83c5760bbedecb87 /guix | |
| parent | 3f7ae420d8a54d4e2ab7f349c40d8930fe9e0771 (diff) | |
| parent | 040d35f088e0f1c856f3f5a9b6bf889b17bd68b3 (diff) | |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/packages.scm | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/guix/packages.scm b/guix/packages.scm index bce82ab3a3..e26602d589 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -1234,11 +1234,14 @@ input list." "Return all source origins associated with PACKAGE; including origins in PACKAGE's inputs and patches." (define (expand source) - (cons - source - (filter origin? (origin-patches source)))) + (cons source + (filter origin? (origin-patches source)))) - `(,@(or (and=> (package-source package) expand) '()) + `(,@(match (package-source package) + ((? origin? origin) + (expand origin)) + (_ + '())) ,@(filter-map (match-lambda ((_ (? origin? orig) _ ...) orig) |