From unknown Wed Jun 18 23:06:21 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#54617 <54617@debbugs.gnu.org> To: bug#54617 <54617@debbugs.gnu.org> Subject: Status: [PATCH] home: services: zsh: Fix zshenv creation. Reply-To: bug#54617 <54617@debbugs.gnu.org> Date: Thu, 19 Jun 2025 06:06:21 +0000 retitle 54617 [PATCH] home: services: zsh: Fix zshenv creation. reassign 54617 guix-patches submitter 54617 Brian Kubisiak severity 54617 normal tag 54617 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 28 21:35:19 2022 Received: (at submit) by debbugs.gnu.org; 29 Mar 2022 01:35:19 +0000 Received: from localhost ([127.0.0.1]:59463 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZ0lS-0003Ng-PN for submit@debbugs.gnu.org; Mon, 28 Mar 2022 21:35:18 -0400 Received: from lists.gnu.org ([209.51.188.17]:37174) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZ0lR-0003NZ-Fe for submit@debbugs.gnu.org; Mon, 28 Mar 2022 21:35:17 -0400 Received: from eggs.gnu.org ([209.51.188.92]:41098) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nZ0lR-0001kQ-59 for guix-patches@gnu.org; Mon, 28 Mar 2022 21:35:17 -0400 Received: from mn-69-69-108-139.sta.embarqhsd.net ([69.69.108.139]:1516 helo=mail.kubisiak.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nZ0lN-0007ES-Jh for guix-patches@gnu.org; Mon, 28 Mar 2022 21:35:16 -0400 Received: from peregrine (108-237-41-25.lightspeed.sntcca.sbcglobal.net [108.237.41.25]) by mail.kubisiak.com with ESMTPSA (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256) ; Mon, 28 Mar 2022 20:35:05 -0500 Date: Mon, 28 Mar 2022 18:35:01 -0700 From: Brian Kubisiak To: guix-patches@gnu.org Subject: [PATCH] home: services: zsh: Fix zshenv creation. Message-ID: <20220329013501.bpfihhyghky4jq2u@peregrine> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Received-SPF: pass client-ip=69.69.108.139; envelope-from=brian@kubisiak.com; helo=mail.kubisiak.com X-Spam_score_int: -8 X-Spam_score: -0.9 X-Spam_bar: / X-Spam_report: (-0.9 / 5.0 requ) BAYES_00=-1.9, PDS_RDNS_DYNAMIC_FP=0.001, RDNS_DYNAMIC=0.982, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) Fixes a regression introduced by 4935501fd9f690d8990bb798237d51702b87fb3f that would skip generating the user's ~/.config/zsh/.zshenv unless both of zshenv and environment-variables are set in the configuration. * gnu/home/services/shells.scm (zsh-get-configuration-files): Generate ~/.config/zsh/.zshenv when only one of zshenv or environment-variables is specified. --- gnu/home/services/shells.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/home/services/shells.scm b/gnu/home/services/shells.scm index 7b9769bcf3..b0147291fc 100644 --- a/gnu/home/services/shells.scm +++ b/gnu/home/services/shells.scm @@ -212,8 +212,8 @@ (define (zsh-file-by-field config field) (define (zsh-get-configuration-files config) `(("zprofile" ,(zsh-file-by-field config 'zprofile)) ;; Always non-empty - ,@(if (and (zsh-field-not-empty? config 'zshenv) - (zsh-field-not-empty? config 'environment-variables)) + ,@(if (or (zsh-field-not-empty? config 'zshenv) + (zsh-field-not-empty? config 'environment-variables)) `(("zshenv" ,(zsh-file-by-field config 'zshenv))) '()) ,@(if (zsh-field-not-empty? config 'zshrc) `(("zshrc" ,(zsh-file-by-field config 'zshrc))) '()) -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 03 06:37:34 2022 Received: (at 54617-done) by debbugs.gnu.org; 3 Apr 2022 10:37:34 +0000 Received: from localhost ([127.0.0.1]:47655 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1naxbx-0004F7-U6 for submit@debbugs.gnu.org; Sun, 03 Apr 2022 06:37:34 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51904) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1naxbw-0004Ev-OY for 54617-done@debbugs.gnu.org; Sun, 03 Apr 2022 06:37:33 -0400 Received: from [2001:470:142:3::e] (port=34272 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naxbr-0006bt-F6; Sun, 03 Apr 2022 06:37:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=0RlukvQ1ydod1aGIG86v7yTzdI9mwd8NfS5PFBJm14A=; b=IPqcDjBd2OdGpLSYs9IB 6ZBavxtcX4EWmPXs69VlX7EX42x9WU3IeKrh069RGZSdq2PidBs7ykRAJMmQDLtFgGOlcccNvyrk7 HHUNEXXRoQddmBzMxRDgDv6iE34bcV3qDFCUsG+hcjjEc4eedV0ptXuSREgqDjddEWvo7awQ/Jawj c+awHfYjSnmyNyezRBQBP0haQfb+iYvQIoELS8A58ZcHfnwHzfmTuTKK/Oo5lRusiC5nijm3L4TIr U5Sfi39meh2AHteCrbsgMJsZ3ezFXs4FqwQenvkXGOajGKXCoRzXiKiR1vAGpRMhV6eZawu1Tz7Qi 67AuNAiOM2EdsQ==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:51768 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naxbr-0002qO-2R; Sun, 03 Apr 2022 06:37:27 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Brian Kubisiak Subject: Re: bug#54617: [PATCH] home: services: zsh: Fix zshenv creation. References: <20220329013501.bpfihhyghky4jq2u@peregrine> Date: Sun, 03 Apr 2022 12:37:25 +0200 In-Reply-To: <20220329013501.bpfihhyghky4jq2u@peregrine> (Brian Kubisiak's message of "Mon, 28 Mar 2022 18:35:01 -0700") Message-ID: <875ynqwize.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 54617-done Cc: 54617-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Brian Kubisiak skribis: > Fixes a regression introduced by > 4935501fd9f690d8990bb798237d51702b87fb3f that would skip generating > the user's ~/.config/zsh/.zshenv unless both of zshenv and > environment-variables are set in the configuration. > > * gnu/home/services/shells.scm (zsh-get-configuration-files): > Generate ~/.config/zsh/.zshenv when only one of zshenv or > environment-variables is specified. Good catch! Applied, thanks. Ludo=E2=80=99. From unknown Wed Jun 18 23:06:21 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 01 May 2022 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator