[bug#31488] [PATCH] gnu: git: Add "credential-netrc" output.

[bug#31488] [PATCH] gnu: git: Add "credential-netrc" output.

[Pierre Neidhardt]

* gnu/packages/version-control.scm (git): Add "credential-netrc"
output.
---
 gnu/packages/version-control.scm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index b41529d4f..4892c7ab8 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -188,6 +188,7 @@ as well as the classic centralized workflow.")
    (outputs '("out"                               ; the core
               "send-email"                        ; for git-send-email
               "svn"                               ; git-svn
+              "credential-netrc"                  ; git-credential-netrc
               "gui"))                             ; gitk, git gui
    (arguments
     `(#:make-flags `("V=1"                        ;more verbose compilation
@@ -217,6 +218,8 @@ as well as the classic centralized workflow.")
               (("/bin/sh") (which "sh"))
               (("/usr/bin/perl") (which "perl"))
               (("/usr/bin/python") (which "python")))
+            (substitute* "contrib/credential/netrc/git-credential-netrc"
+              (("/usr/bin/perl") (which "perl")))
             #t))
         (add-after 'configure 'add-PM.stamp
           (lambda _
@@ -271,6 +274,13 @@ as well as the classic centralized workflow.")
               (copy-file "contrib/completion/git-completion.bash"
                          (string-append completions "/git"))
               #t)))
+        (add-after 'install 'install-credential-netrc
+          (lambda* (#:key outputs #:allow-other-keys)
+            (let* ((netrc (assoc-ref outputs "credential-netrc"))
+                   (bin (string-append netrc "/bin")))
+              (mkdir-p bin)
+              (install-file "contrib/credential/netrc/git-credential-netrc" bin)
+              #t)))
         (add-after 'install 'split
           (lambda* (#:key inputs outputs #:allow-other-keys)
             ;; Split the binaries to the various outputs.
-- 
2.17.0

[bug#31488] [PATCH] gnu: git: Add "credential-netrc" output.

[Tobias Geerinckx-Rice]

Pierre,

[Forgive my MUA's disdain for whitespace. I'm working on it.]

May 18, 2018 11:22 AM, "Pierre Neidhardt" <ambrevar@gmail.com> wrote:
> @@ -217,6 +218,8 @@ as well as the classic centralized workflow.")
> (("/bin/sh") (which "sh"))
> (("/usr/bin/perl") (which "perl"))
> (("/usr/bin/python") (which "python")))
> + (substitute* "contrib/credential/netrc/git-credential-netrc"
> + (("/usr/bin/perl") (which "perl")))
> #t))
> (add-after 'configure 'add-PM.stamp
> (lambda _

This phase is (still) called ‘patch-makefiles’. Could you tweak the name or move this to its own phase?

I've a preference for the latter, since it can then probably be moved before 'install-credential-netrc below to keep things together, but it's a slight one.

All that typed: is this even needed? It doesn't seem to be. The only mention of perl is the shebang, and those are already handled by the build system.

> @@ -271,6 +274,13 @@ as well as the classic centralized workflow.")
> (copy-file "contrib/completion/git-completion.bash"
> (string-append completions "/git"))
> #t)))
> + (add-after 'install 'install-credential-netrc
> + (lambda* (#:key outputs #:allow-other-keys)
> + (let* ((netrc (assoc-ref outputs "credential-netrc"))
> + (bin (string-append netrc "/bin")))
> + (mkdir-p bin)

INSTALL-FILE already implies MKDIR-P. That's one of its main features over COPY-FILE.

> + (install-file "contrib/credential/netrc/git-credential-netrc" bin)
> + #t)))
> (add-after 'install 'split
> (lambda* (#:key inputs outputs #:allow-other-keys)
> ;; Split the binaries to the various outputs.

I'll let others comment on the multiple outputs. I'm their resident fetishist, but not sufficiently informed to judge the ‘clutter’ vs. 48 KiB argument.

Sorry to reduce your work to a potential one-liner. The rest looks good to me. ;-)

Thanks!

T G-R

Sent from a Web browser. Excuse or enjoy my brevity.

[bug#31488] [PATCH] gnu: git: Add "credential-netrc" output.

[Tobias Geerinckx-Rice]

May 18, 2018 2:50 PM, "Tobias Geerinckx-Rice" <me@tobias.gr> wrote:
> INSTALL-FILE already implies MKDIR-P. That's one of its main features over COPY-FILE.

Or only, in fact.

  (define (install-file file directory)
    (mkdir-p directory)
    (copy-file file (string-append directory "/" (basename file))))

There are quite a few spurious MKDIR-Ps still lurking in Guix that might
have been confusing.

Tidying time,

T G-R

Sent from a Web browser. Excuse or enjoy my brevity.

[bug#31488] [PATCH] gnu: git: Add "credential-netrc" output.

[Pierre Neidhardt]

[-- Attachment #1: Type: text/plain, Size: 166 bytes --]


You are absolutely right, new patch inbound.

-- 
Pierre Neidhardt

'Tis more blessed to give than receive; for example, wedding presents.
		-- H.L. Mencken

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[bug#31488] [PATCH] gnu: git: Add "credential-netrc" output.

[Pierre Neidhardt]

[-- Attachment #1: Type: text/plain, Size: 1603 bytes --]


* gnu/packages/version-control.scm (git): Add "credential-netrc"
output.
---
 gnu/packages/version-control.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index b41529d4f..13861d251 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -188,6 +188,7 @@ as well as the classic centralized workflow.")
    (outputs '("out"                               ; the core
               "send-email"                        ; for git-send-email
               "svn"                               ; git-svn
+              "credential-netrc"                  ; git-credential-netrc
               "gui"))                             ; gitk, git gui
    (arguments
     `(#:make-flags `("V=1"                        ;more verbose compilation
@@ -271,6 +272,12 @@ as well as the classic centralized workflow.")
               (copy-file "contrib/completion/git-completion.bash"
                          (string-append completions "/git"))
               #t)))
+        (add-after 'install 'install-credential-netrc
+          (lambda* (#:key outputs #:allow-other-keys)
+            (let* ((netrc (assoc-ref outputs "credential-netrc")))
+              (install-file "contrib/credential/netrc/git-credential-netrc"
+                            (string-append netrc "/bin"))
+              #t)))
         (add-after 'install 'split
           (lambda* (#:key inputs outputs #:allow-other-keys)
             ;; Split the binaries to the various outputs.
-- 
2.17.0


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[bug#31488] [PATCH] gnu: git: Add "credential-netrc" output.

[Pierre Neidhardt]

[-- Attachment #1: Type: text/plain, Size: 36 bytes --]


Update?

-- 
Pierre Neidhardt

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

bug#31488: gnu: git: Add "credential-netrc" output.

[Gábor Boskovits]

[-- Attachment #1: Type: text/plain, Size: 44 bytes --]

Thanks for the patch!
Pushed as *145b0693.*

[-- Attachment #2: Type: text/html, Size: 787 bytes --]