From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 12 16:05:17 2022 Received: (at submit) by debbugs.gnu.org; 12 Mar 2022 21:05:17 +0000 Received: from localhost ([127.0.0.1]:40930 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nT8vM-0002np-QV for submit@debbugs.gnu.org; Sat, 12 Mar 2022 16:05:17 -0500 Received: from lists.gnu.org ([209.51.188.17]:48786) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nT8vK-0002nh-QH for submit@debbugs.gnu.org; Sat, 12 Mar 2022 16:05:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34918) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nT8vK-0004p9-0I for guix-patches@gnu.org; Sat, 12 Mar 2022 16:05:14 -0500 Received: from [37.120.193.123] (port=53960 helo=mail.cock.li) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nT8vG-0001Zy-M9 for guix-patches@gnu.org; Sat, 12 Mar 2022 16:05:13 -0500 User-agent: mu4e 1.6.10; emacs 28.0.50 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cock.li; s=mail; t=1647119105; bh=2p6wBUXrFgQllnS1ctK0croJSoaV9qJM0Nrg5rCy7ck=; h=From:To:Subject:Date:From; b=U2dj0fuc4/QqZXTWbGU/3d4RzNyDBe6yXoGgh3SzTVnXJDfMA/JMpjBOKm1mzxjkg mJhVvN7Qv6NBKsXooTtVKAmdgx2ixkZEUstY8titMZhLNvUPqXcDz1NhYuyEYbBTHG gINzVEdSyY2HOXCQj60VZ88L9d6HDt833eZZIMxUtuF5HORinQalsup1xKNhkIq52f CEif2y/0o/oSvp/JgnbbFN+ieWUYrwOsT5lNJo0LQrEJAumyGXuaZmQ/oJ3tcSz4LP drgZG/8kE1ohKhM7wp/J0Z+r/keWD86ScVd3hMnD2BGpJjGAZLfNqywjWqfMNo6BFr Us6TmqLXbIlgQ== From: angry rectangle To: guix-patches@gnu.org Subject: [PATCH] home: services: Fix bash aliases without guix-defaults. Date: Sat, 12 Mar 2022 15:53:31 -0500 Message-ID: <878rteg9vo.fsf@cock.li> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Host-Lookup-Failed: Reverse DNS lookup failed for 37.120.193.123 (failed) Received-SPF: pass client-ip=37.120.193.123; envelope-from=angryrectangle@cock.li; helo=mail.cock.li X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RDNS_NONE=0.793, 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 (--) --=-=-= Content-Type: text/plain Because of a typo, aliases aren't included if guix-defaults? is #f. This patch also fixes an inaccuracy in the documentation about placement of defaults. They're actually put at the top, after aliases. Which is good considering it has the "exit if non-interactive" statement. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-home-services-Fix-bash-aliases-without-guix-defaults.patch Content-Description: the patch >From 0a278853a0b9b33082a8d3164424e8b7d1abb7dd Mon Sep 17 00:00:00 2001 From: angryrectangle Date: Sat, 12 Mar 2022 15:28:15 -0500 Subject: [PATCH] home: services: Fix bash aliases without guix-defaults. * gnu/home/services/shells.scm: Fix bash aliases not being added if guix-defaults? was #f. Also fix inaccuracy in documentation about placement of defaults. --- 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 ca7f4ac0ad..9a79db484a 100644 --- a/gnu/home/services/shells.scm +++ b/gnu/home/services/shells.scm @@ -324,7 +324,7 @@ (define-configuration home-bash-configuration (guix-defaults? (boolean #t) "Add sane defaults like reading @file{/etc/bashrc} and coloring the output of -@command{ls} to the end of the @file{.bashrc} file.") +@command{ls} to the top of the @file{.bashrc} file.") (environment-variables (alist '()) "Association list of environment variables to set for the Bash session. The @@ -448,7 +448,7 @@ (define (add-bash-configuration config) 'bashrc (if (home-bash-configuration-guix-defaults? config) (list (serialize-field 'aliases) guix-bashrc) - (list (serialize-field 'alises)))) + (list (serialize-field 'aliases)))) (file-if-not-empty 'bash-logout))))) (define (add-bash-packages config) -- 2.34.0 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 12 17:09:04 2022 Received: (at 54356) by debbugs.gnu.org; 12 Mar 2022 22:09:04 +0000 Received: from localhost ([127.0.0.1]:41018 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nT9v6-0006dT-CU for submit@debbugs.gnu.org; Sat, 12 Mar 2022 17:09:04 -0500 Received: from [37.120.193.123] (port=39668 helo=mail.cock.li) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nT9v4-0006co-IY for 54356@debbugs.gnu.org; Sat, 12 Mar 2022 17:09:03 -0500 User-agent: mu4e 1.6.10; emacs 28.0.50 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cock.li; s=mail; t=1647122932; bh=0zZ09bHklvQolrNynLdb/F0y7vK+fwRfgxWnu6/llTk=; h=From:To:Subject:Date:From; b=UF8JTq59Tfo0xIzZAcPpasSEg0U3bKs9kr0PRYPstkz6TGIJsGupes82geNfc86eu bpHB8jvcNu3JFQz9K96shsJ35dgZHLhSbDRqJ9Z78xYg7Q0ErfoERb/uXJEP5Iq1Ew OMFpZVG8RZ+z7hk7KKKBnYo8BIh1HpNdIrgRVhyq9lQIKVSRPP+SibjIoyPdAHfbAq 0gicHZ6issHcdIxfraSX8d3EgViTJC/wPSmgJhmY50ZGgLFm0HKrJ3jsak/P93lEt6 2bWMSkmtl+Lpyw0jFu6F+zmTtliBYKAxjWGqNTikfXa+uS6SVQ6dsCCUAqJqXGWeVl DgH1aJd6L7fLA== From: angry rectangle To: 54356@debbugs.gnu.org Subject: [PATCH] home: services: Fix bash aliases without guix-defaults. Date: Sat, 12 Mar 2022 17:05:35 -0500 Message-ID: <87zgluesct.fsf@cock.li> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Oops, the patch was wrapped. I'll try again. If this doesn't work, the original patch can be fixed by removing the ">" and moving the "of" that's on its own line to the previous one. From 0a278853a0b9b33082a8d3164424e8b7d1abb7dd Mon Sep 17 00:00:00 2001 From: angryrectangle Date: Sat, 12 Mar 2022 15:28:15 -0500 Subject: [PATCH] home: services: Fix bash ali [...] Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 1.3 RDNS_NONE Delivered to internal network by a host with no rDNS -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 54356 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: 0.3 (/) --=-=-= Content-Type: text/plain Oops, the patch was wrapped. I'll try again. If this doesn't work, the original patch can be fixed by removing the ">" and moving the "of" that's on its own line to the previous one. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-home-services-Fix-bash-aliases-without-guix-defaults.patch Content-Description: the patch, again >From 0a278853a0b9b33082a8d3164424e8b7d1abb7dd Mon Sep 17 00:00:00 2001 From: angryrectangle Date: Sat, 12 Mar 2022 15:28:15 -0500 Subject: [PATCH] home: services: Fix bash aliases without guix-defaults. * gnu/home/services/shells.scm: Fix bash aliases not being added if guix-defaults? was #f. Also fix inaccuracy in documentation about placement of defaults. --- 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 ca7f4ac0ad..9a79db484a 100644 --- a/gnu/home/services/shells.scm +++ b/gnu/home/services/shells.scm @@ -324,7 +324,7 @@ (define-configuration home-bash-configuration (guix-defaults? (boolean #t) "Add sane defaults like reading @file{/etc/bashrc} and coloring the output of -@command{ls} to the end of the @file{.bashrc} file.") +@command{ls} to the top of the @file{.bashrc} file.") (environment-variables (alist '()) "Association list of environment variables to set for the Bash session. The @@ -448,7 +448,7 @@ (define (add-bash-configuration config) 'bashrc (if (home-bash-configuration-guix-defaults? config) (list (serialize-field 'aliases) guix-bashrc) - (list (serialize-field 'alises)))) + (list (serialize-field 'aliases)))) (file-if-not-empty 'bash-logout))))) (define (add-bash-packages config) -- 2.34.0 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 18 10:02:27 2022 Received: (at 54356-done) by debbugs.gnu.org; 18 Mar 2022 14:02:27 +0000 Received: from localhost ([127.0.0.1]:58026 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nVDBT-0003z6-D7 for submit@debbugs.gnu.org; Fri, 18 Mar 2022 10:02:27 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48716) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nVDBR-0003ys-A0 for 54356-done@debbugs.gnu.org; Fri, 18 Mar 2022 10:02:26 -0400 Received: from [2001:470:142:3::e] (port=48974 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 1nVDBK-0000Z8-I4; Fri, 18 Mar 2022 10:02:18 -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=qyy6ghb822V8E4shqlGfJBui2F3Sj8TbgSFegY/bZVw=; b=R6TPkzkY823wVtOZ9CVo +F7RUjn65hLhT9iLjpdsBnDlsVIxxj4GtQNMxrSF3XpquHbCaak6/pL74peP90l33AouvtOtDmuy3 kqZDNW9jBJZlmrtNYSzjAZ26xzUV4Bvcn99wKymSX3MyHj/6cqocky7c/+MTM3sVAhs4sG1zsLaZa N6I43BUz5FO9PtSWMVKVY7wZWK8JiPVKJd7C3Z+RBvY7Hynp/a0DXGDgJUhrQ3HNCGtpPLNGQyWRM +Of7IzoTh3TFjasGfi+BHRGkj1MBfIPhga7HKqJIFlFlUVYzBL5HPanxrRLoS2TtooKpjpyZqu+3o wkSGWPDvnLjAhQ==; Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=51146 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nVDBJ-0006FZ-UN; Fri, 18 Mar 2022 10:02:18 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: angry rectangle Subject: Re: bug#54356: [PATCH] home: services: Fix bash aliases without guix-defaults. References: <878rteg9vo.fsf@cock.li> <87zgluesct.fsf@cock.li> Date: Fri, 18 Mar 2022 15:02:15 +0100 In-Reply-To: <87zgluesct.fsf@cock.li> (angry rectangle's message of "Sat, 12 Mar 2022 17:05:35 -0500") Message-ID: <874k3vqryw.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: 54356-done Cc: 54356-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, angry rectangle skribis: >>>From 0a278853a0b9b33082a8d3164424e8b7d1abb7dd Mon Sep 17 00:00:00 2001 > From: angryrectangle > Date: Sat, 12 Mar 2022 15:28:15 -0500 > Subject: [PATCH] home: services: Fix bash aliases without guix-defaults. > > * gnu/home/services/shells.scm: Fix bash aliases not being added if > guix-defaults? was #f. Also fix inaccuracy in documentation about place= ment > of defaults. Good catch! I applied it and fixed the same string in doc/guix.texi. Thanks, Ludo=E2=80=99. From unknown Fri Jun 20 20:11:59 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 16 Apr 2022 11:24:09 +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