me
/
guix
Archived
1
0
Fork 0
Code

channels: Add 'channel->code'. 

* guix/channels.scm (channel->code): New procedure, taken from...
* guix/scripts/describe.scm (channel->sexp): ... here.
Adjust callers accordingly.
master
Ludovic Courtès 2021-01-10 21:51:18 +01:00
parent 1b88b7bad2
commit 60d72f5364
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
guix/channels.scm
View File

@ -92,6 +92,7 @@
profile-channels
manifest-entry-channel
channel->code
channel-news-entry?
channel-news-entry-commit
@ -957,6 +958,24 @@ PROFILE is not a profile created by 'guix pull', return the empty list."
(reverse
(manifest-entries (profile-manifest profile)))))
(define* (channel->code channel #:key (include-introduction? #t))
"Return code (an sexp) to build CHANNEL. When INCLUDE-INTRODUCTION? is
true, include its introduction, if any."
(let ((intro (and include-introduction?
(channel-introduction channel))))
`(channel
(name ',(channel-name channel))
(url ,(channel-url channel))
(commit ,(channel-commit channel))
,@(if intro
`((introduction (make-channel-introduction
,(channel-introduction-first-signed-commit intro)
(openpgp-fingerprint
,(openpgp-format-fingerprint
(channel-introduction-first-commit-signer
intro))))))
'()))))
;;;
;;; News.

22
guix/scripts/describe.scm
View File

@ -113,22 +113,6 @@ Display information about the channels currently in use.\n"))
(_
(warning (G_ "'GUIX_PACKAGE_PATH' is set but it is not captured~%")))))))
(define* (channel->sexp channel #:key (include-introduction? #t))
(let ((intro (and include-introduction?
(channel-introduction channel))))
`(channel
(name ',(channel-name channel))
(url ,(channel-url channel))
(commit ,(channel-commit channel))
,@(if intro
`((introduction (make-channel-introduction
,(channel-introduction-first-signed-commit intro)
(openpgp-fingerprint
,(openpgp-format-fingerprint
(channel-introduction-first-commit-signer
intro))))))
'()))))
(define (channel->json channel)
(scm->json-string
(let ((intro (channel-introduction channel)))
@ -183,7 +167,7 @@ string is ~a.~%")
(format #t (G_ " branch: ~a~%") (reference-shorthand head))
(format #t (G_ " commit: ~a~%") commit))
('channels
(pretty-print `(list ,(channel->sexp (channel (name 'guix)
(pretty-print `(list ,(channel->code (channel (name 'guix)
(url (dirname directory))
(commit commit))))))
('json
@ -213,9 +197,9 @@ in the format specified by FMT."
('human
(display-profile-content profile number))
('channels
(pretty-print `(list ,@(map channel->sexp channels))))
(pretty-print `(list ,@(map channel->code channels))))
('channels-sans-intro
(pretty-print `(list ,@(map (cut channel->sexp <>
(pretty-print `(list ,@(map (cut channel->code <>
#:include-introduction? #f)
channels))))
('json