From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id MIG8CizXQmJJSQAAgWs5BA (envelope-from ) for ; Tue, 29 Mar 2022 11:53:48 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id sK3pAyzXQmKCOAEAG6o9tA (envelope-from ) for ; Tue, 29 Mar 2022 11:53:48 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 52EF33C9A for ; Tue, 29 Mar 2022 11:53:47 +0200 (CEST) Received: from localhost ([::1]:46874 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nZ8Xq-00039o-HB for larch@yhetil.org; Tue, 29 Mar 2022 05:53:46 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35664) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nZ8X8-00038s-0n for bug-guix@gnu.org; Tue, 29 Mar 2022 05:53:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37756) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nZ8X7-0002Pw-Nx for bug-guix@gnu.org; Tue, 29 Mar 2022 05:53:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nZ8X7-0003ti-Ih for bug-guix@gnu.org; Tue, 29 Mar 2022 05:53:01 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#52808: Guix home should not assume that all targets are dot files Resent-From: Andrew Tropin Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Tue, 29 Mar 2022 09:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52808 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: Ludovic =?UTF-8?Q?Court=C3=A8s?= , Nick Zalutskiy , 52808@debbugs.gnu.org Received: via spool by 52808-submit@debbugs.gnu.org id=B52808.164854753114904 (code B ref 52808); Tue, 29 Mar 2022 09:53:01 +0000 Received: (at 52808) by debbugs.gnu.org; 29 Mar 2022 09:52:11 +0000 Received: from localhost ([127.0.0.1]:59883 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZ8WJ-0003sJ-C5 for submit@debbugs.gnu.org; Tue, 29 Mar 2022 05:52:11 -0400 Received: from relay6-d.mail.gandi.net ([217.70.183.198]:33497) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZ8WH-0003s4-PA for 52808@debbugs.gnu.org; Tue, 29 Mar 2022 05:52:10 -0400 Received: (Authenticated sender: andrew@trop.in) by mail.gandi.net (Postfix) with ESMTPSA id E1BE2C0005; Tue, 29 Mar 2022 09:52:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop.in; s=gm1; t=1648547523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=jYT7pJu3PZ705oFT+Gc+hXGgVcXRIysf0vWJcAVuPqc=; b=EP8q6ImWi+muSmaQpqMRDm+mIjuEjawIr0XBYWaTiG3reh9ebUVZ9+PwXZo56BmDxIoRbE KDMe08HMu0nTqgKtsp1AN/OeypMe+fQTBP3I3LwOQTFvxMd9u42tFok6UN46MiLGA0WoNS YLPkWgNEjps8Jr7Z3u6S4tK6PRcsazSwHn+DfJqjqifk1I8BBA9zDPaFxXFkeUfDGhvqPN 5ANhdbB1ESn+72JcsTW0RTcLM6PLGo7fElYmHcM+4fRVhsSXIDfWWaOwl68GO9q+/ald1L uJd0oB+MswXieC5az5+oOxr4ZGbalOILSVP6smFYO7yvY4WL/kjYSoPaoX3mGg== From: Andrew Tropin In-Reply-To: <87h77sl4pn.fsf_-_@gnu.org> References: <87mthklcpt.fsf@gnu.org> <6050c325-9ae9-406a-97fe-91bdf9bcd12a@www.fastmail.com> <87h77sl4pn.fsf_-_@gnu.org> Date: Tue, 29 Mar 2022 12:51:59 +0300 Message-ID: <87fsn1f5mo.fsf@trop.in> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1648547627; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=jYT7pJu3PZ705oFT+Gc+hXGgVcXRIysf0vWJcAVuPqc=; b=pcKdBHhbhDurOlJgK0F51evQg7C5V6H/jqZCiAGgtNunPLQ/drTsr+1RbHvKhgpQzO2X5J IwnkoWPo7NmhM+ymV7CQJ/STqGwq0rbb90hCCVj7riQ17jKOwIYXbQg3Ija66t+gwbXFtR ttgLRXfCIsc8xXZ+wlMroNdZtrEufwI7FHCC92012z+jULpItz6rM4OjTkGaq3llAhWjd8 A2bS4+24VhQxwes40WBflvDF/oRUU9jj4u/12LKxfYcoBTfcOkGBlB0mkDbzyOibDz0uLu v5PuKHPnIoDEiu0EMxqJtWwU140I+umsF97v9m/0JwfQUBPqzImxRjfaRpbQbg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1648547627; a=rsa-sha256; cv=none; b=u670MPPLgpcetEhsQYXwC3n21/0I4IMa4RUZr1D8AqC+KLHrFVCGX3Tfzmu7D3mr3WSYwC Ntu/qcCs1NCo5ScX+f6koeEA+4mDYYuPd0Siw1I+JWnrcG/wckq8O28+tpmM9IVM34FQg0 ScFYympg4776ZWIcx9JGSAJZ8fdGeZsLciJyRUdmziiR51QwasdB44U2HlTnGiLnwz7d6y 7sLJoFieMyuwOlICaijNZ31cXnGxpnCxQSieagThgyu8mmTEvLyZpIofPIsnIPXqN9MKRs 0/uno/5lcisVqkLBshxsWjMRVWKqMMzHQAC6RZVUxROmSThNnIAPNUyHMj00NA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=trop.in header.s=gm1 header.b=EP8q6ImW; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -1.27 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=trop.in header.s=gm1 header.b=EP8q6ImW; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 52EF33C9A X-Spam-Score: -1.27 X-Migadu-Scanner: scn1.migadu.com X-TUID: qSBs+5ivZESM --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 2022-03-20 22:00, Ludovic Court=C3=A8s wrote: > I wrote: > >> I finally got around to committing it as >> 6da2a5a5655668f42ec5b26f875ddbc498e132b6. Thank you! > > I hit =E2=80=9Cclose=E2=80=9D too quickly: we still need the patch that c= hanges > =E2=80=98home-files-service-type=E2=80=99 and/or symlink-manager.scm to n= ot prepend a > dot, so reopening! :-) > > Ludo=E2=80=99. A few more minor fixes: --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-home-shells-Rename-zsh-related-functions.patch Content-Transfer-Encoding: quoted-printable From=20629466d23308e135c4a46951e5ea568677c5ec00 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Tue, 29 Mar 2022 11:15:56 +0300 Subject: [PATCH 1/2] home: shells: Rename zsh related functions. * gnu/home/services/shells.scm (home-zsh-service-type): Make zsh related private functions more consistently named. =2D-- gnu/home/services/shells.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/home/services/shells.scm b/gnu/home/services/shells.scm index fb728893e3..086fe7d8c4 100644 =2D-- a/gnu/home/services/shells.scm +++ b/gnu/home/services/shells.scm @@ -222,7 +222,7 @@ (define (zsh-get-configuration-files config) ,@(if (zsh-field-not-empty? config 'zlogout) `(("zlogout" ,(zsh-file-by-field config 'zlogout))) '()))) =20 =2D(define (zsh-home-files config) +(define (add-zsh-dot-configuration config) (define zshenv-auxiliary-file (mixed-text-file "zshenv-auxiliary" @@ -233,7 +233,7 @@ (define zshenv-auxiliary-file `(("zshenv" ,zshenv-auxiliary-file)) (zsh-get-configuration-files config))) =20 =2D(define (zsh-xdg-configuration-files config) +(define (add-zsh-xdg-configuration config) (if (home-zsh-configuration-xdg-flavor? config) (map (lambda (lst) @@ -298,10 +298,10 @@ (define home-zsh-service-type (extensions (list (service-extension home-files-service-type =2D zsh-home-files) + add-zsh-dot-configuration) (service-extension home-xdg-configuration-files-service-type =2D zsh-xdg-configuration-files) + add-zsh-xdg-configuration) (service-extension home-profile-service-type add-zsh-packages))) =2D-=20 2.34.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0002-home-symlink-manager-Handle-non-existing-directory-d.patch Content-Transfer-Encoding: quoted-printable From=20a71346b059691a982a7dc0c7f4fd708b49566500 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Tue, 29 Mar 2022 11:56:48 +0300 Subject: [PATCH 2/2] home: symlink-manager: Handle non-existing directory during cleanup. * gnu/home/services/symlink-manager.scm (update-symlinks-script): Handle non-existing directory during cleanup. =2D-- gnu/home/services/symlink-manager.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/home/services/symlink-manager.scm b/gnu/home/services/syml= ink-manager.scm index 3b851229f3..80ca73fed8 100644 =2D-- a/gnu/home/services/symlink-manager.scm +++ b/gnu/home/services/symlink-manager.scm @@ -142,6 +142,7 @@ (define (strip file) #t (G_ "Skipping ~a (not an empty directory)... do= ne\n") directory)) + ((=3D ENOENT errno) #t) ((=3D ENOTDIR errno) #t) (else (apply throw args))))))))) =2D-=20 2.34.0 --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable =2D-=20 Best regards, Andrew Tropin --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJDBAEBCgAtFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmJC1r8PHGFuZHJld0B0 cm9wLmluAAoJECII0glYwd6wW+gP/irj2SRC6zaFIjLeJ5NTj6/1qglobQ6td/of SrKWdjtkhHOdFw8fGSh+sxsnbddSx55Z6VlF1INpbNu+dexVjj/k8+xTkn2FNT/J xVE37UHzxMrHwTr9+LV+FZauzhJzCh1uf50OX6S7TUYRXKz58hWKcGT2ziN6hG9T Nk2s22yEbd06hmqN0KiznPxWZuS9KL4yKZ1zi/NbUEYkbhauyOGzJ0UO59XLKXKg pKS9L0TZBvbTUIJoKzZ8LpdzV3wTgzeCWuV/7Du1GyVfZvZMiqrL5uc+uuw+92y5 rRt+vHnrLI7ZMdVeyUaJAlUXiCRZGGxJ2BSJm+yzvqmDjM+T2Ql6MMii4bTfwyLc bODoCApwYkdk6xao+G2u0f3L7qSxbn+smu+AY6eWJS7li5d2hfS2Re2rc+/+ZeED gsJnJfuZbSFCCfbr7AMxkx0IacpIZl/lt6FFkkgyO1uhwG4PBkSbvtPdgNH+xDE2 EnK7rAG+NM0kB7UdcnawFByAJfNSDpTUVBULnQx6BBd5sUIq2wEzPwDt1U39hxX1 NK2EyimijMZd5uWQyWlBUFYx4dl3HqDs7447UBn7yPLi8rfTad9a4kS7w0tEbGRy O2M8Aq9EAJ9tFkKVwO+dSJkz8T6LfbZrZetDPrNI5osRTo0882WCIiq6gDefurQJ NSgEW1cs =S+qk -----END PGP SIGNATURE----- --==-=-=--