From patchwork Wed Apr 21 12:21:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 28725 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 4C42E27BC79; Wed, 21 Apr 2021 13:22:44 +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,SPF_HELO_PASS,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 A1A1C27BC7A for ; Wed, 21 Apr 2021 13:22:43 +0100 (BST) Received: from localhost ([::1]:42024 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lZBsQ-0002oE-Rq for patchwork@mira.cbaines.net; Wed, 21 Apr 2021 08:22:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48632) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZBrn-0002XA-0m for guix-patches@gnu.org; Wed, 21 Apr 2021 08:22:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45577) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lZBrm-0007AQ-Ps for guix-patches@gnu.org; Wed, 21 Apr 2021 08:22:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lZBrm-0005aC-MU for guix-patches@gnu.org; Wed, 21 Apr 2021 08:22:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47929] [PATCH 2/5] scripts: pull: Load (gnu packages) module. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Apr 2021 12:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47929 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47929@debbugs.gnu.org Cc: Mathieu Othacehe Received: via spool by 47929-submit@debbugs.gnu.org id=B47929.161900769021380 (code B ref 47929); Wed, 21 Apr 2021 12:22:02 +0000 Received: (at 47929) by debbugs.gnu.org; 21 Apr 2021 12:21:30 +0000 Received: from localhost ([127.0.0.1]:57114 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lZBrF-0005Yc-Mb for submit@debbugs.gnu.org; Wed, 21 Apr 2021 08:21:30 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35904) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lZBrE-0005YD-8p for 47929@debbugs.gnu.org; Wed, 21 Apr 2021 08:21:28 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:54764) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lZBr9-0006ll-3S for 47929@debbugs.gnu.org; Wed, 21 Apr 2021 08:21:23 -0400 Received: from [2a01:e0a:19b:d9a0:9576:8bbf:4795:82ee] (port=38154 helo=localhost.localdomain) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1lZBr7-0003pa-Ky; Wed, 21 Apr 2021 08:21:22 -0400 From: Mathieu Othacehe Date: Wed, 21 Apr 2021 14:21:05 +0200 Message-Id: <20210421122108.2344-2-othacehe@gnu.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210421122108.2344-1-othacehe@gnu.org> References: <20210421122108.2344-1-othacehe@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 allows to pass a manifest to channel-with-substitutes-available this way: (channel-with-substitutes-available %default-guix-channel "https://ci.guix.gnu.org" (specifications->manifest '("git" "emacs-minimal"))) * guix/scripts/pull.scm (channel-list): Load the (gnu packages) module when evaluating the user channels list. --- guix/scripts/pull.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index 07613240a8..662239b492 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -707,7 +707,8 @@ transformations specified in OPTS (resulting from '--url', '--commit', or (string-append %sysconfdir "/guix/channels.scm")) (define (load-channels file) - (let ((result (load* file (make-user-module '((guix channels)))))) + (let ((result (load* file (make-user-module '((guix channels) + (gnu packages)))))) (if (and (list? result) (every channel? result)) result (leave (G_ "'~a' did not return a list of channels~%") file))))