From patchwork Sat Nov 14 12:07:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Zihao X-Patchwork-Id: 25122 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 A034F27BBF4; Sat, 14 Nov 2020 12:09:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 80EA327BBF6 for ; Sat, 14 Nov 2020 12:09:09 +0000 (GMT) Received: from localhost ([::1]:37420 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kduMe-0001ut-Kh for patchwork@mira.cbaines.net; Sat, 14 Nov 2020 07:09:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44452) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kduMY-0001uh-Mz for guix-patches@gnu.org; Sat, 14 Nov 2020 07:09:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:38371) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kduMY-0008JS-DE for guix-patches@gnu.org; Sat, 14 Nov 2020 07:09:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kduMY-0000VJ-7Z for guix-patches@gnu.org; Sat, 14 Nov 2020 07:09:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44630] [PATCH] channels: Expose the default channel in %default-channel Resent-From: Zhu Zihao Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 14 Nov 2020 12:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 44630 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 44630@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16053556861869 (code B ref -1); Sat, 14 Nov 2020 12:09:02 +0000 Received: (at submit) by debbugs.gnu.org; 14 Nov 2020 12:08:06 +0000 Received: from localhost ([127.0.0.1]:49917 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kduLe-0000U5-97 for submit@debbugs.gnu.org; Sat, 14 Nov 2020 07:08:06 -0500 Received: from lists.gnu.org ([209.51.188.17]:53972) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kduLd-0000Ty-8k for submit@debbugs.gnu.org; Sat, 14 Nov 2020 07:08:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44318) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kduLd-0001gX-3v for guix-patches@gnu.org; Sat, 14 Nov 2020 07:08:05 -0500 Received: from mail-m972.mail.163.com ([123.126.97.2]:57288) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kduLU-0007tf-H6 for guix-patches@gnu.org; Sat, 14 Nov 2020 07:08:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=XVkrU 8u4SJ+mpMtrcpApHI/oKBsRV5+w0reZMXQLCvM=; b=NCBXtnJ2KJbMV640+w5m9 B2U2mx4HpjqoL4ONh/3r8KtITmSvv2Dy/CuDRv1Ep3p3pHWgLfS/EH/P69IP3En7 o9Z5+S1AFpo+jinwl123Vx52gbxSnPdiAMe81JoWdbKivO1w2pfClOx9A62G5jT1 KeX4kDF1VjcxIoBrITQ+tw= Received: from asus-laptop (unknown [27.39.89.45]) by smtp2 (Coremail) with SMTP id GtxpCgCHUneLyK9fOFwkBg--.487S2; Sat, 14 Nov 2020 20:07:40 +0800 (CST) User-agent: mu4e 1.4.13; emacs 27.1 From: Zhu Zihao Date: Sat, 14 Nov 2020 20:07:34 +0800 Message-ID: <86ft5cp2ex.fsf@163.com> MIME-Version: 1.0 X-CM-TRANSID: GtxpCgCHUneLyK9fOFwkBg--.487S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxUctCzDUUUU X-Originating-IP: [27.39.89.45] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/1tbiFAzcr1aD76NpQgAAsZ Received-SPF: pass client-ip=123.126.97.2; envelope-from=all_but_last@163.com; helo=mail-m972.mail.163.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/14 07:07:43 X-ACL-Warn: Detected OS = Linux 3.1-3.10 X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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 This expose the inner channel of "%default-channels", this can help user to override the original guix channel with any mirror more conveniently. Before: ``` (channel (inherit (car %default-channels)) (url "url/to/mirror")) ``` After: ``` (channel (inherit %default-channel) (url "https://mirror.guix.org.cn/git/guix")) ``` From 2441a555cf9dab16da8b040ebb8b3ff60ccd1f2c Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Sat, 14 Nov 2020 20:02:47 +0800 Subject: [PATCH] channels: Expose the default channel in %default-channel variable. * guix/channels(%default-channel): New variable taken from the inner of %default-channels. (%default-channels): Refactored. --- guix/channels.scm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/guix/channels.scm b/guix/channels.scm index 916d663e9f..f78712c895 100644 --- a/guix/channels.scm +++ b/guix/channels.scm @@ -72,6 +72,7 @@ openpgp-fingerprint->bytevector openpgp-fingerprint + %default-channel %default-channels guix-channel? @@ -170,13 +171,16 @@ to the corresponding bytevector." ;; URL of the default 'guix' channel. "https://git.savannah.gnu.org/git/guix.git") +(define %default-channel + (channel + (name 'guix) + (branch "master") + (url %default-channel-url) + (introduction %guix-channel-introduction))) + (define %default-channels ;; Default list of channels. - (list (channel - (name 'guix) - (branch "master") - (url %default-channel-url) - (introduction %guix-channel-introduction)))) + (list %default-channel)) (define (guix-channel? channel) "Return true if CHANNEL is the 'guix' channel." -- 2.29.2