[bug#72813] [PATCH] gnu: packages: Fix git system configuration.

[bug#72813] [PATCH] gnu: packages: Fix git system configuration.

[Lilah Tascheter via Guix-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(+)

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

base-commit: 9e57f3bcd4b3c4c8936358d3160f0d4f996204ce
-- 
2.45.2

[bug#72813] [PATCH] gnu: packages: Fix git system configuration.

[Ludovic Courtès]

Hi Lilah,

Lilah Tascheter <lilah@lunabee.space> 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 ‘replacement’ only for security issues.  In this
case I would suggest changing #:configure-flags in ‘git-minimal’ *and*
arrange so that ‘git-minimal/pinned’ remains unchanged (that 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’.