From patchwork Sat Mar 8 16:39:03 2025 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: 39921 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 D2B5827BBE9; Sat, 8 Mar 2025 16:40:27 +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=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 9045327BBE2 for ; Sat, 8 Mar 2025 16:40:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tqxDa-0006op-1v; Sat, 08 Mar 2025 11:40:06 -0500 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 1tqxDX-0006lh-5Z for guix-patches@gnu.org; Sat, 08 Mar 2025 11:40:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tqxDW-0004mA-Sr for guix-patches@gnu.org; Sat, 08 Mar 2025 11:40:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:References:In-Reply-To:From:To:Subject; bh=Q+aL7Fa1AbLve/NilkH4XiGXx3J2JtF1l7XcY3E8Ivs=; b=N12+Q60IiWvk7dLR33igRsG21t/oEppgVD/kVjkFrwMRbTfwEn8RuymUgmMq9FfYUuq1uuEX5AHgNGtJtmGSv8+B/LnmGjzFI2zJ0ONB5/eK/JoilA53KedZm/Tn4PqV6rjsNpujwg8HKajkpECnA5tznUyuDroqra7GeNmD3ZY7p1NOaO8gUMFPRyueJN7RE9Xj53Swf2SxJRVBE6GhPCP/Z+B7BUWykeTT9Wwk7786fzE2mQBVqlKd90wXDkiyzaj3KKEk73af6KanFkY+09VwFBXX1l9UHSw0TsO0183HB+cKuB29SD84JAz3rqo/+9qdT6WXkdvo5lslETnuvQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tqxDW-0002I9-Mz for guix-patches@gnu.org; Sat, 08 Mar 2025 11:40:02 -0500 Subject: bug#74633: [PATCH v4] ui: Search channels for guix extensions Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Sat, 08 Mar 2025 16:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 74633 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Brian Kubisiak Cc: 74633-done@debbugs.gnu.org Mail-Followup-To: 74633@debbugs.gnu.org, ludo@gnu.org, brian@kubisiak.com Received: via spool by 74633-done@debbugs.gnu.org id=D74633.17414519558731 (code D ref 74633); Sat, 08 Mar 2025 16:40:02 +0000 Received: (at 74633-done) by debbugs.gnu.org; 8 Mar 2025 16:39:15 +0000 Received: from localhost ([127.0.0.1]:56329 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tqxCk-0002Gl-Qu for submit@debbugs.gnu.org; Sat, 08 Mar 2025 11:39:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49314) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tqxCi-0002GQ-E3 for 74633-done@debbugs.gnu.org; Sat, 08 Mar 2025 11:39:13 -0500 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 1tqxCd-0003hL-0I; Sat, 08 Mar 2025 11:39:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=Q+aL7Fa1AbLve/NilkH4XiGXx3J2JtF1l7XcY3E8Ivs=; b=G9iaoaxa9h8wV3UCydDu HK1XVwGF4BFORg7jndPjEZaKsIsm+eECX1AMW+IxKdyhE7JbF3fJYC3RSFeF777O3oHZFC5ULhkI6 NAYWOjc4LNkFwMur9eVwDOi3xSHkX4GNw2Jixmxz/czdde/5Sv3aGN7bkUe7hp9qnoC35/pEVao+A 8MnoNfCpA26DEnxGjUyIto/MPtyeHL3mrnUT2Dmfsh/5kQNXrB/3Nn3Ny0lwuEcbHEgUOZghxrLJH Y7xXW7Sx/ZeezJZsSiraKaXqJBrSvmw/ZTgN0t+iWU8IPci9+N5MPpwXT15xq4fzWxgbZRJ8birHE eqJZZgfCcQt84w==; From: Ludovic =?utf-8?q?Court=C3=A8s?= In-Reply-To: <6c9bd54fc741c8e31821b1506e261776b0829e43.1739806839.git.brian@kubisiak.com> (Brian Kubisiak's message of "Mon, 17 Feb 2025 07:41:46 -0800") References: <2fc5afe876af28643f8074dd1623640cb314cc5e.1733064752.git.brian@kubisiak.com> <6c9bd54fc741c8e31821b1506e261776b0829e43.1739806839.git.brian@kubisiak.com> Date: Sat, 08 Mar 2025 17:39:03 +0100 Message-ID: <878qpftr2w.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Hi Brian, Brian Kubisiak skribis: > * guix/describe.scm (append-channels-to-load-path!): New function. > * gnu/packages.scm (%package-module-path): Call new function. Remove > the code that the function call replaces. > * guix/ui.scm (extension-directories): Call new function. Search > channels for guix extensions. > * guix/self.scm (compiled-guix)[*core-modules*]: Add 'guile-git' to > the list of extensions. > > Change-Id: I53af828dc554485ca28389c9e2653ea6b4fb6b7e Finally applied, with the cosmetic changes below. Thanks! Ludo’. diff --git a/guix/ui.scm b/guix/ui.scm index 3cc15b05fc..d462f7133e 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -2197,11 +2197,12 @@ (define (extension-directories) ;; We need to resolve these lazily, because even using an #:autoload is too ;; much and breaks compilation during "guix pull". (define append-channels-to-load-path! - (module-ref (resolve-module `(guix describe)) - (symbol-append 'append-channels-to-load-path!))) + (module-ref (resolve-interface '(guix describe)) + 'append-channels-to-load-path!)) (define package-path-entries - (module-ref (resolve-module `(guix describe)) - (symbol-append 'package-path-entries))) + (module-ref (resolve-interface '(guix describe)) + 'package-path-entries)) + (append-channels-to-load-path!) (let ((channels (package-path-entries))) (filter file-exists?