* [PATCH] gnu: git: Fix gitweb.
@ 2016-12-03 11:58 Ricardo Wurmus
2016-12-03 18:46 ` Marius Bakke
0 siblings, 1 reply; 3+ messages in thread
From: Ricardo Wurmus @ 2016-12-03 11:58 UTC (permalink / raw)
To: guix-devel
* gnu/packages/version-control.scm (git)[inputs]: Add perl-cgi.
[arguments]: Wrap "gitweb.cgi" with PERL5LIB.
---
gnu/packages/version-control.scm | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 03d7bbe..edd2d3a 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
--
2.10.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] gnu: git: Fix gitweb.
2016-12-03 11:58 [PATCH] gnu: git: Fix gitweb Ricardo Wurmus
@ 2016-12-03 18:46 ` Marius Bakke
2016-12-03 19:21 ` Ricardo Wurmus
0 siblings, 1 reply; 3+ messages in thread
From: Marius Bakke @ 2016-12-03 18:46 UTC (permalink / raw)
To: Ricardo Wurmus, guix-devel
[-- Attachment #1: Type: text/plain, Size: 314 bytes --]
Ricardo Wurmus <rekado@elephly.net> writes:
> * gnu/packages/version-control.scm (git)[inputs]: Add perl-cgi.
> [arguments]: Wrap "gitweb.cgi" with PERL5LIB.
> ---
> gnu/packages/version-control.scm | 14 ++++++++++++++
> 1 file changed, 14 insertions(+)
This LGTM and increases git closure with about 0.4 MiB.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] gnu: git: Fix gitweb.
2016-12-03 18:46 ` Marius Bakke
@ 2016-12-03 19:21 ` Ricardo Wurmus
0 siblings, 0 replies; 3+ messages in thread
From: Ricardo Wurmus @ 2016-12-03 19:21 UTC (permalink / raw)
To: Marius Bakke; +Cc: guix-devel
Marius Bakke <mbakke@fastmail.com> writes:
> Ricardo Wurmus <rekado@elephly.net> writes:
>
>> * gnu/packages/version-control.scm (git)[inputs]: Add perl-cgi.
>> [arguments]: Wrap "gitweb.cgi" with PERL5LIB.
>> ---
>> gnu/packages/version-control.scm | 14 ++++++++++++++
>> 1 file changed, 14 insertions(+)
>
> This LGTM and increases git closure with about 0.4 MiB.
Thanks. Pushed as 3bec8a016ff61e3e5dd1af86ee8423af4c168720.
--
Ricardo
GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC
http://elephly.net
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-12-03 19:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-12-03 11:58 [PATCH] gnu: git: Fix gitweb Ricardo Wurmus
2016-12-03 18:46 ` Marius Bakke
2016-12-03 19:21 ` Ricardo Wurmus
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).