nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

describe: Add json format. 

* guix/scripts/describe.scm (channel->json): New procedure.
(display-checkout-info, display-profile-info): Use this.
(%options): Add 'json' option.
* doc/guix.texi (Invoking guix describe): Document this.
This commit is contained in:
Oleg Pykhalov 2018-11-21 16:47:43 +03:00
parent 8548f99549
commit 81a40ee0cb
No known key found for this signature in database
GPG Key ID: 167F8EA5001AFA9C
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/guix.texi
View File

@ -3273,7 +3273,10 @@ produce human-readable output;
@item channels @item channels
produce a list of channel specifications that can be passed to @command{guix produce a list of channel specifications that can be passed to @command{guix
pull -C} or installed as @file{~/.config/guix/channels.scm} (@pxref{Invoking pull -C} or installed as @file{~/.config/guix/channels.scm} (@pxref{Invoking
guix pull}). guix pull});
@item json
@cindex JSON
produce a list of channel specifications in JSON format.
@end table @end table
@item --profile=@var{profile} @item --profile=@var{profile}

19
guix/scripts/describe.scm
View File

@ -25,6 +25,7 @@
#:use-module (guix profiles) #:use-module (guix profiles)
#:use-module ((guix scripts pull) #:select (display-profile-content)) #:use-module ((guix scripts pull) #:select (display-profile-content))
#:use-module (git) #:use-module (git)
#:use-module (json)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (srfi srfi-37) #:use-module (srfi srfi-37)
#:use-module (ice-9 match) #:use-module (ice-9 match)
@ -40,7 +41,7 @@
;; Specifications of the command-line options. ;; Specifications of the command-line options.
(list (option '(#\f "format") #t #f (list (option '(#\f "format") #t #f
(lambda (opt name arg result) (lambda (opt name arg result)
(unless (member arg '("human" "channels")) (unless (member arg '("human" "channels" "json"))
(leave (G_ "~a: unsupported output format~%") arg)) (leave (G_ "~a: unsupported output format~%") arg))
(alist-cons 'format (string->symbol arg) result))) (alist-cons 'format (string->symbol arg) result)))
(option '(#\p "profile") #t #f (option '(#\p "profile") #t #f
@ -92,6 +93,11 @@ Display information about the channels currently in use.\n"))
(url ,(channel-url channel)) (url ,(channel-url channel))
(commit ,(channel-commit channel)))) (commit ,(channel-commit channel))))
(define (channel->json channel)
(scm->json-string `((name . ,(channel-name channel))
(url . ,(channel-url channel))
(commit . ,(channel-commit channel)))))
(define* (display-checkout-info fmt #:optional directory) (define* (display-checkout-info fmt #:optional directory)
"Display information about the current checkout according to FMT, a symbol "Display information about the current checkout according to FMT, a symbol
denoting the requested format. Exit if the current directory does not lie denoting the requested format. Exit if the current directory does not lie
@ -114,7 +120,12 @@ within a Git checkout."
('channels ('channels
(pretty-print `(list ,(channel->sexp (channel (name 'guix) (pretty-print `(list ,(channel->sexp (channel (name 'guix)
(url (dirname directory)) (url (dirname directory))
(commit commit))))))) (commit commit))))))
('json
(display (channel->json (channel (name 'guix)
(url (dirname directory))
(commit commit))))
(newline)))
(display-package-search-path fmt))) (display-package-search-path fmt)))
(define (display-profile-info profile fmt) (define (display-profile-info profile fmt)
@ -153,7 +164,9 @@ in the format specified by FMT."
('human ('human
(display-profile-content profile number)) (display-profile-content profile number))
('channels ('channels
(pretty-print `(list ,@(map channel->sexp channels))))) (pretty-print `(list ,@(map channel->sexp channels))))
('json
(format #t "[~a]~%" (string-join (map channel->json channels) ","))))
(display-package-search-path fmt)) (display-package-search-path fmt))