From patchwork Sun Feb 3 11:37:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Oleg Pykhalov X-Patchwork-Id: 950 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 CC15A16ADA; Sun, 3 Feb 2019 11:39:10 +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=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 4090216A9D for ; Sun, 3 Feb 2019 11:39:10 +0000 (GMT) Received: from localhost ([127.0.0.1]:54407 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gqG7B-00074N-Gh for patchwork@mira.cbaines.net; Sun, 03 Feb 2019 06:39:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60379) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gqG76-00074I-S5 for guix-patches@gnu.org; Sun, 03 Feb 2019 06:39:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gqG75-0004ZU-RW for guix-patches@gnu.org; Sun, 03 Feb 2019 06:39:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57484) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gqG75-0004ZG-O4 for guix-patches@gnu.org; Sun, 03 Feb 2019 06:39:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gqG74-00050t-5a for guix-patches@gnu.org; Sun, 03 Feb 2019 06:39:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34295] [PATCH] pull: Specify channels via command-line. Resent-From: Oleg Pykhalov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 03 Feb 2019 11:39:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 34295 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34295@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.154919391319224 (code B ref -1); Sun, 03 Feb 2019 11:39:01 +0000 Received: (at submit) by debbugs.gnu.org; 3 Feb 2019 11:38:33 +0000 Received: from localhost ([127.0.0.1]:56765 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gqG6a-000500-La for submit@debbugs.gnu.org; Sun, 03 Feb 2019 06:38:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45869) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gqG6Y-0004zn-WA for submit@debbugs.gnu.org; Sun, 03 Feb 2019 06:38:31 -0500 Received: from lists.gnu.org ([209.51.188.17]:35578) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gqG6S-000432-W6 for submit@debbugs.gnu.org; Sun, 03 Feb 2019 06:38:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60242) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gqG6R-0006tP-U9 for guix-patches@gnu.org; Sun, 03 Feb 2019 06:38:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gqG6Q-00041l-AL for guix-patches@gnu.org; Sun, 03 Feb 2019 06:38:23 -0500 Received: from mail-lj1-x243.google.com ([2a00:1450:4864:20::243]:46950) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gqG6P-00040e-OF for guix-patches@gnu.org; Sun, 03 Feb 2019 06:38:22 -0500 Received: by mail-lj1-x243.google.com with SMTP id v15-v6so9326370ljh.13 for ; Sun, 03 Feb 2019 03:38:20 -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:mime-version :content-transfer-encoding; bh=cC1UxqNXx5IyMVJXjy3tBIiBe5Jp/bPJwTLHlXCE194=; b=M78NcfcPQbzmeATZbCgJcDw/vNBfzChK4m4/sThKKU23hmkKH3rp2XfFwFWvX8x5ru xZ5MW9kEiQcrtLqqr3zo+fkXyNrhTVlDAkJ8dx1OVGYZ9Hqw183vLD3xv6GX2ws61LgH 0AjgkkKaNd2D2cE/7R1TkKbfYp5EAoE7ceU2E92eUeiSYIC8NY1Hr9VlIGaKms55VtQ4 fk7zfTQd/swDo0HFdr1agDvAO6zmcm6s6sOCDhA5uTkBHGIb8b8r69vK0KirIjvYKRC6 Ctuqy0kwosluPjnWWnJ/jEfJOt/bvM1vOPyFHXFAKW3+x+EzMzTlyQlQTsssxQ3Ggbbg V5Sw== 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:mime-version :content-transfer-encoding; bh=cC1UxqNXx5IyMVJXjy3tBIiBe5Jp/bPJwTLHlXCE194=; b=VW2J5bbJClQL/3GRhAN/PGBlLtsL4mVd+knnXPi3kzfRMapnN+mgOB9BtMLgW91urW y/R4puV/Rgt8GL3vGpe4G8scly8IXm964glZSXq4d9xnIB6dW2cZZpPT63XZn3ECE6ik 8VnfD5arHsnhRwzdjP6c/GcpRKhR1qvmNJnpFo5Zc1UCb5XA5IBjJS2Q2oOc9i45Tems 2osHOF+b6lcmK5Le58dWzF8xh3G92pjoIcVsMwjA5MxqFKwOr0G4gjvaHkD6fd+SXdLx jzHCBg1pNEP9ulqOikFpAwf8ql00+yW1lb7mB0TyoJ04A6rXjMLirZOGozXWSJwUjlwO To8w== X-Gm-Message-State: AHQUAub3tR0/Bd3oeKbMEcErCiIJEeC8m6bLn6KDn8Ojw423KKCLzKg6 6gLDsZ20h7+ww3rufukc5K5dH+PSVzo= X-Google-Smtp-Source: AHgI3IYHz5juB9z3LtNhr77fKBUV2sHtfORLoWau34XdFZvqIvMsm5U+xBKMLt9dvNtNKdpsGKKCtA== X-Received: by 2002:a2e:81a:: with SMTP id 26-v6mr19657659lji.14.1549193898355; Sun, 03 Feb 2019 03:38:18 -0800 (PST) Received: from localhost.localdomain (ppp91-122-127-106.pppoe.avangarddsl.ru. [91.122.127.106]) by smtp.gmail.com with ESMTPSA id z20sm677488lfg.53.2019.02.03.03.38.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 Feb 2019 03:38:17 -0800 (PST) From: Oleg Pykhalov Date: Sun, 3 Feb 2019 14:37:49 +0300 Message-Id: <20190203113749.14825-1-go.wigust@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x 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: 209.51.188.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/scripts/pull.scm (show-help, %options): Add 'channel'. (channel-list): Use this. * doc/guix.texi (Invoking guix pull): Document this. --- doc/guix.texi | 10 +++++++++- guix/scripts/pull.scm | 45 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 868f1959e8..ee854072e1 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -50,7 +50,7 @@ Copyright @copyright{} 2017 Andy Wingo@* Copyright @copyright{} 2017, 2018 Arun Isaac@* Copyright @copyright{} 2017 nee@* Copyright @copyright{} 2018 Rutger Helling@* -Copyright @copyright{} 2018 Oleg Pykhalov@* +Copyright @copyright{} 2018, 2019 Oleg Pykhalov@* Copyright @copyright{} 2018 Mike Gerwitz@* Copyright @copyright{} 2018 Pierre-Antoine Rouby@* Copyright @copyright{} 2018 Gábor Boskovits@* @@ -3564,6 +3564,14 @@ but it supports the following options: Download code from the specified @var{url}, at the given @var{commit} (a valid Git commit ID represented as a hexadecimal string), or @var{branch}. +@item --channel=@var{name},@var{url}[,@var{branch}][,@var{commit}] +Specify channels via command-line arguments ignoring @file{channels.scm}. + +@example +guix pull --channel=guix,https://git.savannah.gnu.org/git/guix.git,branch=staging \ + --channel=my-personal-packages,https://example.org/personal-packages.git +@end example + @cindex @file{channels.scm}, configuration file @cindex configuration file for channels These options are provided for convenience, but you can also specify your diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index 683ab3f059..36c4967596 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2017 Marius Bakke +;;; Copyright © 2019 Oleg Pykhalov ;;; ;;; This file is part of GNU Guix. ;;; @@ -76,6 +77,9 @@ Download and deploy the latest version of Guix.\n")) (display (G_ " --verbose produce verbose output")) + (display (G_ " + --channel=CHANNEL,URL[,branch][,commit] + deploy the CHANNEL at URL")) (display (G_ " -C, --channels=FILE deploy the channels defined in FILE")) (display (G_ " @@ -128,6 +132,20 @@ Download and deploy the latest version of Guix.\n")) (option '("branch") #t #f (lambda (opt name arg result) (alist-cons 'ref `(branch . ,arg) result))) + (option '("channel") #t #f + (lambda (opt name arg result . rest) + (let ((list->alist (match-lambda + ((key value) + (cons key value))))) + (alist-cons 'channel + (match (map (cut string-split <> #\=) + (string-split arg #\,)) + (((name) (url) args ...) + (map list->alist + `(("name" ,name) + ("url" ,url) + ,@args)))) + result)))) (option '(#\p "profile") #t #f (lambda (opt name arg result) (alist-cons 'profile (canonicalize-profile arg) @@ -477,8 +495,33 @@ transformations specified in OPTS (resulting from '--url', '--commit', or result (leave (G_ "'~a' did not return a list of channels~%") file)))) + (define alist->channel + (match-lambda + ((_ meta ...) + (channel + (name (string->symbol (assoc-ref meta "name"))) + (url (assoc-ref meta "url")) + (branch (or (assoc-ref meta "branch") "master")) + (commit (assoc-ref meta "commit")))))) + + (define (guix-channel? channel) + (case (channel-name channel) + ((guix) #t) + (else #f))) + + (define channel-options + (filter (match-lambda + (('channel args ...) #t) + (_ #f)) + opts)) + (define channels - (cond (file + (cond (channel-options + (let ((channels (map alist->channel channel-options))) + (if (null? (filter guix-channel? channels)) + (append channels %default-channels) + channels))) + (file (load-channels file)) ((file-exists? default-file) (load-channels default-file))