me
/
guix
Archived
1
0
Fork 0
Code

guix describe: Use 'manifest-entry-channel'. 

* guix/channels.scm (manifest-entry-channel): Export.
* guix/scripts/describe.scm (display-profile-content): Use it.
master
Ludovic Courtès 2021-01-10 21:37:48 +01:00
parent a47f16a874
commit 1b88b7bad2
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
guix/channels.scm
View File

@ -91,6 +91,7 @@
ensure-forward-channel-update ensure-forward-channel-update
profile-channels profile-channels
manifest-entry-channel
channel-news-entry? channel-news-entry?
channel-news-entry-commit channel-news-entry-commit

30
guix/scripts/describe.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Ekaitz Zarraga <ekaitz@elenq.tech> ;;; Copyright © 2020 Ekaitz Zarraga <ekaitz@elenq.tech>
;;; ;;;
@ -237,23 +237,17 @@ way and displaying details about the channel's source code."
(format #t " ~a ~a~%" (format #t " ~a ~a~%"
(manifest-entry-name entry) (manifest-entry-name entry)
(manifest-entry-version entry)) (manifest-entry-version entry))
(match (assq 'source (manifest-entry-properties entry)) (match (manifest-entry-channel entry)
(('source ('repository ('version 0) ((? channel? channel)
('url url) (format #t (G_ " repository URL: ~a~%")
('branch branch) (channel-url channel))
('commit commit) (when (channel-branch channel)
_ ...)) (format #t (G_ " branch: ~a~%")
(let ((channel (channel (name 'nameless) (channel-branch channel)))
(url url) (format #t (G_ " commit: ~a~%")
(branch branch) (if (supports-hyperlinks?)
(commit commit)))) (channel-commit-hyperlink channel)
(format #t (G_ " repository URL: ~a~%") url) (channel-commit channel))))
(when branch
(format #t (G_ " branch: ~a~%") branch))
(format #t (G_ " commit: ~a~%")
(if (supports-hyperlinks?)
(channel-commit-hyperlink channel commit)
commit))))
(_ #f))) (_ #f)))
;; Show most recently installed packages last. ;; Show most recently installed packages last.