From unknown Thu Jun 19 13:59:54 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#72813 <72813@debbugs.gnu.org> To: bug#72813 <72813@debbugs.gnu.org> Subject: Status: [PATCH] gnu: packages: Fix git system configuration. Reply-To: bug#72813 <72813@debbugs.gnu.org> Date: Thu, 19 Jun 2025 20:59:54 +0000 retitle 72813 [PATCH] gnu: packages: Fix git system configuration. reassign 72813 guix-patches submitter 72813 Lilah Tascheter severity 72813 normal tag 72813 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 25 23:37:56 2024 Received: (at submit) by debbugs.gnu.org; 26 Aug 2024 03:37:56 +0000 Received: from localhost ([127.0.0.1]:43515 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1siQYG-0004uS-3T for submit@debbugs.gnu.org; Sun, 25 Aug 2024 23:37:56 -0400 Received: from lists.gnu.org ([209.51.188.17]:51664) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1siQYE-0004uK-5u for submit@debbugs.gnu.org; Sun, 25 Aug 2024 23:37:54 -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 ) id 1siQXN-0005tu-EC for guix-patches@gnu.org; Sun, 25 Aug 2024 23:37:02 -0400 Received: from sendmail.purelymail.com ([34.202.193.197]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1siQXL-0005iJ-2g for guix-patches@gnu.org; Sun, 25 Aug 2024 23:37:00 -0400 Authentication-Results: purelymail.com; auth=pass DKIM-Signature: a=rsa-sha256; b=Se7Mv6VWtVZCLG+kdPRxPW+gOZH7uDLnSykpH4jMYbmPTf19xeQtqQop7BSHJUzeVw4zdDaecxjk5XmY96mruPN9nDfQrh1l5NtIosHJlQp8Pd0W6zCcX5KoQ/dB7SQIFFM2ilh6oUF8R299LWkiQap3DGaempmRzuSSZUu34GN+rDU/YUO4bFPBngpMe0m7dUcbMsZuND9l+3prpOa5gnOU21g1Gon/H8dToOQct6CD8ImLyOC+sBfyz9Nxv+/xE+ChuojpqtPfIF1xFtbX5tN6dapP/KagUKlk85PoL/7TievvFEY+RYTcY3Tzj0jD/TtbWp/tcmLf3V+s4rz30A==; s=purelymail2; d=lunabee.space; v=1; bh=pzykpYnQzDIK3dIZw/pYILKj3WDDqwzY1epA/TTQhr4=; h=Received:From:To:Subject:Date; DKIM-Signature: a=rsa-sha256; b=h9tSaeenLUUIlImlKWb8PwNN2lFs5c+5xog5322XAvTGA/aUkF1Ah2fhrMeFiU9kM4V7RuLGMGjwMg3xE0lFumBrOqsGk8mEpgKFxHNtSrvDUw9iqLvH8jvZ5cW0CkG75QXILMZM0YMtpzgFbcChTW4fRE9bQ1l67KjdUtFuavbZx9KXygD8wdOR5QxF9E3kny5X6xnkmWJ0rEsgwGUsDLVD8msRB7Mm0R+t6tavnLqaO0Xw9pZXx8U13WEnruDzIEEhWMrrVGeVes7KjMjpU+zBQWfh5lGuRTDKXtgPqSqvxLEfNuysiTc1/MTsJ8yj5zfXgLMQmy6nc0Q2qtKEsA==; s=purelymail2; d=purelymail.com; v=1; bh=pzykpYnQzDIK3dIZw/pYILKj3WDDqwzY1epA/TTQhr4=; h=Feedback-ID:Received:From:To:Subject:Date; Feedback-ID: 8937:2070:null:purelymail X-Pm-Original-To: guix-patches@gnu.org Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id 1959227742; (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Mon, 26 Aug 2024 03:36:51 +0000 (UTC) From: Lilah Tascheter To: guix-patches@gnu.org Subject: [PATCH] gnu: packages: Fix git system configuration. Date: Sun, 25 Aug 2024 22:36:13 -0500 Message-ID: <1ea5ce3850cc9e91526391e315061f8e0c523f8c.1724643373.git.lilah@lunabee.space> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-MIME-Autoconverted: from 8bit to quoted-printable by Purelymail Content-Type: text/plain; charset=UTF-8 Received-SPF: pass client-ip=34.202.193.197; envelope-from=lilah@lunabee.space; helo=sendmail.purelymail.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, SPF_HELO_PASS=-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 Cc: Lilah Tascheter 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.3 (--) Git's system config path is, by default, relative to the install prefix. Fix this to use the usual system path. System config is is pretty much the only way to change git config for system services. * gnu/packages/version-control.scm (git/fixed): New variable. (git)[replacement]: Graft with git/fixed. Change-Id: I44ae667baee6c9389a8f81da743d67d1a63070ed --- gnu/packages/version-control.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-contro= l.scm index 42bd4a5744..efb91da8af 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -251,6 +251,7 @@ (define-public git (sha256 (base32 "1nws1vjgj54sv32wxl1h3n1jkcpabqv7a605hhafsby0n5zfigsi")))) + (replacement git/fixed) (build-system gnu-build-system) (native-inputs `(("native-perl" ,perl) @@ -629,6 +630,14 @@ (define-public git (license license:gpl2) (home-page "https://git-scm.com/"))) =20 +(define git/fixed + (package + (inherit git) + (arguments + (substitute-keyword-arguments (package-arguments git) + ((#:configure-flags flags #~'()) + #~(cons "--with-gitconfig=3D/etc/gitconfig" #$flags)))))) + (define-public git-minimal ;; The size of the closure of 'git-minimal' is two thirds that of 'git'. ;; Its test suite runs slightly faster and most importantly it doesn't base-commit: 9e57f3bcd4b3c4c8936358d3160f0d4f996204ce --=20 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 12 13:07:52 2024 Received: (at 72813) by debbugs.gnu.org; 12 Oct 2024 17:07:52 +0000 Received: from localhost ([127.0.0.1]:53491 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1szfaq-0005HM-3P for submit@debbugs.gnu.org; Sat, 12 Oct 2024 13:07:52 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44542) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1szfan-0005H6-BF for 72813@debbugs.gnu.org; Sat, 12 Oct 2024 13:07:50 -0400 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 ) id 1szfaT-0006MC-5r; Sat, 12 Oct 2024 13:07:29 -0400 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=Ap5hoKYPnICPPGd9OymwnVQQrmPBHNS6nf4GJR8j/7k=; b=Md3uyKPOJPhX+n5FdXeo Qw7bmWQh26cyO6B5nanZoM3NeME2Af3GVCr4akoZT1hIOFRxzwTuATNUWHn4Hp/CLyHGsCyG6iOca WafE2zwrYKvNP+HbTXusMyrh/FDUU+4uDlY37XcXp2ox1BL5iyqPVBGqnCbLaMb6yQk8mCTRgx6FI oRmLVS7xW0pryyvLDS77Y3BSUnWOhvwT//9aOUYFdWW7EAY5Ku58snpC4hCcSjJhQcH3Ou625kQHk tvrlFlCW3bwDf7tOgFbUPNLR3wmtoAY/PMPTsvm+f5Gm6XX8F2FHbFIiaBiOPz0Ok+fwfM9i38fZj iOvYMnJVtm+KAA==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Lilah Tascheter Subject: Re: [bug#72813] [PATCH] gnu: packages: Fix git system configuration. In-Reply-To: <1ea5ce3850cc9e91526391e315061f8e0c523f8c.1724643373.git.lilah@lunabee.space> (Lilah Tascheter's message of "Sun, 25 Aug 2024 22:36:13 -0500") References: <1ea5ce3850cc9e91526391e315061f8e0c523f8c.1724643373.git.lilah@lunabee.space> Date: Sat, 12 Oct 2024 19:07:24 +0200 Message-ID: <871q0ltflf.fsf@gnu.org> 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: 72813 Cc: 72813@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 Lilah, Lilah Tascheter skribis: > Git's system config path is, by default, relative to the install prefix. > Fix this to use the usual system path. > > System config is is pretty much the only way to change git config for > system services. > > * gnu/packages/version-control.scm (git/fixed): New variable. > (git)[replacement]: Graft with git/fixed. > > Change-Id: I44ae667baee6c9389a8f81da743d67d1a63070ed Apologies for the delay. In general we would use =E2=80=98replacement=E2=80=99 only for security iss= ues. In this case I would suggest changing #:configure-flags in =E2=80=98git-minimal=E2= =80=99 *and* arrange so that =E2=80=98git-minimal/pinned=E2=80=99 remains unchanged (tha= t is, it should still have the previous #:configure-flags value). You can check that by running: ./pre-inst-env guix build \ -e '(@ (gnu packages version-control) git-minimal/pinned)' \ --no-grafts -d before and after your change. The result should be identical. Would you like to give it a try? Thanks, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 22 17:41:25 2025 Received: (at 72813) by debbugs.gnu.org; 22 Jan 2025 22:41:25 +0000 Received: from localhost ([127.0.0.1]:37250 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tajPY-0006hn-FP for submit@debbugs.gnu.org; Wed, 22 Jan 2025 17:41:24 -0500 Received: from sendmail.purelymail.com ([34.202.193.197]:53832) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tajPV-0006hE-Ea for 72813@debbugs.gnu.org; Wed, 22 Jan 2025 17:41:22 -0500 Authentication-Results: purelymail.com; auth=pass DKIM-Signature: a=rsa-sha256; b=0r1ybCETvQMwWc5KtzbkUkFQfyoChHxSUZRd8fz3/f960EisfBhZDGt4YJYT2MSaul6BNA9fFqYKa28OhH5PGKFbdHQ4vk/VHw3KzfQmckPnUP9VeLWsXcqCT3cK4kaMW+jNthUeUK2of2FJswd8VnTNyu5maxakoqlQN292jVjj8DVVAVwkFLbLGwfDiFOmYyNufwFOMuuUEJrQJHfBaPJ49h+CTuUHwGiZtgp3FH9DBEesVRreilO9CXalWTEuESIJI4ZfJQPUzIMJ3/vvjiX61CEY7qAzhiBIdECER6mD+OD5QjQSlK7Xq8CJsUQ7HkgG79yt6ycjvrQo1ekWsg==; s=purelymail3; d=lunabee.space; v=1; bh=5yXLOZ1kYo3uK2UIbhzUawpF1WKOCptD7VEf4Eqj9fk=; h=Received:From:To:Subject:Date; DKIM-Signature: a=rsa-sha256; b=3bxf37p6QHE23cS/aFm3cM6nG56BjYsAqlfQyrB4vNLjsn2lH1EVGkiocLlyzG9y0PdHrKrQsOV1pgONvlp9IiItwdx2gftrjWTo4LCBTBNWohkJIjqB/WVIlSMqCZT3Vq9ePFzADBu94EdIuBHouELU4jh9FDjuvgIBt2Rq3Phjf6g3+2fBvWB4nlWHUwTAxk/Mzlgd70iElQb0bUt9DL40NV0n5PX1ul/LtstDHzOh6ppq/94WpQxhvLe0Sy9PjRzT2TQeVv7jbZNPgRRB0EEdNdxg2r1RK/PwBrPNlA0pRFqunWL6wloTMWVuEDDJbQkvL2cWVc5PwdHX5SoYYg==; s=purelymail3; d=purelymail.com; v=1; bh=5yXLOZ1kYo3uK2UIbhzUawpF1WKOCptD7VEf4Eqj9fk=; h=Feedback-ID:Received:From:To:Subject:Date; Feedback-ID: 8937:2070:null:purelymail X-Pm-Original-To: 72813@debbugs.gnu.org Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id 1314624562; (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Wed, 22 Jan 2025 22:41:13 +0000 (UTC) From: Lilah Tascheter To: 72813@debbugs.gnu.org Subject: [PATCH v2] gnu: packages: Fix git system configuration. Date: Wed, 22 Jan 2025 16:40:03 -0600 Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-MIME-Autoconverted: from 8bit to quoted-printable by Purelymail Content-Type: text/plain; charset=UTF-8 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 72813 Cc: Lilah Tascheter , =?UTF-8?q?Ludovic=20Court=C3=A8s?= 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: -1.0 (-) * gnu/packages/version-control.scm (git-minimal)[arguments]: Add configure flag to properly recognize the system gitconfig. (git-minimal/pinned)[arguments]: Use old arguments as to not force rebuil= d. Change-Id: I7f31d16aa6c7ab062f300019f1f862b561ece2d3 --- gnu/packages/version-control.scm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-contro= l.scm index 2a95bc79e1..f5942e8138 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -283,9 +283,8 @@ (define-public git-minimal #:disallowed-references (list bash perl) #:test-target "test" #:configure-flags - (if (%current-target-system) - git-cross-configure-flags - #~(list)) + #~(cons "--with-gitconfig=3D/etc/gitconfig" + #$(if (%current-target-system) git-cross-configure-flags #~(list= ))) #:make-flags #~(list "V=3D1" ;more verbose compilation (string-append "SHELL_PATH=3D" @@ -772,7 +771,13 @@ (define-public git-minimal/pinned version ".tar.xz")) (sha256 (base32 - "0h40arw08xbpi2cbf7pvc947v963rjxz3inb2ar81zjc8byvlj77"))))= )) + "0h40arw08xbpi2cbf7pvc947v963rjxz3inb2ar81zjc8byvlj77")))) + ;; Temporary measure to prevent unneccessary package rebuilds. + (arguments (substitute-keyword-arguments (package-arguments git-minima= l) + ((#:configure-flags flags #~'()) + (if (%current-target-system) + git-cross-configure-flags + #~(list))))))) =20 (define-public python-klaus (package base-commit: 30327e379b2acdcdc418109e1f01ab92210a83cd --=20 2.47.1