From patchwork Mon Aug 26 03:36:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lilah Tascheter X-Patchwork-Id: 67287 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id F2CDB27BBEA; Mon, 26 Aug 2024 04:37:32 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1583A27BBE2 for ; Mon, 26 Aug 2024 04:37:32 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1siQXa-0005v0-5D; Sun, 25 Aug 2024 23:37:14 -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 1siQXY-0005uY-Od for guix-patches@gnu.org; Sun, 25 Aug 2024 23:37:12 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1siQXX-0005jB-Th for guix-patches@gnu.org; Sun, 25 Aug 2024 23:37:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=MoEW+LZ3h/2vuiAIjlyZ1BcwGqTkHwO2P7jn2Vr5++M=; b=m1Yce6Tav2x2umuQ2CEVsX6QnRvJT4S1cbFWi2WzGOmT/CK5eM4iFeF18XWMTYotfEc1lTncLDhvIvx/yQ4hwQO0xEZLUJiy/SM0g2N9jJLiDMaMagzHsy9apKSSR5lWITkNlqAIOB5JIChNo3+PrUGfOH+2TBZ6bAGUrRchu/76uazKej1YiyQGU5kUBKfbR22+AlMhx4glbF7mV3rWv5d46SIILM/C//tYAv7275pu5M2vnl09IlCa+LZKDOq8g981un1mbxyYzXyasJKBMYyGQn0/5MKyJdtChvRYGEODqRv7/6KRyNIJjHib/I1OoPbSJsrtZxWiF2CFTZz71w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1siQYM-0004uq-A9 for guix-patches@gnu.org; Sun, 25 Aug 2024 23:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72813] [PATCH] gnu: packages: Fix git system configuration. Resent-From: Lilah Tascheter Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Aug 2024 03:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 72813 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72813@debbugs.gnu.org Cc: Lilah Tascheter X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.172464347618880 (code B ref -1); Mon, 26 Aug 2024 03:38:02 +0000 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) Date: Sun, 25 Aug 2024 22:36:13 -0500 Message-ID: <1ea5ce3850cc9e91526391e315061f8e0c523f8c.1724643373.git.lilah@lunabee.space> MIME-Version: 1.0 X-MIME-Autoconverted: from 8bit to quoted-printable by Purelymail 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Lilah Tascheter via Guix-patches From: Lilah Tascheter Reply-To: Lilah Tascheter Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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(+) base-commit: 9e57f3bcd4b3c4c8936358d3160f0d4f996204ce diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.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/"))) +(define git/fixed + (package + (inherit git) + (arguments + (substitute-keyword-arguments (package-arguments git) + ((#:configure-flags flags #~'()) + #~(cons "--with-gitconfig=/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