From patchwork Mon Jun 8 22:02:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 22618 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 CBE0927BBE3; Mon, 8 Jun 2020 23:04:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,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 ESMTP id CBA4027BBE4 for ; Mon, 8 Jun 2020 23:04:16 +0100 (BST) Received: from localhost ([::1]:49976 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jiPsO-0007gV-99 for patchwork@mira.cbaines.net; Mon, 08 Jun 2020 18:04:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51218) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jiPsC-0007ej-RN for guix-patches@gnu.org; Mon, 08 Jun 2020 18:04:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46610) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jiPsC-0001AD-Cx for guix-patches@gnu.org; Mon, 08 Jun 2020 18:04:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jiPsC-0006oK-8w for guix-patches@gnu.org; Mon, 08 Jun 2020 18:04:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41767] [PATCH 7/9] channels: Automatically add introduction for the official 'guix' channel. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jun 2020 22:04:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41767 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41767@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 41767-submit@debbugs.gnu.org id=B41767.159165380926083 (code B ref 41767); Mon, 08 Jun 2020 22:04:04 +0000 Received: (at 41767) by debbugs.gnu.org; 8 Jun 2020 22:03:29 +0000 Received: from localhost ([127.0.0.1]:58146 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jiPrd-0006mb-Ap for submit@debbugs.gnu.org; Mon, 08 Jun 2020 18:03:29 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43044) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jiPrY-0006ks-Ji for 41767@debbugs.gnu.org; Mon, 08 Jun 2020 18:03:24 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:57802) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jiPrT-00016b-AP; Mon, 08 Jun 2020 18:03:19 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=56846 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jiPrS-0000Iv-Rc; Mon, 08 Jun 2020 18:03:19 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Tue, 9 Jun 2020 00:02:54 +0200 Message-Id: <20200608220256.3267-7-ludo@gnu.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200608220256.3267-1-ludo@gnu.org> References: <20200608220256.3267-1-ludo@gnu.org> MIME-Version: 1.0 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 is useful when people run "guix time-machine -C channels.scm", where 'channels.scm' misses channel introductions. * guix/channels.scm (%default-channel-url): New variable. (%default-channels): Use it. (ensure-default-introduction): New procedure. (latest-channel-instance): Call it. --- guix/channels.scm | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/guix/channels.scm b/guix/channels.scm index 6047b51010..43ddff6f7c 100644 --- a/guix/channels.scm +++ b/guix/channels.scm @@ -148,18 +148,32 @@ "BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA"))) #f)) ;TODO: Add an intro signature so it can be exported. +(define %default-channel-url + ;; URL of the default 'guix' channel. + "https://git.savannah.gnu.org/git/guix.git") + (define %default-channels ;; Default list of channels. (list (channel (name 'guix) (branch "master") - (url "https://git.savannah.gnu.org/git/guix.git") + (url %default-channel-url) (introduction %guix-channel-introduction)))) (define (guix-channel? channel) "Return true if CHANNEL is the 'guix' channel." (eq? 'guix (channel-name channel))) +(define (ensure-default-introduction chan) + "If CHAN represents the \"official\" 'guix' channel and lacks an +introduction, add it." + (if (and (guix-channel? chan) + (not (channel-introduction chan)) + (string=? (channel-url chan) %default-channel-url)) + (channel (inherit chan) + (introduction %guix-channel-introduction)) + chan)) + (define-record-type (channel-instance channel commit checkout) channel-instance? @@ -386,7 +400,9 @@ their relation." (and (string=? (basename file) ".git") (eq? 'directory (stat:type stat)))) - (let-values (((checkout commit relation) + (let-values (((channel) + (ensure-default-introduction channel)) + ((checkout commit relation) (update-cached-checkout (channel-url channel) #:ref (channel-reference channel) #:starting-commit starting-commit)))