From patchwork Wed Nov 21 14:17:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleg Pykhalov X-Patchwork-Id: 260 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 57DCE16837; Wed, 21 Nov 2018 14:19:16 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id EA422167F9 for ; Wed, 21 Nov 2018 14:19:15 +0000 (GMT) Received: from localhost ([::1]:39424 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gPTLX-0003DL-80 for patchwork@mira.cbaines.net; Wed, 21 Nov 2018 09:19:15 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51418) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gPTKV-0002GI-3k for guix-patches@gnu.org; Wed, 21 Nov 2018 09:18:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gPTKM-0004PX-Hb for guix-patches@gnu.org; Wed, 21 Nov 2018 09:18:06 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:33729) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gPTKM-0004PT-EU for guix-patches@gnu.org; Wed, 21 Nov 2018 09:18:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gPTKM-0000gN-A3 for guix-patches@gnu.org; Wed, 21 Nov 2018 09:18:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33448] [PATCH 2/3] describe: Add json format. Resent-From: Oleg Pykhalov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Nov 2018 14:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33448 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33448@debbugs.gnu.org Received: via spool by 33448-submit@debbugs.gnu.org id=B33448.15428098732578 (code B ref 33448); Wed, 21 Nov 2018 14:18:02 +0000 Received: (at 33448) by debbugs.gnu.org; 21 Nov 2018 14:17:53 +0000 Received: from localhost ([127.0.0.1]:37984 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gPTKD-0000fT-95 for submit@debbugs.gnu.org; Wed, 21 Nov 2018 09:17:53 -0500 Received: from mail-lj1-f176.google.com ([209.85.208.176]:44141) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gPTK9-0000ef-UX for 33448@debbugs.gnu.org; Wed, 21 Nov 2018 09:17:50 -0500 Received: by mail-lj1-f176.google.com with SMTP id k19-v6so4952417lji.11 for <33448@debbugs.gnu.org>; Wed, 21 Nov 2018 06:17:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KJW9fjfUR7H2gBddt0ifGttS/FYQn+6GY9MjbUkpwoo=; b=SLsV5h99r52tfg/bZxtjeMUNKZUlTBdvlQfmE0hggWf0JWU/Iz0zhmu21B7Kw/qvXB NsLjwbpMX4cnaAuJpiGTSZp4uKi5qeTsXAkc4Uq1FvnwuCTTh1/HaGAfilyEVI1tDmS/ 45pki1zX+pZkyZjrnXq/WMVUh3T5wQqCDl6RXWm1uu77cfxlhJCzJHeBzE/NGgVX0tSX Fza/WcsRG5SaWw0x3RECtQxwDVlgs5+rfvTCbzu6Vc/IxqMQHoCEh6SYdRtdvDrra5hs b/96euBzn86Gy9tPnvS2E+bZ7dcVLhSN2mxpe9LcxuB1bUxW7bEvxyRXxjgmZY/x2Xb2 NjuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KJW9fjfUR7H2gBddt0ifGttS/FYQn+6GY9MjbUkpwoo=; b=bZ3N1N6aBF6RykOlrIr8R4GFULiQ0SQaNr4BuYi1fEkH5Zn+H4EJBQSsvnjAJDEvGH mAjMHEI2Yn6E0LuAESLKf1p1mKlhLuAvu2KmJNENbvX5kahUBwofd5Y9NB9+0KODBFLC a+aNHAegnyl15MatXKRsm3CHzDIbl8n2QMIZ0S6DUVFRJ/9FNmDR6mkEX/SZLx3brdZt irJ9UrRm81WqBDsiXzYrV+1h0kximAxcZtMh4Lou1oYTTl6PJ1sVN1//5tITSDkDwDCb ZgH6APRz9mQZqabXjKCX6U3HY4DrEwFsyoIWqVvrdr94gI20nYNVz1RF5ygxMG28rq2S AYjA== X-Gm-Message-State: AGRZ1gJ78uJHCOG0wxUrBmxlc1VkaTdtxbtB8q80PIAqSHMxUw2kEMQy 22ajbbrMuF33qZzEUStvVAaq42uIc18= X-Google-Smtp-Source: AJdET5dE73Yq15icN+bCDdJcWr6i4eUG+BfdLS95TOk33HiQQM1XaKLhm+KnLJd0+51AyE9kCM0dtw== X-Received: by 2002:a2e:9059:: with SMTP id n25-v6mr4138151ljg.155.1542809863628; Wed, 21 Nov 2018 06:17:43 -0800 (PST) Received: from localhost.localdomain (95-55-9-11.dynamic.avangarddsl.ru. [95.55.9.11]) by smtp.gmail.com with ESMTPSA id k3-v6sm1589040lja.8.2018.11.21.06.17.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Nov 2018 06:17:42 -0800 (PST) From: Oleg Pykhalov Date: Wed, 21 Nov 2018 17:17:14 +0300 Message-Id: <20181121141715.16417-2-go.wigust@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181121141715.16417-1-go.wigust@gmail.com> References: <20181121141715.16417-1-go.wigust@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * guix/channels.scm (channel->json): New procedure. * guix/scripts/describe.scm (%options): Add 'json' option. (display-checkout-info, display-profile-info): Use 'channel->json'. * doc/guix.texi (Invoking guix describe): Document this. --- doc/guix.texi | 5 ++++- guix/channels.scm | 12 ++++++++++++ guix/scripts/describe.scm | 13 ++++++++++--- 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 082e81bf7..3413eb30f 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -3273,7 +3273,10 @@ produce human-readable output; @item channels 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 -guix pull}). +guix pull}); +@item json +@cindex JSON +produce a list of channel specifications in JSON format. @end table @item --profile=@var{profile} diff --git a/guix/channels.scm b/guix/channels.scm index bfdbf470b..9f2c9103e 100644 --- a/guix/channels.scm +++ b/guix/channels.scm @@ -26,6 +26,7 @@ #:use-module (guix derivations) #:use-module (guix store) #:use-module (guix i18n) + #:use-module (json) #:use-module (srfi srfi-1) #:use-module (srfi srfi-9) #:use-module (srfi srfi-11) @@ -39,7 +40,9 @@ channel-commit channel-location + channel->json channel->sexp + %default-channels channel-instance? @@ -94,6 +97,15 @@ (url ,url) (commit ,commit))))) +(define channel->json + (match-lambda + (($ name url branch commit location) + (scm->json-string + (list + (cons 'name name) + (cons 'url url) + (cons 'commit commit)))))) + (define-record-type (channel-instance channel commit checkout) channel-instance? diff --git a/guix/scripts/describe.scm b/guix/scripts/describe.scm index 6a30d19b1..d7e276769 100644 --- a/guix/scripts/describe.scm +++ b/guix/scripts/describe.scm @@ -39,7 +39,7 @@ ;; Specifications of the command-line options. (list (option '(#\f "format") #t #f (lambda (opt name arg result) - (unless (member arg '("human" "channels")) + (unless (member arg '("human" "channels" "json")) (leave (G_ "~a: unsupported output format~%") arg)) (alist-cons 'format (string->symbol arg) result))) (option '(#\p "profile") #t #f @@ -107,7 +107,12 @@ within a Git checkout." ('channels (pretty-print (channel->sexp (channel (name 'guix) (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))) (define (display-profile-info profile fmt) @@ -144,7 +149,9 @@ in the format specified by FMT." ('human (display-profile-content profile number)) ('channels - (pretty-print (map channel->sexp (channels))))) + (pretty-print (map channel->sexp (channels)))) + ('json + (format #t "[~a]~%" (string-join (map channel->json (channels)) ",")))) (display-package-search-path fmt))