Received: (at 71217) by debbugs.gnu.org; 30 Nov 2024 22:09:27 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Nov 30 17:09:27 2024 Received: from localhost ([127.0.0.1]:49399 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tHVeZ-0004ME-B3 for submit <at> debbugs.gnu.org; Sat, 30 Nov 2024 17:09:27 -0500 Received: from confino.investici.org ([93.190.126.19]:31307) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <goodoldpaul@HIDDEN>) id 1tHVeX-0004M1-K0 for 71217 <at> debbugs.gnu.org; Sat, 30 Nov 2024 17:09:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1733004564; bh=EBHjQ47p6kaerYQr/Kyd995KkB538379iAAebNsr7io=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=NHdlnZCgZKRVsD7dsYXbaxSNNUYv0lgk6ZsvddTnSLToLY2FkpSk+aOF28IhaMoM+ zTSPUhhXOIGd4ppfyJy7IEhVQmL+OChd25fdzWgl+CyyNksu8ZIOKqaqyFJ76N8urc WkQTlmS92B/my1BeD9WDJANoJpZ4OeGagMjTW2dg= Received: from mx1.investici.org (unknown [127.0.0.1]) by confino.investici.org (Postfix) with ESMTP id 4Y142r3rSKz11S4; Sat, 30 Nov 2024 22:09:24 +0000 (UTC) Received: from [93.190.126.19] (mx1.investici.org [93.190.126.19]) (Authenticated sender: goodoldpaul@HIDDEN) by localhost (Postfix) with ESMTPSA id 4Y142r2kfnz11PC; Sat, 30 Nov 2024 22:09:24 +0000 (UTC) Message-ID: <f743e3c3-9a3d-4ed8-aa0e-a3adb74a1ab3@HIDDEN> Date: Sat, 30 Nov 2024 23:09:23 +0100 MIME-Version: 1.0 User-Agent: Icedove Daily Subject: Re: bug#71217: gnu: home: dotfiles: Files not excluded when they should To: =?UTF-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN>, Nicolas Odermatt-Lemay <nodermattlemay@HIDDEN> References: <CAC-BrWpcu=+Lb_=0VUSWP4w92ohTH30zY1YA6K=-GiegfpVB7A@HIDDEN> <87zflttu0f.fsf@HIDDEN> Content-Language: en-US From: paul <goodoldpaul@HIDDEN> In-Reply-To: <87zflttu0f.fsf@HIDDEN> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71217 Cc: 71217 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.7 (-) Hi Ludo’ and Nicolas, I think this service has some rough edges besides this bug, I made a proposal to smooth them out with a new configuration record which deprecates home-dotfiles-configuration, better separates the state needed only for stow layouts and fixes this bug at [0]. Please let me know your thoughts about it, thank you! cheers giacomo [0]: https://issues.guix.gnu.org/74629
guix-patches@HIDDEN
:bug#71217
; Package guix-patches
.
Full text available.Received: (at 71217) by debbugs.gnu.org; 20 Nov 2024 22:36:11 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed Nov 20 17:36:11 2024 Received: from localhost ([127.0.0.1]:48141 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tDtIx-0004Ev-8h for submit <at> debbugs.gnu.org; Wed, 20 Nov 2024 17:36:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58100) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ludo@HIDDEN>) id 1tDtIv-0004Ec-7A for 71217 <at> debbugs.gnu.org; Wed, 20 Nov 2024 17:36:09 -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 <ludo@HIDDEN>) id 1tDtGk-0007o1-FG; Wed, 20 Nov 2024 17:33:54 -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=rm5nPtH/gjtLMWEHkZdxeHQemPqzGZi+Fi5U2KEXidc=; b=N6cg8MCgLoBaOLW2QtGB V+dlAQz1E5sCCbgMsF3I2C/YPzyI5YWM6WacFfgx/ttzsaThPiF/yI+bUTtzjrAvsNCbQbHPCLtWj HVQbuKvMmHVlvDLw57ySHMLmM5Ffm+FDv03GhP9oq2PEUm2MXMFMKJ6yXsoU1IvTeUkQnJ6xMtIfD 3tdWAM3pU0WXZHUxIV54MbEh+/6mMBwxUqWo6ZShF42Dt8COeEmN7OUknjyNAhELXkLVhlJldb48z 0EmFTvTkY7XML+y4Jg6OH4mCVCujAFepBoyDIg8g0k5FSKRJXzubO3trE3FKo6zcrsB4kkSFSQhbK s7o5CDbGqHvYaw==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN> To: Nicolas Odermatt-Lemay <nodermattlemay@HIDDEN> Subject: Re: bug#71217: gnu: home: dotfiles: Files not excluded when they should In-Reply-To: <CAC-BrWpcu=+Lb_=0VUSWP4w92ohTH30zY1YA6K=-GiegfpVB7A@HIDDEN> (Nicolas Odermatt-Lemay's message of "Sun, 26 May 2024 22:13:26 -0400") References: <CAC-BrWpcu=+Lb_=0VUSWP4w92ohTH30zY1YA6K=-GiegfpVB7A@HIDDEN> Date: Wed, 20 Nov 2024 23:33:52 +0100 Message-ID: <87zflttu0f.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) 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: 71217 Cc: 71217 <at> debbugs.gnu.org, Giacomo Leidi <goodoldpaul@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) Hi, (Cc: Giacomo, who authored this service.) Nicolas Odermatt-Lemay <nodermattlemay@HIDDEN> skribis: > While attempting to setup home-dotfiles-service, I noticed that some files > were being symlinked even though they were in the variable > `%home-dotfiles-excluded', such as all the files of the .git directory. Oh. > This patch seems to fix the problem : > > diff --git a/gnu/home/services/dotfiles.scm b/gnu/home/services/dotfiles.= scm > index 823bdb03fb..38f7ff83d0 100644 > --- a/gnu/home/services/dotfiles.scm > +++ b/gnu/home/services/dotfiles.scm > @@ -45,7 +45,7 @@ (define-module (gnu home services dotfiles) > (define %home-dotfiles-excluded > '(".*~" > ".*\\.swp" > - "\\.git" > + "\\.git/.*" > "\\.gitignore")) > > (define %home-dotfiles-layouts > @@ -138,8 +138,7 @@ (define* (directory-contents directory #:key (packages > #f)) > (define (filter-files directory) > (find-files directory > (lambda (file stat) > - (not (regexp-exec exclusion-rx > - (basename file)))))) > + (not (regexp-exec exclusion-rx file))))) That would change the semantics of =E2=80=98exclusion-rx=E2=80=99 though. Maybe instead we should change from =E2=80=98file-files=E2=80=99 to =E2=80= =98file-system-fold=E2=80=99 and not enter directories that match one of the exclusion patterns? Ludo=E2=80=99.
guix-patches@HIDDEN
:bug#71217
; Package guix-patches
.
Full text available.Ludovic Courtès <ludo@HIDDEN>
to control <at> debbugs.gnu.org
.
Full text available.Nicolas Odermatt-Lemay <nodermattlemay@HIDDEN>
to control <at> debbugs.gnu.org
.
Full text available.Received: (at submit) by debbugs.gnu.org; 27 May 2024 02:13:55 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sun May 26 22:13:55 2024 Received: from localhost ([127.0.0.1]:42807 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1sBPs2-0007vm-Km for submit <at> debbugs.gnu.org; Sun, 26 May 2024 22:13:54 -0400 Received: from lists.gnu.org ([209.51.188.17]:56316) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <nodermattlemay@HIDDEN>) id 1sBPs0-0007ve-Qd for submit <at> debbugs.gnu.org; Sun, 26 May 2024 22:13:53 -0400 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 <nodermattlemay@HIDDEN>) id 1sBPrq-0005L6-Eu for bug-guix@HIDDEN; Sun, 26 May 2024 22:13:44 -0400 Received: from mail-pj1-x1030.google.com ([2607:f8b0:4864:20::1030]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <nodermattlemay@HIDDEN>) id 1sBPrn-0001XC-BE for bug-guix@HIDDEN; Sun, 26 May 2024 22:13:41 -0400 Received: by mail-pj1-x1030.google.com with SMTP id 98e67ed59e1d1-2bfc7471028so331047a91.1 for <bug-guix@HIDDEN>; Sun, 26 May 2024 19:13:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716776017; x=1717380817; darn=gnu.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=+hsyiKu0ufmqXrEyW9RrmoZUzzCTQSAWjC9ul35bfBo=; b=KJ7dxPQglNLBevl+5u6sxN/LPeHYthNJxwoKtnTsxtxb2OPFLls3P4ukEQqUQnc2/1 TUVWSHhVNI2Bi6jeYCSdvaM3UzLRZBK/HTyr/AvuqCQErinC99puKLyWYqrqe04C4Hbh 2CpJ/1CDhTyUzffJQo2sQxSmv3IrHTHWb/tlyO/Zsf6LHMAZb5m7yskNL8LLuORLt+Sr QYTCZiw8ASIXr/mDDIUXVOWAH0qcZh89zMiAg0hVi4L9gq1ADaKhA1+X4ulRtoSzasOF 9blNZbLN+0AYYyV1mBnoGeq0/L++Y1pTcs4yCHyYtNtM2ThkFu3zG0tbb/4CVzMLZrXK F2vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716776017; x=1717380817; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=+hsyiKu0ufmqXrEyW9RrmoZUzzCTQSAWjC9ul35bfBo=; b=oPFMjBQSv8wlOwTNfEk+aZU03RT4tfvWV53axMkLcVvknY5T54aNRHDFsC/Ga51lSU bKPu/NyanaAhjoTyRsgWoUFbQd9j9BzMNWE8GfAyGhmRrAOeBrFVrxvmd22yBMQmM245 yyIM83ErJLPDlGHrFHZplM5wAuihFdrTJC405kKZDAJs+7EBT5i6WsREsdr0oJCV9PvN 4UPuFdu8UHxmwEEP6cv2pUiz+gB+55C/wg9NaDf1eu9CHwL6Y+bqTOof75Il4YscDSpI L6Lhbl3GuxZgqtoMDsIhjHu231VFQlTfPP8RLl0XJDpofA4EWk0cJ1LpJhzmqP2naqQB yG7w== X-Gm-Message-State: AOJu0YxQyRWhKC94KCpMGQXnUvo9GtRdwRDl42U8fUIn/WQCkfQC2fkj gjz7FMBCToAu4hD1CbZbsKanTynDY/d/tw5xDjmIw1HXMIIjtcsr1O/+2eXJaAifiN1Lvjam6Mf jNU5Yvqd2lZF2IiYKoSAs0/KLHfwigPrx X-Google-Smtp-Source: AGHT+IHk7NKLE2Q8rpSTmkJ8aJnwONr3PpP3kcDhSuZqDakYGCMzSVSkEo9qZCDsiJjnkJ3M73L4x8jkBiVpCUsKRdU= X-Received: by 2002:a17:90b:30c1:b0:2b1:b1a1:1310 with SMTP id 98e67ed59e1d1-2bf5f20265cmr7131603a91.29.1716776017046; Sun, 26 May 2024 19:13:37 -0700 (PDT) MIME-Version: 1.0 From: Nicolas Odermatt-Lemay <nodermattlemay@HIDDEN> Date: Sun, 26 May 2024 22:13:26 -0400 Message-ID: <CAC-BrWpcu=+Lb_=0VUSWP4w92ohTH30zY1YA6K=-GiegfpVB7A@HIDDEN> Subject: gnu: home: dotfiles: Files not excluded when they should To: bug-guix@HIDDEN Content-Type: multipart/alternative; boundary="000000000000a7baee0619661084" Received-SPF: pass client-ip=2607:f8b0:4864:20::1030; envelope-from=nodermattlemay@HIDDEN; helo=mail-pj1-x1030.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -2.3 (--) --000000000000a7baee0619661084 Content-Type: text/plain; charset="UTF-8" Hello, While attempting to setup home-dotfiles-service, I noticed that some files were being symlinked even though they were in the variable `%home-dotfiles-excluded', such as all the files of the .git directory. This patch seems to fix the problem : diff --git a/gnu/home/services/dotfiles.scm b/gnu/home/services/dotfiles.scm index 823bdb03fb..38f7ff83d0 100644 --- a/gnu/home/services/dotfiles.scm +++ b/gnu/home/services/dotfiles.scm @@ -45,7 +45,7 @@ (define-module (gnu home services dotfiles) (define %home-dotfiles-excluded '(".*~" ".*\\.swp" - "\\.git" + "\\.git/.*" "\\.gitignore")) (define %home-dotfiles-layouts @@ -138,8 +138,7 @@ (define* (directory-contents directory #:key (packages #f)) (define (filter-files directory) (find-files directory (lambda (file stat) - (not (regexp-exec exclusion-rx - (basename file)))))) + (not (regexp-exec exclusion-rx file))))) (if (and stow? packages (maybe-value-set? packages)) (append-map filter-files (map (lambda (pkg) --000000000000a7baee0619661084 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable <div dir=3D"ltr"><div>Hello, <br></div><div><br></div><div>While attempting= to setup home-dotfiles-service, I noticed that some files were being symli= nked even though they were in the variable `%home-dotfiles-excluded', s= uch as all the files of the .git directory. <br></div><div><br></div><div>T= his patch seems to fix the problem :</div><div><br></div><div>diff --git a/= gnu/home/services/dotfiles.scm b/gnu/home/services/dotfiles.scm<br>index 82= 3bdb03fb..38f7ff83d0 100644<br>--- a/gnu/home/services/dotfiles.scm<br>+++ = b/gnu/home/services/dotfiles.scm<br>@@ -45,7 +45,7 @@ (define-module (gnu h= ome services dotfiles)<br>=C2=A0(define %home-dotfiles-excluded<br>=C2=A0 = =C2=A0'(".*~"<br>=C2=A0 =C2=A0 =C2=A0".*\\.swp"<br>= - =C2=A0 =C2=A0"\\.git"<br>+ =C2=A0 =C2=A0"\\.git/.*"<b= r>=C2=A0 =C2=A0 =C2=A0"\\.gitignore"))<br>=C2=A0<br>=C2=A0(define= %home-dotfiles-layouts<br>@@ -138,8 +138,7 @@ (define* (directory-contents= directory #:key (packages #f))<br>=C2=A0 =C2=A0 =C2=A0(define (filter-file= s directory)<br>=C2=A0 =C2=A0 =C2=A0 =C2=A0(find-files directory<br>=C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(lambda (file= stat)<br>- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0(not (regexp-exec exclusion-rx<br>- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0(basename file))))))<br>+ =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(not (regexp-exec exclusion= -rx file)))))<br>=C2=A0 =C2=A0 =C2=A0(if (and stow? packages (maybe-value-s= et? packages))<br>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(append-map filter-file= s<br>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0(map (lambda (pkg)<br></div></div> --000000000000a7baee0619661084--
Nicolas Odermatt-Lemay <nodermattlemay@HIDDEN>
:bug-guix@HIDDEN
.
Full text available.bug-guix@HIDDEN
:bug#71217
; Package guix
.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.