From patchwork Thu Feb 6 04:25:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liam Hupfer X-Patchwork-Id: 38307 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 2CCF727BBEA; Thu, 6 Feb 2025 04:27:50 +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=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 D141F27BBE2 for ; Thu, 6 Feb 2025 04:27:49 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tftU2-0000VC-3K; Wed, 05 Feb 2025 23:27:22 -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 1tftTn-0000P6-10 for guix-patches@gnu.org; Wed, 05 Feb 2025 23:27:07 -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 1tftTk-00017g-OI; Wed, 05 Feb 2025 23:27:05 -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:References:In-Reply-To:Date:From:To:Subject; bh=kypTrG0mBI960bpkZ3UA/8d0V1+bT2uT4LbEbHjs3mI=; b=CNxH4P68G2iokZAYvAzfLH9l5A9UvYxOFndO9TIntxZAeIVPE0zizrsBIpTLOb/mCb6ljZdB7o7zajTetC9M2queyFzyEgfKFHYlMg6Zf4+d1DkybXlZAri4WxoMro0EYKr5nitFveeUuDCryTarFNV91+kL95aVn6MxDMEjHZMdUcQCmk7kGQ5r4yZFN8L9Y4IlkaS8Ow0wwGaqD5R0Zg6/1yQ+ok8dmLMt3850jisnGyHr59Z+Ne4cZmvoIfi5TWsw19hanAi3hdyPvV7qPdPQbomQIAX6IKQYhrIkpVqrwwUzvrnkqURcM0gFiTk2cDw/ccXwouJL5kRDM15rSw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tftTj-0002XZ-M3; Wed, 05 Feb 2025 23:27:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76082] [PATCH 6/9] guix-install.sh: Add to MANPATH. Resent-From: Liam Hupfer Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, janneke@gnu.org, ludo@gnu.org, tanguy@bioneland.org, vagrant@debian.org, guix-patches@gnu.org Resent-Date: Thu, 06 Feb 2025 04:27:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76082 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76082@debbugs.gnu.org Cc: Liam Hupfer , Andrew Tropin , Janneke Nieuwenhuizen , Ludovic =?utf-8?q?Court=C3=A8s?= , Tanguy Le Carrour , Vagrant Cascadian X-Debbugs-Original-Xcc: Andrew Tropin , Janneke Nieuwenhuizen , Ludovic =?utf-8?q?Court=C3=A8s?= , Tanguy Le Carrour , Vagrant Cascadian Received: via spool by 76082-submit@debbugs.gnu.org id=B76082.17388159899630 (code B ref 76082); Thu, 06 Feb 2025 04:27:03 +0000 Received: (at 76082) by debbugs.gnu.org; 6 Feb 2025 04:26:29 +0000 Received: from localhost ([127.0.0.1]:53624 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tftTB-0002VC-5o for submit@debbugs.gnu.org; Wed, 05 Feb 2025 23:26:29 -0500 Received: from out-189.mta0.migadu.com ([91.218.175.189]:32232) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tftT8-0002Uo-Qh for 76082@debbugs.gnu.org; Wed, 05 Feb 2025 23:26:27 -0500 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hpfr.net; s=key1; t=1738815975; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kypTrG0mBI960bpkZ3UA/8d0V1+bT2uT4LbEbHjs3mI=; b=iF7xx7ah4xtdUMoFYTIo+cyrazqUp51JkA706dy01ZRkOUg5B5ss3CWKmu5Fy/HwDs/ojx 7RNLNy4rmhRROyZHkuHo+bsWEgJnFTkUyWT+H2F/ThYTOc8AV0A9IBfnf7C0efFxwisTmr TD7iTS0C8SOoRfk2IMQqrOQextqYKA7siK5lSRSUQev3Vodhiouo18oEcEC5S7t8yw3icK xZq3UvMlaYQ8fO0tuX6HJxHfyFS5WeAzVy/TWbShdgT+eIpnSArEXm4Fhz8r+gIfg4ofdv 2W+UJF1RnblG3VRolimpBKdXStpXh2e/yi2v9HmB5E/9Zrn8limP2sqwPhIlIQ== From: Liam Hupfer Date: Wed, 5 Feb 2025 22:25:02 -0600 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT 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 Guix and Guix-provided software also have man pages. If the user doesn’t install man-db via Guix, they should still be able to read Guix-provided man pages. * etc/guix-install.sh (sys_create_init_profile): Add to MANPATH. Change-Id: Ibceb354012d23d24deeb39b1ec02790873396a6b --- etc/guix-install.sh | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 9a1d898b4b..ef338e89f7 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -652,10 +652,12 @@ export XDG_CACHE_HOME="${XDG_CACHE_HOME:-$HOME/.cache}" # `guix pull` profile GUIX_PROFILE="$HOME/.config/guix/current" export PATH="$GUIX_PROFILE/bin${PATH:+:}$PATH" -# Add to INFOPATH so the latest Guix documentation is available to info -# readers. When INFOPATH is unset, add a trailing colon so that Emacs searches -# 'Info-default-directory-list'. +# Add to INFOPATH and MANPATH so the latest Guix documentation is available to +# info and man readers. When INFOPATH is unset, add a trailing colon so Emacs +# searches 'Info-default-directory-list'. When MANPATH is unset, add a +# trailing colon so the system default search path is used. export INFOPATH="$GUIX_PROFILE/share/info:$INFOPATH" +export MANPATH="$GUIX_PROFILE/share/man:$MANPATH" # Expose the latest Guix modules to Guile so guix shell and repls spawned by # e.g. Geiser work out of the box. export GUILE_LOAD_PATH="$GUIX_PROFILE/share/guile/site/3.0${GUILE_LOAD_PATH:+:}$GUILE_LOAD_PATH" @@ -669,14 +671,18 @@ if [ -L "$GUIX_PROFILE" ]; then # see info '(guix) Application Setup' export GUIX_LOCPATH="$GUIX_PROFILE/lib/locale${GUIX_LOCPATH:+:}$GUIX_LOCPATH" - # INFOPATH may be handled by $GUIX_PROFILE/etc/profile if the user installs - # an info reader via Guix. If the user doesn’t, explicitly add to INFOPATH - # so documentation for software from ‘guix install’ is available to the - # system info reader. + # Documentation search paths may be handled by $GUIX_PROFILE/etc/profile if + # the user installs info and man readers via Guix. If the user doesn’t, + # explicitly add to them so documentation for software from ‘guix install’ + # is available to the system info and man readers. case $INFOPATH in *$GUIX_PROFILE/share/info*) ;; *) export INFOPATH="$GUIX_PROFILE/share/info:$INFOPATH" ;; esac + case $MANPATH in + *$GUIX_PROFILE/share/man*) ;; + *) export MANPATH="$GUIX_PROFILE/share/man:$MANPATH" + esac fi # NOTE: Guix Home handles its own profile initialization in ~/.profile. See