From patchwork Thu Nov 3 19:19:32 2022 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: 44279 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 A950327BBEA; Thu, 3 Nov 2022 19:21:38 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6B3DD27BBE9 for ; Thu, 3 Nov 2022 19:21:38 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oqfm5-00057G-4P; Thu, 03 Nov 2022 15:21:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oqflx-0004zz-Ks for guix-patches@gnu.org; Thu, 03 Nov 2022 15:21:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oqflx-0004mS-CP for guix-patches@gnu.org; Thu, 03 Nov 2022 15:21:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oqflw-0004pl-7O for guix-patches@gnu.org; Thu, 03 Nov 2022 15:21:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59003] [PATCH 4/7] installer: Use 'current-guix' for extensions. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 03 Nov 2022 19:21:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59003 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59003@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 59003-submit@debbugs.gnu.org id=B59003.166750320518434 (code B ref 59003); Thu, 03 Nov 2022 19:21:04 +0000 Received: (at 59003) by debbugs.gnu.org; 3 Nov 2022 19:20:05 +0000 Received: from localhost ([127.0.0.1]:50771 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oqfky-0004nA-KZ for submit@debbugs.gnu.org; Thu, 03 Nov 2022 15:20:04 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46738) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oqfko-0004lH-Hj for 59003@debbugs.gnu.org; Thu, 03 Nov 2022 15:19:54 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oqfkj-0004U8-BL; Thu, 03 Nov 2022 15:19:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=mBOJeRKKn7K84kapSEezMGT0SrvtRWyq0zTk1NAa27Y=; b=DM1s2YOsGeuk03uYbcb3 OPbrlxTFBLuCkfUBC/8bVUBxez8gGWmr7+KrhMmYVfBijWM4fQyQlcFvcbjx0IE8HnRLr1CJFqXHd 8soUIyOCgteSEwOhfWDNWEJ4fj55Kwi/qjh3FlEtdJNfm4M/rAbEA5NvpcC+TwXQnyRJo+mxQhHW9 U5qPw6Kss2TumN2zSQUnA1DySmcwxedmZlfeLfC8KGK5mxY5qU6LHlV4oP2CvuVpVu1RLuOmd254f MQ0vBX5du/PKOeAzaRcdP3IEasCkYJ7h85gNhF9UjhIG26Wg7IAs22LzSZP39JCRilyyQzvUn7KYf mkWGEeRi0FqYag==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oqfki-0001MS-VQ; Thu, 03 Nov 2022 15:19:49 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Thu, 3 Nov 2022 20:19:32 +0100 Message-Id: <20221103191935.16336-4-ludo@gnu.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221103191935.16336-1-ludo@gnu.org> References: <20221103191935.16336-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: , Sender: "Guix-patches" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches This lets us use the latest (gnu build linux-modules) for instance. Note that items listed in 'with-extensions' come first in the load path, before the directory containing the modules in 'with-imported-modules'. * gnu/installer.scm (installer-program): Use (current-guix) instead of 'guix' in 'with-extensions'. --- gnu/installer.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/installer.scm b/gnu/installer.scm index 5cd1af8edf..df7625e05c 100644 --- a/gnu/installer.scm +++ b/gnu/installer.scm @@ -358,7 +358,7 @@ (define installer-builder (with-extensions (list guile-gcrypt guile-newt guile-parted guile-bytestructures guile-json-3 guile-git guile-webutils - guix gnutls) + (current-guix) gnutls) (with-imported-modules `(,@(source-module-closure `(,@modules (gnu services herd)