diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2016-12-04 17:41:36 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2016-12-04 17:41:36 +0100 |
| commit | a351fc83694f436c3bff7cbdef09bd3cc91c74fc (patch) | |
| tree | 646145378742a6943d7c4dda995fc0fb67f9db32 /gnu/packages/version-control.scm | |
| parent | 80b63e670ef4fe1fd40a903bcd4ee47a11415bd9 (diff) | |
| parent | d1a5b20081c30da7503201df260cf20b8d0ba633 (diff) | |
| download | guix-a351fc83694f436c3bff7cbdef09bd3cc91c74fc.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/version-control.scm')
| -rw-r--r-- | gnu/packages/version-control.scm | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 03d7bbead3..edd2d3a4dd 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -141,6 +141,9 @@ as well as the classic centralized workflow.") ("python" ,python-2) ; CAVEAT: incompatible with python-3 according to INSTALL ("zlib" ,zlib) + ;; For 'gitweb.cgi' + ("perl-cgi" ,perl-cgi) + ;; For 'git-svn'. ("subversion" ,subversion) ("perl-term-readkey" ,perl-term-readkey) @@ -257,6 +260,17 @@ as well as the classic centralized workflow.") "perl-net-smtp-ssl" "perl-io-socket-ssl"))))))) + ;; Tell 'gitweb.cgi' where perl modules are. + (wrap-program (string-append out "/share/gitweb/gitweb.cgi") + `("PERL5LIB" ":" prefix + ,(map (lambda (o) (string-append o "/lib/perl5/site_perl")) + (list + ,@(transitive-input-references + 'inputs + (map (lambda (l) + (assoc l (inputs))) + '("perl-cgi"))))))) + ;; Tell 'git-submodule' where Perl is. (wrap-program git-sm `("PATH" ":" prefix |