diff mbox

gnu: git: Add input for 'git-svn'.

Message ID 20160927.214544.688995114571346244.thomas.danckaert@gmail.com
State New
Headers show

Commit Message

Thomas Danckaert Sept. 27, 2016, 7:45 p.m. UTC
Hi Guix-devel,

this adds a perl dependency for git-svn.

git-svn uses Term::ReadKey to read a user's password during http 
authentication with an svn server (and perhaps for other 
authentication methods as well).

best,

Thomas

Comments

=?utf-8?B?5a6L5paH5q2m?= Sept. 28, 2016, 1:24 p.m. UTC | #1
Thomas Danckaert <thomas.danckaert@gmail.com> writes:

> Hi Guix-devel,
>
> this adds a perl dependency for git-svn.
>
> git-svn uses Term::ReadKey to read a user's password during http
> authentication with an svn server (and perhaps for other
> authentication methods as well).
>

Applied, thanks!
diff mbox

Patch

From d5e3bf1a9e26a0fce4485f9af67118674fa6f547 Mon Sep 17 00:00:00 2001
From: Thomas Danckaert <thomas.danckaert@gmail.com>
Date: Tue, 27 Sep 2016 15:38:51 +0200
Subject: [PATCH] gnu: git: Add input for 'git-svn'.

---
 gnu/packages/version-control.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 29559bd..ef65a03 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -143,6 +143,7 @@  as well as the classic centralized workflow.")
 
       ;; For 'git-svn'.
       ("subversion" ,subversion)
+      ("perl-term-readkey" ,perl-term-readkey)
 
       ;; For 'git-send-email'
       ("perl-authen-sasl" ,perl-authen-sasl)
@@ -227,14 +228,15 @@  as well as the classic centralized workflow.")
                         (list gitk git-gui git-cit git-se git-svn)
                         (list gitk* git-gui* git-cit* git-se* git-svn*))
 
-              ;; Tell 'git-svn' where Subversion is.
+              ;; Tell 'git-svn' where Subversion and perl-term-readkey are.
               (wrap-program git-svn*
                 `("PATH" ":" prefix
                   (,(string-append (assoc-ref inputs "subversion")
                                    "/bin")))
                 `("PERL5LIB" ":" prefix
-                  (,(string-append (assoc-ref inputs "subversion")
-                                   "/lib/perl5/site_perl")))
+                  ,(map (lambda (i) (string-append (assoc-ref inputs i)
+                                                   "/lib/perl5/site_perl"))
+                        '("subversion" "perl-term-readkey")))
 
                 ;; XXX: The .so for SVN/Core.pm lacks a RUNPATH, so
                 ;; help it find 'libsvn_client-1.so'.
-- 
2.10.0