From mboxrd@z Thu Jan 1 00:00:00 1970 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 Subject: [bug#34295] [PATCH] pull: Specify channels via command-line. Resent-Message-ID: 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) From: Oleg Pykhalov Date: Sun, 3 Feb 2019 14:37:49 +0300 Message-Id: <20190203113749.14825-1-go.wigust@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 34295@debbugs.gnu.org * 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)) -- 2.20.1