[PATCH] gnu: Add cgit.

[PATCH] gnu: Add cgit.

[宋文武]

* gnu/packages/version-control.scm (cgit): New variable.
---
 gnu/packages/version-control.scm | 60 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 7d7276a..498885d 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -364,6 +364,66 @@ write native speed custom Git applications in any language with bindings.")
     ;; GPLv2 with linking exception
     (license gpl2)))
 
+(define-public cgit
+  (package
+    (name "cgit")
+    (version "0.12")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://git.zx2c4.com/cgit/snapshot/cgit-"
+                    version ".tar.xz"))
+              (sha256
+               (base32
+                "1dx54hgfyabmg9nm5qp6d01f54nlbqbbdwhwl0llb9imjf237qif"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:tests? #f ;
+       #:test-target "test"
+       #:make-flags '("CC=gcc" "SHELL_PATH=sh")
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'unpack-git
+           (lambda* (#:key inputs #:allow-other-keys)
+             ;; Unpack the source of git into the 'git' directory.
+             (zero? (system*
+                     "tar" "--strip-components=1" "-C" "git" "-xf"
+                     (assoc-ref inputs "git:src")))))
+         (delete 'configure) ; no configure script
+         (add-after 'build 'build-man
+           (lambda* (#:key make-flags #:allow-other-keys)
+             (zero? (apply system* `("make" ,@make-flags "doc-man")))))
+         (replace 'install
+           (lambda* (#:key make-flags outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (and (zero? (apply system*
+                                  `("make" ,@make-flags
+                                    ,(string-append "prefix=" out)
+                                    ,(string-append
+                                      "CGIT_SCRIPT_PATH=" out "/share/cgit")
+                                    "install" "install-man")))
+                    ;; Move the platform-dependent 'cgit.cgi' into lib
+                    ;; to get it stripped.
+                    (rename-file (string-append out "/share/cgit/cgit.cgi")
+                                 (string-append out "/lib/cgit/cgit.cgi"))
+                    #t)))))))
+    (native-inputs
+     `(("asciidoc" ,asciidoc)
+       ("xmllint" ,libxml2)
+       ("xsltprot" ,libxslt)))
+    (inputs
+     `(("docbook-xml" ,docbook-xml)
+       ("docbook-xsl" ,docbook-xsl)
+       ("git:src" ,(package-source git))
+       ("openssl" ,openssl)
+       ("zlib" ,zlib)))
+    (home-page "https://git.zx2c4.com/cgit/")
+    (synopsis "Web frontend for git repositories")
+    (description
+     "CGit is an attempt to create a fast web interface for the Git SCM, using
+a built-in cache to decrease server I/O pressure.")
+    (license gpl2)))
+
 (define-public shflags
   (package
     (name "shflags")
-- 
2.6.3

Re: [PATCH] gnu: Add cgit.

[宋文武]

I get it built, but haven't run it.

For a cgit service, which CGI runner should we use?
IIUC, typical setup are:
  - nginx + fcgiwrap (or uwsgi)
  - apache httpd
  - lighttpd

Re: [PATCH] gnu: Add cgit.

[Thompson, David]

On Sun, Mar 27, 2016 at 10:14 AM, 宋文武 <iyzsong@member.fsf.org> wrote:
> I get it built, but haven't run it.
>
> For a cgit service, which CGI runner should we use?
> IIUC, typical setup are:
>   - nginx + fcgiwrap (or uwsgi)
>   - apache httpd
>   - lighttpd

I'm partial to nginx, and it's the only one we have a service for, but
it could be made sufficiently generic that it can use any web server
that a user supplied a handler for.  The nginx service is currently
missing a way to extend it with additional configuration.  I posted a
patch for this awhile ago but it never made it to master due to some
issues.  Once we make nginx extensible, writing a cgit service should
be easy.

BTW, have you verified that cgit does not distribute any minified
JavaScript files?

- Dave

Re: [PATCH] gnu: Add cgit.

[宋文武]

"Thompson, David" <dthompson2@worcester.edu> writes:

> On Sun, Mar 27, 2016 at 10:14 AM, 宋文武 <iyzsong@member.fsf.org> wrote:
>> I get it built, but haven't run it.
>>
>> For a cgit service, which CGI runner should we use?
>> IIUC, typical setup are:
>>   - nginx + fcgiwrap (or uwsgi)
>>   - apache httpd
>>   - lighttpd
>
> I'm partial to nginx, and it's the only one we have a service for, but
> it could be made sufficiently generic that it can use any web server
> that a user supplied a handler for.  The nginx service is currently
> missing a way to extend it with additional configuration.  I posted a
> patch for this awhile ago but it never made it to master due to some
> issues.  Once we make nginx extensible, writing a cgit service should
> be easy.
OK, nginx itself won't able to run CGI applications.
And since the website of fastcgi (used by fcgiwrap and lighttpd) is down
now, I'll try package uwsgi.
>
> BTW, have you verified that cgit does not distribute any minified
> JavaScript files?
No, and now it seems that cgit doesn't use javascript at all :-)

Thanks.

Re: [PATCH] gnu: Add cgit.

[Ludovic Courtès]

"Thompson, David" <dthompson2@worcester.edu> skribis:

> On Sun, Mar 27, 2016 at 10:14 AM, 宋文武 <iyzsong@member.fsf.org> wrote:
>> I get it built, but haven't run it.
>>
>> For a cgit service, which CGI runner should we use?
>> IIUC, typical setup are:
>>   - nginx + fcgiwrap (or uwsgi)
>>   - apache httpd
>>   - lighttpd
>
> I'm partial to nginx, and it's the only one we have a service for, but
> it could be made sufficiently generic that it can use any web server
> that a user supplied a handler for.  The nginx service is currently
> missing a way to extend it with additional configuration.  I posted a
> patch for this awhile ago but it never made it to master due to some
> issues.  Once we make nginx extensible, writing a cgit service should
> be easy.

We should get that patch in, it would be tremendously useful!

Ludo’.

Re: [PATCH] gnu: Add cgit.

[Ludovic Courtès]

宋文武 <iyzsong@gmail.com> skribis:

> * gnu/packages/version-control.scm (cgit): New variable.

[...]

> +    (arguments
> +     '(#:tests? #f ;

Please add a comment on why tests are disabled.  Better yet: fix’em!
;-)

> +    (native-inputs
> +     `(("asciidoc" ,asciidoc)
> +       ("xmllint" ,libxml2)
> +       ("xsltprot" ,libxslt)))
> +    (inputs
> +     `(("docbook-xml" ,docbook-xml)
> +       ("docbook-xsl" ,docbook-xsl)

I would move DocBook to ‘native-inputs’.

> +    (description
> +     "CGit is an attempt to create a fast web interface for the Git SCM, using
> +a built-in cache to decrease server I/O pressure.")
> +    (license gpl2)))

Version 2 only, right?

Ludo’.

Re: [PATCH] gnu: Add cgit.

[宋文武]

ludo@gnu.org (Ludovic Courtès) writes:

> 宋文武 <iyzsong@gmail.com> skribis:
>
>> * gnu/packages/version-control.scm (cgit): New variable.
>
> [...]
>
>> +    (arguments
>> +     '(#:tests? #f ;
>
> Please add a comment on why tests are disabled.  Better yet: fix’em!
> ;-)
It try to build a some kind of full version of git, but
failed.  (I give up on fixing it now.)

>> +    (native-inputs
>> +     `(("asciidoc" ,asciidoc)
>> +       ("xmllint" ,libxml2)
>> +       ("xsltprot" ,libxslt)))
>> +    (inputs
>> +     `(("docbook-xml" ,docbook-xml)
>> +       ("docbook-xsl" ,docbook-xsl)
>
> I would move DocBook to ‘native-inputs’.
OK, since they’re only for building the manpage.
>
>> +    (description
>> +     "CGit is an attempt to create a fast web interface for the Git SCM, using
>> +a built-in cache to decrease server I/O pressure.")
>> +    (license gpl2)))
>
> Version 2 only, right?
Yes, the source don't mention “later version”.

Pushed, thanks for review!