From patchwork Mon Dec 7 15:29:56 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: 25638 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 7CEB927BC01; Mon, 7 Dec 2020 15:36:00 +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.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 2287D27BC00 for ; Mon, 7 Dec 2020 15:36:00 +0000 (GMT) Received: from localhost ([::1]:57228 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kmIYR-0007Q3-AU for patchwork@mira.cbaines.net; Mon, 07 Dec 2020 10:35:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42196) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kmITe-00040J-HI for guix-patches@gnu.org; Mon, 07 Dec 2020 10:31:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:43400) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kmITe-0006Kj-4d for guix-patches@gnu.org; Mon, 07 Dec 2020 10:31:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kmITe-0003yG-1d for guix-patches@gnu.org; Mon, 07 Dec 2020 10:31:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45102] [PATCH 1/4] build: 'script/guix' uses our own 'guile' executable. References: <20201207152159.28551-1-ludo@gnu.org> In-Reply-To: <20201207152159.28551-1-ludo@gnu.org> Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Dec 2020 15:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45102 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45102@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 45102-submit@debbugs.gnu.org id=B45102.160735501815173 (code B ref 45102); Mon, 07 Dec 2020 15:31:02 +0000 Received: (at 45102) by debbugs.gnu.org; 7 Dec 2020 15:30:18 +0000 Received: from localhost ([127.0.0.1]:54936 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kmISv-0003wa-Mt for submit@debbugs.gnu.org; Mon, 07 Dec 2020 10:30:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51990) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kmISs-0003w5-RP for 45102@debbugs.gnu.org; Mon, 07 Dec 2020 10:30:15 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:57163) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kmISn-0005vL-Km; Mon, 07 Dec 2020 10:30:09 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=48438 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kmISj-0000cR-HU; Mon, 07 Dec 2020 10:30:07 -0500 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Mon, 7 Dec 2020 16:29:56 +0100 Message-Id: <20201207152959.28864-1-ludo@gnu.org> X-Mailer: git-send-email 2.29.2 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 * Makefile.am (do_subst): Substitute @abs_top_builddir@. * scripts/guix.in: Use it. --- Makefile.am | 1 + scripts/guix.in | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 1a3ca227a4..9803ba5dc7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -39,6 +39,7 @@ do_subst = $(SED) \ -e 's,[@]GUILE[@],$(GUILE),g' \ -e 's,[@]guilemoduledir[@],$(guilemoduledir),g' \ -e 's,[@]guileobjectdir[@],$(guileobjectdir),g' \ + -e 's,[@]abs_top_builddir[@],$(abs_top_builddir),g' \ -e 's,[@]localedir[@],$(localedir),g' scripts/guix: scripts/guix.in Makefile diff --git a/scripts/guix.in b/scripts/guix.in index 0a3ab1f64d..e0194d6ea2 100644 --- a/scripts/guix.in +++ b/scripts/guix.in @@ -1,4 +1,4 @@ -#!@GUILE@ \ +#!@abs_top_builddir@/guile \ --no-auto-compile -e main -s !# ;;; GNU Guix --- Functional package management for GNU From patchwork Mon Dec 7 15:29:57 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: 25635 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 F058E27BC01; Mon, 7 Dec 2020 15:31:19 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS 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 9392627BC00 for ; Mon, 7 Dec 2020 15:31:19 +0000 (GMT) Received: from localhost ([::1]:49284 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kmITu-00041t-Om for patchwork@mira.cbaines.net; Mon, 07 Dec 2020 10:31:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42198) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kmITe-00040M-Ob for guix-patches@gnu.org; Mon, 07 Dec 2020 10:31:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:43401) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kmITe-0006Kt-H1 for guix-patches@gnu.org; Mon, 07 Dec 2020 10:31:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kmITe-0003yO-EZ for guix-patches@gnu.org; Mon, 07 Dec 2020 10:31:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45102] [PATCH 2/4] self: Move Guile early in the module search path. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Dec 2020 15:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45102 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45102@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 45102-submit@debbugs.gnu.org id=B45102.160735501915183 (code B ref 45102); Mon, 07 Dec 2020 15:31:02 +0000 Received: (at 45102) by debbugs.gnu.org; 7 Dec 2020 15:30:19 +0000 Received: from localhost ([127.0.0.1]:54939 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kmISx-0003wp-5c for submit@debbugs.gnu.org; Mon, 07 Dec 2020 10:30:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51994) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kmISv-0003wL-RO for 45102@debbugs.gnu.org; Mon, 07 Dec 2020 10:30:18 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:57174) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kmISq-0005wB-9C; Mon, 07 Dec 2020 10:30:12 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=48438 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kmISo-0000cR-82; Mon, 07 Dec 2020 10:30:11 -0500 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Mon, 7 Dec 2020 16:29:57 +0100 Message-Id: <20201207152959.28864-2-ludo@gnu.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201207152959.28864-1-ludo@gnu.org> References: <20201207152959.28864-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 Until now, Guile modules would first be searched for in MODULE-DIRECTORY, then in each $GUILE_LOAD_PATH entry, and finally in Guile itself. * guix/self.scm (guix-command): Make GUILE the second entry in the %LOAD-PATH and %LOAD-COMPILED-PATH. --- guix/self.scm | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/guix/self.scm b/guix/self.scm index c0de14b79a..ca67f653fa 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -650,17 +650,22 @@ load path." (program-file "guix-command" #~(begin (set! %load-path - (cons (string-append #$module-directory - "/share/guile/site/" - (effective-version)) - %load-path)) + (append (list (string-append #$module-directory + "/share/guile/site/" + (effective-version)) + (string-append #$guile "/share/guile/" + (effective-version))) + %load-path)) (set! %load-compiled-path - (cons (string-append #$module-directory - "/lib/guile/" - (effective-version) - "/site-ccache") - %load-compiled-path)) + (append (list (string-append #$module-directory + "/lib/guile/" + (effective-version) + "/site-ccache") + (string-append #$guile "/lib/guile/" + (effective-version) + "/ccache")) + %load-compiled-path)) ;; To maximize the chances that locales are set up right ;; out-of-the-box, bundle "common" UTF-8 locales. From patchwork Mon Dec 7 15:29:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 25637 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 D327727BC01; Mon, 7 Dec 2020 15:31:56 +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.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 9B53127BC00 for ; Mon, 7 Dec 2020 15:31:55 +0000 (GMT) Received: from localhost ([::1]:50448 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kmIUU-0004YE-Oa for patchwork@mira.cbaines.net; Mon, 07 Dec 2020 10:31:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42202) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kmITf-00040O-6I for guix-patches@gnu.org; Mon, 07 Dec 2020 10:31:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:43402) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kmITe-0006LO-Uo for guix-patches@gnu.org; Mon, 07 Dec 2020 10:31:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kmITe-0003yV-Rp for guix-patches@gnu.org; Mon, 07 Dec 2020 10:31:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45102] [PATCH 3/4] guix: 'guile' executable ignores GUILE_LOAD_PATH during startup. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Dec 2020 15:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45102 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45102@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 45102-submit@debbugs.gnu.org id=B45102.160735502215199 (code B ref 45102); Mon, 07 Dec 2020 15:31:02 +0000 Received: (at 45102) by debbugs.gnu.org; 7 Dec 2020 15:30:22 +0000 Received: from localhost ([127.0.0.1]:54942 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kmIT0-0003x5-EF for submit@debbugs.gnu.org; Mon, 07 Dec 2020 10:30:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52000) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kmISy-0003wR-KM for 45102@debbugs.gnu.org; Mon, 07 Dec 2020 10:30:20 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:57179) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kmISt-0005xC-EF; Mon, 07 Dec 2020 10:30:15 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=48438 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kmISq-0000cR-J7; Mon, 07 Dec 2020 10:30:13 -0500 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Mon, 7 Dec 2020 16:29:58 +0100 Message-Id: <20201207152959.28864-3-ludo@gnu.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201207152959.28864-1-ludo@gnu.org> References: <20201207152959.28864-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 When starting the 'guix' command, this ensures Guile modules are immediately found instead of being search for in other directories. This reduces the number of 'stat' calls during startup when GUILE_LOAD_PATH is set to (almost) that of "env -i $(type -P guix)". * gnu/packages/aux-files/guile-launcher.c (load_path) (load_compiled_path): New variables. (inner_main): Restore GUILE_LOAD_PATH and GUILE_LOAD_COMPILED_PATH and set %load-path and %load-compiled-path accordingly. (main): Save GUILE_LOAD_PATH and GUILE_LOAD_COMPILED_PATH and unset them. --- gnu/packages/aux-files/guile-launcher.c | 46 +++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/gnu/packages/aux-files/guile-launcher.c b/gnu/packages/aux-files/guile-launcher.c index 886ede2846..1dd5d77e66 100644 --- a/gnu/packages/aux-files/guile-launcher.c +++ b/gnu/packages/aux-files/guile-launcher.c @@ -1,5 +1,5 @@ /* GNU Guix --- Functional package management for GNU - Copyright 1996-1997,2000-2001,2006,2008,2011,2013,2018 + Copyright 1996-1997,2000-2001,2006,2008,2011,2013,2018,2020 Free Software Foundation, Inc. Copyright (C) 2020 Ludovic Courtès @@ -19,14 +19,47 @@ along with GNU Guix. If not, see . */ /* This file implements a variant of the 'guile' executable that does not - complain about locale issues. */ + complain about locale issues and arranges to reduce startup time by + ignoring GUILE_LOAD_PATH and GUILE_LOAD_COMPILED_PATH until it has + booted. */ +#include +#include #include #include +/* Saved values of GUILE_LOAD_PATH and GUILE_LOAD_COMPILED_PATH. */ +static const char *load_path, *load_compiled_path; + static void inner_main (void *unused, int argc, char **argv) { + if (load_path != NULL) + { + setenv ("GUILE_LOAD_PATH", load_path, 1); + SCM load_path_var = + scm_c_public_lookup ("guile", "%load-path"); + SCM addition = + scm_parse_path (scm_from_locale_string (load_path), SCM_EOL); + scm_variable_set_x (load_path_var, + scm_append + (scm_list_2 (scm_variable_ref (load_path_var), + addition))); + } + + if (load_compiled_path != NULL) + { + setenv ("GUILE_LOAD_COMPILED_PATH", load_compiled_path, 1); + SCM load_compiled_path_var = + scm_c_public_lookup ("guile", "%load-compiled-path"); + SCM addition = + scm_parse_path (scm_from_locale_string (load_compiled_path), SCM_EOL); + scm_variable_set_x (load_compiled_path_var, + scm_append + (scm_list_2 (scm_variable_ref (load_compiled_path_var), + addition))); + } + scm_shell (argc, argv); } @@ -40,6 +73,15 @@ main (int argc, char **argv) which is always preferable over the C locale. */ setlocale (LC_ALL, "en_US.utf8"); + const char *str; + str = getenv ("GUILE_LOAD_PATH"); + load_path = str != NULL ? strdup (str) : NULL; + str = getenv ("GUILE_LOAD_COMPILED_PATH"); + load_compiled_path = str ? strdup (str) : NULL; + + unsetenv ("GUILE_LOAD_PATH"); + unsetenv ("GUILE_LOAD_COMPILED_PATH"); + scm_install_gmp_memory_functions = 1; scm_boot_guile (argc, argv, inner_main, 0); return 0; /* never reached */ From patchwork Mon Dec 7 15:29:59 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: 25636 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 268F727BC01; Mon, 7 Dec 2020 15:31:46 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS 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 D30EE27BC00 for ; Mon, 7 Dec 2020 15:31:45 +0000 (GMT) Received: from localhost ([::1]:49832 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kmIUK-0004HZ-US for patchwork@mira.cbaines.net; Mon, 07 Dec 2020 10:31:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42208) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kmITf-00040P-JG for guix-patches@gnu.org; Mon, 07 Dec 2020 10:31:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:43403) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kmITf-0006Lj-BV for guix-patches@gnu.org; Mon, 07 Dec 2020 10:31:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kmITf-0003ye-9L for guix-patches@gnu.org; Mon, 07 Dec 2020 10:31:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45102] [PATCH 4/4] self: Remove the empty string from '%load-extensions'. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Dec 2020 15:31:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45102 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45102@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 45102-submit@debbugs.gnu.org id=B45102.160735503215223 (code B ref 45102); Mon, 07 Dec 2020 15:31:03 +0000 Received: (at 45102) by debbugs.gnu.org; 7 Dec 2020 15:30:32 +0000 Received: from localhost ([127.0.0.1]:54945 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kmIT9-0003xS-Pb for submit@debbugs.gnu.org; Mon, 07 Dec 2020 10:30:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52040) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kmIT8-0003xE-2Y for 45102@debbugs.gnu.org; Mon, 07 Dec 2020 10:30:30 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:57189) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kmIT2-0005zC-6i; Mon, 07 Dec 2020 10:30:24 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=48438 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kmISs-0000cR-C5; Mon, 07 Dec 2020 10:30:21 -0500 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Mon, 7 Dec 2020 16:29:59 +0100 Message-Id: <20201207152959.28864-4-ludo@gnu.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201207152959.28864-1-ludo@gnu.org> References: <20201207152959.28864-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 * guix/self.scm (guix-command): Set '%load-extensions'. --- guix/self.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/guix/self.scm b/guix/self.scm index ca67f653fa..7cda6656c9 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -649,6 +649,9 @@ load path." (program-file "guix-command" #~(begin + ;; Remove the empty extension from the search path. + (set! %load-extensions '(".scm")) + (set! %load-path (append (list (string-append #$module-directory "/share/guile/site/"