pull: Use 'fold-available-packages' for the current package list.

* guix/scripts/pull.scm (display-profile-news): Use
'fold-available-packages' instead of 'fold-packages' to compute OLD.
(profile-package-alist): Use 'inferior-available-packages'.
This commit is contained in:
Ludovic Courtès 2019-02-12 22:09:07 +01:00
parent e2760d1a8b
commit 46765f82db
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5

View file

@ -169,11 +169,14 @@ (define (display-profile-news profile)
(reverse (profile-generations profile))) (reverse (profile-generations profile)))
((current previous _ ...) ((current previous _ ...)
(newline) (newline)
(let ((old (fold-packages (lambda (package result) (let ((old (fold-available-packages
(alist-cons (package-name package) (lambda* (name version result
(package-version package) #:key supported? deprecated?
result)) #:allow-other-keys)
'())) (if (and supported? (not deprecated?))
(alist-cons name version result)
result))
'()))
(new (profile-package-alist (new (profile-package-alist
(generation-file-name profile current)))) (generation-file-name profile current))))
(display-new/upgraded-packages old new (display-new/upgraded-packages old new
@ -338,15 +341,10 @@ (define indent-string
(define profile-package-alist (define profile-package-alist
(mlambda (profile) (mlambda (profile)
"Return a name/version alist representing the packages in PROFILE." "Return a name/version alist representing the packages in PROFILE."
(fold (lambda (package lst) (let* ((inferior (open-inferior profile))
(alist-cons (inferior-package-name package) (packages (inferior-available-packages inferior)))
(inferior-package-version package) (close-inferior inferior)
lst)) packages)))
'()
(let* ((inferior (open-inferior profile))
(packages (inferior-packages inferior)))
(close-inferior inferior)
packages))))
(define* (display-new/upgraded-packages alist1 alist2 (define* (display-new/upgraded-packages alist1 alist2
#:key (heading "")) #:key (heading ""))