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.