From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 26 17:14:16 2018 Received: (at submit) by debbugs.gnu.org; 26 Apr 2018 21:14:16 +0000 Received: from localhost ([127.0.0.1]:40742 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fBoDY-0001Gl-Ga for submit@debbugs.gnu.org; Thu, 26 Apr 2018 17:14:16 -0400 Received: from eggs.gnu.org ([208.118.235.92]:48380) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fBoDX-0001Ga-64 for submit@debbugs.gnu.org; Thu, 26 Apr 2018 17:14:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fBoDR-0002dQ-1i for submit@debbugs.gnu.org; Thu, 26 Apr 2018 17:14:09 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:51610) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fBoDQ-0002dM-Ur for submit@debbugs.gnu.org; Thu, 26 Apr 2018 17:14:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39351) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fBoDP-0005L5-RI for guix-patches@gnu.org; Thu, 26 Apr 2018 17:14:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fBoDK-0002a8-NE for guix-patches@gnu.org; Thu, 26 Apr 2018 17:14:07 -0400 Received: from li622-129.members.linode.com ([212.71.249.129]:59064 helo=mira.cbaines.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fBoDK-0002ZK-Hu for guix-patches@gnu.org; Thu, 26 Apr 2018 17:14:02 -0400 Received: by mira.cbaines.net (Postfix, from userid 113) id DECB313D067; Thu, 26 Apr 2018 22:14:00 +0100 (BST) Received: from localhost (cpc102582-walt20-2-0-cust14.13-2.cable.virginm.net [86.27.34.15]) by mira.cbaines.net (Postfix) with ESMTPSA id 7C72913D064 for ; Thu, 26 Apr 2018 22:14:00 +0100 (BST) Received: from giedi (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id fa9d494c for ; Thu, 26 Apr 2018 21:13:59 +0000 (UTC) User-agent: mu4e 1.0; emacs 25.3.1 From: Christopher Baines To: guix-patches@gnu.org Subject: [PATCH] cgit changes Date: Thu, 26 Apr 2018 22:13:55 +0100 Message-ID: <87efj1wu0c.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) --=-=-= Content-Type: text/plain I recently managed to succesfully use the cgit service with the Gitolite service that is available here [1]. I had to make some changes to the Gitolite service, so that needs updating, but I also made some changes to the cgit package and service to make some of the scripts included in the cgit package work on GuixSD and make porting over the cgit service configuation I was using on Debian a little easier. 1: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=30809 Christopher Baines (3): gnu: cgit: Fix included scripts. services: cgit: Improve handling of extra-options. services: cgit: Make project-list permit a string. gnu/packages/version-control.scm | 32 +++++++++++++++++++++++++++++++- gnu/services/cgit.scm | 18 +++++++++++++++--- 2 files changed, 46 insertions(+), 4 deletions(-) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAlriQRNfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9XfREBAArGxtEhEoMtjcNn5xrjM/VK0P1dpdnbqUgRsDbKPfnBu1ASDtE5WJmIMO wPcHedewx46+PeftPy9kZB1u42/rI/p0uHKZbqZiz5ygAOYkzQv/uIOdIlusbY/1 LdWfm9ZTnJ0q7iFl6kVBwgPXXJaq+ArBTEECUWoHzqOuXZXtGgDdeIgUKc1SYhYk krMi004+7sK9oGIWTYZLDNKa9MB+8WsG4Dd5Q+WVBannAYX8oK8mrqXrYNv+iZxO /RgRqwcUlVPSUwOwxBLagCaAce2//fxy8U+vnZb+gWa/ppAyzhsXjwKocCQnliet 66xKOHZYBJjn3JZPgBMgKD+nmuJJ/106hXy55ubumZIxBJ6qFSPyGSxnVEl3JNc6 VZ6H3FHqQrqVLfY59G625JwCDQ95j6ildA3a2UvSbpd179oWqXGi8Fmkasmwn3rC TXOi4WcfCojjpJ5USH7j5jmjScoRo+KfpZmQopnhGuhFiBvoVcZwao5ZUFCDBZYX uFHRR/EQqkidR5rjgUzDn1kNn5LkctddeGtXvYlwNs50MXiPvdKhTGpvxJSnzeO/ 7RPimRrEA0yK3bdyB1C88lPhcSwc6fpH5SuRHLC1SnWJvLbLP+O8edMU3FrrFNJq m3jkvit92O7GIYIExVk93xJ9J38u7+TOtu1NFKkRmfCPzfHT6Wg= =ISim -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 26 17:23:12 2018 Received: (at 31277) by debbugs.gnu.org; 26 Apr 2018 21:23:12 +0000 Received: from localhost ([127.0.0.1]:40748 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fBoMC-0001UA-El for submit@debbugs.gnu.org; Thu, 26 Apr 2018 17:23:12 -0400 Received: from li622-129.members.linode.com ([212.71.249.129]:36510 helo=mira.cbaines.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fBoMA-0001Tx-P2 for 31277@debbugs.gnu.org; Thu, 26 Apr 2018 17:23:11 -0400 Received: by mira.cbaines.net (Postfix, from userid 113) id 0D26613D06A; Thu, 26 Apr 2018 22:23:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.0 Received: from localhost (cpc102582-walt20-2-0-cust14.13-2.cable.virginm.net [86.27.34.15]) by mira.cbaines.net (Postfix) with ESMTPSA id D103E13D067 for <31277@debbugs.gnu.org>; Thu, 26 Apr 2018 22:23:09 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id f0298aa8 for <31277@debbugs.gnu.org>; Thu, 26 Apr 2018 21:23:09 +0000 (UTC) From: Christopher Baines To: 31277@debbugs.gnu.org Subject: [PATCH 2/3] services: cgit: Improve handling of extra-options. Date: Thu, 26 Apr 2018 22:23:08 +0100 Message-Id: <20180426212309.10809-2-mail@cbaines.net> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180426212309.10809-1-mail@cbaines.net> References: <20180426212309.10809-1-mail@cbaines.net> X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 31277 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/services/cgit.scm (serialize-cgit-configuration): Add the extra options, one per line, before the scan-path, as this makes it possible to use the extra-options to affect the global behaviour for repositories. --- gnu/services/cgit.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/services/cgit.scm b/gnu/services/cgit.scm index 8ef12cd5a..bacd6ca16 100644 --- a/gnu/services/cgit.scm +++ b/gnu/services/cgit.scm @@ -642,13 +642,19 @@ for cgit to allow access to that repository.") (not (memq (configuration-field-name field) '(project-list repository-directory - repositories)))) + repositories + extra-options)))) #~(string-append #$(let ((rest (filter rest? cgit-configuration-fields))) (serialize-configuration config rest)) #$(serialize-project-list 'project-list (cgit-configuration-project-list config)) + #$(string-join + (append + (cgit-configuration-extra-options config) + '("")) + "\n") #$(serialize-repository-directory 'repository-directory (cgit-configuration-repository-directory config)) -- 2.17.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 26 17:23:12 2018 Received: (at 31277) by debbugs.gnu.org; 26 Apr 2018 21:23:12 +0000 Received: from localhost ([127.0.0.1]:40750 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fBoMC-0001UH-Mf for submit@debbugs.gnu.org; Thu, 26 Apr 2018 17:23:12 -0400 Received: from li622-129.members.linode.com ([212.71.249.129]:36508 helo=mira.cbaines.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fBoMA-0001Tw-Og for 31277@debbugs.gnu.org; Thu, 26 Apr 2018 17:23:11 -0400 Received: by mira.cbaines.net (Postfix, from userid 113) id 3A4EF13D067; Thu, 26 Apr 2018 22:23:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.0 Received: from localhost (cpc102582-walt20-2-0-cust14.13-2.cable.virginm.net [86.27.34.15]) by mira.cbaines.net (Postfix) with ESMTPSA id EEAD813D069 for <31277@debbugs.gnu.org>; Thu, 26 Apr 2018 22:23:09 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 7d14636c for <31277@debbugs.gnu.org>; Thu, 26 Apr 2018 21:23:09 +0000 (UTC) From: Christopher Baines To: 31277@debbugs.gnu.org Subject: [PATCH 3/3] services: cgit: Make project-list permit a string. Date: Thu, 26 Apr 2018 22:23:09 +0100 Message-Id: <20180426212309.10809-3-mail@cbaines.net> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180426212309.10809-1-mail@cbaines.net> References: <20180426212309.10809-1-mail@cbaines.net> X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 31277 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Instead of having the service manage the list, it's useful to be able to point this at an existing file, for example, when using cgit together with gitolite. * gnu/services/cgit.scm (project-list?): New procedure. (serialize-project-list): Handle string values. (): Change the predicate for project-list to allow lists and strings. --- gnu/services/cgit.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/services/cgit.scm b/gnu/services/cgit.scm index bacd6ca16..240d4d8d9 100644 --- a/gnu/services/cgit.scm +++ b/gnu/services/cgit.scm @@ -115,6 +115,10 @@ (define (serialize-file-object field-name val) (serialize-string field-name val)) +(define (project-list? val) + (or (list? val) + (string? val))) + ;;; ;;; Serialize @@ -167,7 +171,9 @@ (if (null? val) "" (serialize-field 'project-list - (plain-file "project-list" (string-join val "\n"))))) + (if (string? val) + val + (plain-file "project-list" (string-join val "\n")))))) (define repository-directory? string?) @@ -543,7 +549,7 @@ disabled.") "Flag which, when set to @samp{#t}, will make cgit omit the standard header on all pages.") (project-list - (list '()) + (project-list '()) "A list of subdirectories inside of @code{repository-directory}, relative to it, that should loaded as Git repositories. An empty list means that all subdirectories will be loaded.") -- 2.17.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 26 17:23:17 2018 Received: (at 31277) by debbugs.gnu.org; 26 Apr 2018 21:23:17 +0000 Received: from localhost ([127.0.0.1]:40753 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fBoMG-0001UZ-Tj for submit@debbugs.gnu.org; Thu, 26 Apr 2018 17:23:17 -0400 Received: from li622-129.members.linode.com ([212.71.249.129]:36514 helo=mira.cbaines.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fBoMC-0001UB-P2 for 31277@debbugs.gnu.org; Thu, 26 Apr 2018 17:23:13 -0400 Received: by mira.cbaines.net (Postfix, from userid 113) id 62EA713D067; Thu, 26 Apr 2018 22:23:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,UNPARSEABLE_RELAY, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from localhost (cpc102582-walt20-2-0-cust14.13-2.cable.virginm.net [86.27.34.15]) by mira.cbaines.net (Postfix) with ESMTPSA id B272113D064 for <31277@debbugs.gnu.org>; Thu, 26 Apr 2018 22:23:09 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 89b77579 for <31277@debbugs.gnu.org>; Thu, 26 Apr 2018 21:23:09 +0000 (UTC) From: Christopher Baines To: 31277@debbugs.gnu.org Subject: [PATCH 1/3] gnu: cgit: Fix included scripts. Date: Thu, 26 Apr 2018 22:23:07 +0100 Message-Id: <20180426212309.10809-1-mail@cbaines.net> X-Mailer: git-send-email 2.17.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 31277 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Fix the about-formatting.sh, syntax-highlighting.py and html-converters files. * gnu/packages/version-control.scm (cgit)[arguments]: Include about-formatting.sh and the html-converters in the patch-absolute-file-names phase and add a wrap-python-scripts phase to wrap syntax-highlighting.py and the md2html converter. [inputs]: Add groff, python, python-docutils, python-markdown and python-pygments. --- gnu/packages/version-control.scm | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index b82abaf9e..f75900d28 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -551,6 +551,21 @@ collaboration using typical untrusted file hosts or services.") (quoted-file-name (assoc-ref inputs "bzip2") "/bin/bzip2")) (("\"xz\"") (quoted-file-name (assoc-ref inputs "xz") "/bin/xz"))) + + (substitute* "filters/about-formatting.sh" + (("$\\(dirname $0\\)") (string-append (assoc-ref outputs "out") + "/lib/cgit/filters")) + (("\\| tr") (string-append "| " (which "tr")))) + + (substitute* "filters/html-converters/txt2html" + (("sed") (which "sed"))) + + (substitute* "filters/html-converters/man2html" + (("groff") (which "groff"))) + + (substitute* "filters/html-converters/rst2html" + (("rst2html\\.py") (which "rst2html.py"))) + #t)) (delete 'configure) ; no configure script (add-after 'build 'build-man @@ -569,7 +584,17 @@ collaboration using typical untrusted file hosts or services.") ;; to get it stripped. (rename-file (string-append out "/share/cgit/cgit.cgi") (string-append out "/lib/cgit/cgit.cgi")) - #t))))))) + #t)))) + (add-after 'install 'wrap-python-scripts + (lambda* (#:key outputs #:allow-other-keys) + (for-each + (lambda (file) + (wrap-program (string-append (assoc-ref outputs "out") + "/lib/cgit/filters/" file) + `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))))) + '("syntax-highlighting.py" + "html-converters/md2html")) + #t))))) (native-inputs ;; For building manpage. `(("asciidoc" ,asciidoc) @@ -588,6 +613,11 @@ collaboration using typical untrusted file hosts or services.") (base32 "1r2aa19gnrvm2y4fqcvpw1g9l72n48axqmpgv18s6d0y2p72vhzj")))) ("openssl" ,openssl) + ("groff" ,groff) + ("python" ,python) + ("python-docutils" ,python-docutils) + ("python-markdown" ,python-markdown) + ("python-pygments" ,python-pygments) ("zlib" ,zlib))) (home-page "https://git.zx2c4.com/cgit/") (synopsis "Web frontend for git repositories") -- 2.17.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 28 06:57:20 2018 Received: (at 31277) by debbugs.gnu.org; 28 Apr 2018 10:57:21 +0000 Received: from localhost ([127.0.0.1]:41613 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fCNXc-00085v-Mo for submit@debbugs.gnu.org; Sat, 28 Apr 2018 06:57:20 -0400 Received: from mail.lassieur.org ([83.152.10.219]:43324) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fCNXa-00085k-Rt for 31277@debbugs.gnu.org; Sat, 28 Apr 2018 06:57:19 -0400 Received: from rodion (88.191.118.83 [88.191.118.83]) by mail.lassieur.org (OpenSMTPD) with ESMTPSA id cea9b664 (TLSv1.2:ECDHE-RSA-CHACHA20-POLY1305:256:NO); Sat, 28 Apr 2018 10:57:17 +0000 (UTC) References: <20180426212309.10809-1-mail@cbaines.net> <20180426212309.10809-3-mail@cbaines.net> User-agent: mu4e 1.0; emacs 25.3.1 From: =?utf-8?Q?Cl=C3=A9ment?= Lassieur To: Christopher Baines Subject: Re: [bug#31277] [PATCH 3/3] services: cgit: Make project-list permit a string. In-reply-to: <20180426212309.10809-3-mail@cbaines.net> Date: Sat, 28 Apr 2018 12:57:16 +0200 Message-ID: <8736zfd2er.fsf@lassieur.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 31277 Cc: 31277@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Christopher Baines writes: > Instead of having the service manage the list, it's useful to be able to point > this at an existing file, for example, when using cgit together with gitolite. > > * gnu/services/cgit.scm (project-list?): New procedure. > (serialize-project-list): Handle string values. > (): Change the predicate for project-list to allow lists > and strings. Hi Christopher, Good idea! But could you replace 'string?' with 'file-object?', so that the file can be in the store? And could you update the documentation? There is a helper (generate-cgit-documentation) that might help you do it. Otherwise it looks good to me. Thank you! Clément From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 28 07:19:07 2018 Received: (at 31277) by debbugs.gnu.org; 28 Apr 2018 11:19:08 +0000 Received: from localhost ([127.0.0.1]:41639 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fCNsh-0000Fs-Ma for submit@debbugs.gnu.org; Sat, 28 Apr 2018 07:19:07 -0400 Received: from mail.lassieur.org ([83.152.10.219]:43328) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fCNsg-0000Fk-3c for 31277@debbugs.gnu.org; Sat, 28 Apr 2018 07:19:06 -0400 Received: from rodion (88.191.118.83 [88.191.118.83]) by mail.lassieur.org (OpenSMTPD) with ESMTPSA id 4f556920 (TLSv1.2:ECDHE-RSA-CHACHA20-POLY1305:256:NO); Sat, 28 Apr 2018 11:19:05 +0000 (UTC) References: <20180426212309.10809-1-mail@cbaines.net> <20180426212309.10809-2-mail@cbaines.net> User-agent: mu4e 1.0; emacs 25.3.1 From: =?utf-8?Q?Cl=C3=A9ment?= Lassieur To: Christopher Baines Subject: Re: [bug#31277] [PATCH 2/3] services: cgit: Improve handling of extra-options. In-reply-to: <20180426212309.10809-2-mail@cbaines.net> Date: Sat, 28 Apr 2018 13:19:04 +0200 Message-ID: <87in8bino7.fsf@lassieur.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 31277 Cc: 31277@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Christopher Baines writes: > * gnu/services/cgit.scm (serialize-cgit-configuration): Add the extra options, > one per line, before the scan-path, as this makes it possible to use the > extra-options to affect the global behaviour for repositories. > --- > gnu/services/cgit.scm | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/gnu/services/cgit.scm b/gnu/services/cgit.scm > index 8ef12cd5a..bacd6ca16 100644 > --- a/gnu/services/cgit.scm > +++ b/gnu/services/cgit.scm > @@ -642,13 +642,19 @@ for cgit to allow access to that repository.") > (not (memq (configuration-field-name field) > '(project-list > repository-directory > - repositories)))) > + repositories > + extra-options)))) ---^ Very small nitpick: could you put extra-options between project-list and repository-directory there? So that the order is the same with what comes below. > #~(string-append > #$(let ((rest (filter rest? cgit-configuration-fields))) > (serialize-configuration config rest)) > #$(serialize-project-list > 'project-list > (cgit-configuration-project-list config)) > + #$(string-join > + (append > + (cgit-configuration-extra-options config) > + '("")) > + "\n") Could you put the serialization code in a dedicated function? (e.g. SERIALIZE-EXTRA-OPTION) So that SERIALIZE-CGIT-CONFIGURATION is only responsible for the field ordering. Also, I don't understand why you append '(""). If it's just to make cgitrc look prettier, I'm not sure it's a good idea. But maybe I missed something? Otherwise LGTM :-) Clément From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 28 07:31:04 2018 Received: (at 31277) by debbugs.gnu.org; 28 Apr 2018 11:31:04 +0000 Received: from localhost ([127.0.0.1]:41655 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fCO4B-0001Ye-6D for submit@debbugs.gnu.org; Sat, 28 Apr 2018 07:31:02 -0400 Received: from mail.lassieur.org ([83.152.10.219]:43332) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fCO49-0001WR-LK for 31277@debbugs.gnu.org; Sat, 28 Apr 2018 07:30:58 -0400 Received: from rodion (88.191.118.83 [88.191.118.83]) by mail.lassieur.org (OpenSMTPD) with ESMTPSA id e8a8dd97 (TLSv1.2:ECDHE-RSA-CHACHA20-POLY1305:256:NO); Sat, 28 Apr 2018 11:30:56 +0000 (UTC) References: <87efj1wu0c.fsf@cbaines.net> <20180426212309.10809-1-mail@cbaines.net> User-agent: mu4e 1.0; emacs 25.3.1 From: =?utf-8?Q?Cl=C3=A9ment?= Lassieur To: Christopher Baines Subject: Re: [bug#31277] [PATCH 1/3] gnu: cgit: Fix included scripts. In-reply-to: <20180426212309.10809-1-mail@cbaines.net> Date: Sat, 28 Apr 2018 13:30:55 +0200 Message-ID: <87h8nvin4g.fsf@lassieur.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 31277 Cc: 31277@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Christopher Baines writes: > Fix the about-formatting.sh, syntax-highlighting.py and html-converters files. > > * gnu/packages/version-control.scm (cgit)[arguments]: Include > about-formatting.sh and the html-converters in the patch-absolute-file-names > phase and add a wrap-python-scripts phase to wrap syntax-highlighting.py and > the md2html converter. > [inputs]: Add groff, python, python-docutils, python-markdown and > python-pygments. > --- > gnu/packages/version-control.scm | 32 +++++++++++++++++++++++++++++++- > 1 file changed, 31 insertions(+), 1 deletion(-) > > diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm > index b82abaf9e..f75900d28 100644 > --- a/gnu/packages/version-control.scm > +++ b/gnu/packages/version-control.scm > @@ -551,6 +551,21 @@ collaboration using typical untrusted file hosts or services.") > (quoted-file-name (assoc-ref inputs "bzip2") "/bin/bzip2")) > (("\"xz\"") > (quoted-file-name (assoc-ref inputs "xz") "/bin/xz"))) > + > + (substitute* "filters/about-formatting.sh" > + (("$\\(dirname $0\\)") (string-append (assoc-ref outputs "out") > + "/lib/cgit/filters")) > + (("\\| tr") (string-append "| " (which "tr")))) > + > + (substitute* "filters/html-converters/txt2html" > + (("sed") (which "sed"))) > + > + (substitute* "filters/html-converters/man2html" > + (("groff") (which "groff"))) > + > + (substitute* "filters/html-converters/rst2html" > + (("rst2html\\.py") (which "rst2html.py"))) > + > #t)) > (delete 'configure) ; no configure script > (add-after 'build 'build-man > @@ -569,7 +584,17 @@ collaboration using typical untrusted file hosts or services.") > ;; to get it stripped. > (rename-file (string-append out "/share/cgit/cgit.cgi") > (string-append out "/lib/cgit/cgit.cgi")) > - #t))))))) > + #t)))) > + (add-after 'install 'wrap-python-scripts > + (lambda* (#:key outputs #:allow-other-keys) > + (for-each > + (lambda (file) > + (wrap-program (string-append (assoc-ref outputs "out") > + "/lib/cgit/filters/" file) > + `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))))) > + '("syntax-highlighting.py" > + "html-converters/md2html")) > + #t))))) > (native-inputs > ;; For building manpage. > `(("asciidoc" ,asciidoc) > @@ -588,6 +613,11 @@ collaboration using typical untrusted file hosts or services.") > (base32 > "1r2aa19gnrvm2y4fqcvpw1g9l72n48axqmpgv18s6d0y2p72vhzj")))) > ("openssl" ,openssl) > + ("groff" ,groff) > + ("python" ,python) > + ("python-docutils" ,python-docutils) > + ("python-markdown" ,python-markdown) > + ("python-pygments" ,python-pygments) > ("zlib" ,zlib))) > (home-page "https://git.zx2c4.com/cgit/") > (synopsis "Web frontend for git repositories") Great! LGTM :-) Clément From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 28 07:39:34 2018 Received: (at 31277) by debbugs.gnu.org; 28 Apr 2018 11:39:34 +0000 Received: from localhost ([127.0.0.1]:41660 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fCOCU-0002iY-4t for submit@debbugs.gnu.org; Sat, 28 Apr 2018 07:39:34 -0400 Received: from mail.lassieur.org ([83.152.10.219]:43338) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fCOCR-0002iN-30 for 31277@debbugs.gnu.org; Sat, 28 Apr 2018 07:39:31 -0400 Received: from rodion (88.191.118.83 [88.191.118.83]) by mail.lassieur.org (OpenSMTPD) with ESMTPSA id 50503060 (TLSv1.2:ECDHE-RSA-CHACHA20-POLY1305:256:NO); Sat, 28 Apr 2018 11:39:29 +0000 (UTC) References: <87efj1wu0c.fsf@cbaines.net> User-agent: mu4e 1.0; emacs 25.3.1 From: =?utf-8?Q?Cl=C3=A9ment?= Lassieur To: Christopher Baines Subject: Re: [bug#31277] [PATCH] cgit changes In-reply-to: <87efj1wu0c.fsf@cbaines.net> Date: Sat, 28 Apr 2018 13:39:29 +0200 Message-ID: <87fu3fimq6.fsf@lassieur.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 31277 Cc: 31277@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Oh, and please could you add copyright lines? Thanks! Clément From debbugs-submit-bounces@debbugs.gnu.org Fri May 18 06:23:43 2018 Received: (at 31277) by debbugs.gnu.org; 18 May 2018 10:23:43 +0000 Received: from localhost ([127.0.0.1]:39179 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fJcY3-00043H-1H for submit@debbugs.gnu.org; Fri, 18 May 2018 06:23:43 -0400 Received: from li622-129.members.linode.com ([212.71.249.129]:38850 helo=mira.cbaines.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fJcY1-00042w-Es for 31277@debbugs.gnu.org; Fri, 18 May 2018 06:23:42 -0400 Received: by mira.cbaines.net (Postfix, from userid 113) id 9968D162BD; Fri, 18 May 2018 11:23:40 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.0 Received: from localhost (cpc102582-walt20-2-0-cust14.13-2.cable.virginm.net [86.27.34.15]) by mira.cbaines.net (Postfix) with ESMTPSA id 32F1616297 for <31277@debbugs.gnu.org>; Fri, 18 May 2018 11:23:40 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 5beb1d36 for <31277@debbugs.gnu.org>; Fri, 18 May 2018 10:23:39 +0000 (UTC) From: Christopher Baines To: 31277@debbugs.gnu.org Subject: [PATCH 3/3] services: cgit: Make project-list permit a file-object. Date: Fri, 18 May 2018 11:23:39 +0100 Message-Id: <20180518102339.26480-3-mail@cbaines.net> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180518102339.26480-1-mail@cbaines.net> References: <20180518102339.26480-1-mail@cbaines.net> X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 31277 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Instead of having the service manage the list, it's useful to be able to point this at an existing file, for example, when using cgit together with gitolite. * gnu/services/cgit.scm (project-list?): New procedure. (serialize-project-list): Handle file-object values. (): Change the predicate for project-list to allow lists and file-objects. --- doc/guix.texi | 2 +- gnu/services/cgit.scm | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 005c0597a..81ad4f48f 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -19241,7 +19241,7 @@ Defaults to @samp{#f}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} list project-list +@deftypevr {@code{cgit-configuration} parameter} project-list project-list A list of subdirectories inside of @code{repository-directory}, relative to it, that should loaded as Git repositories. An empty list means that all subdirectories will be loaded. diff --git a/gnu/services/cgit.scm b/gnu/services/cgit.scm index 3183535d4..3289d3733 100644 --- a/gnu/services/cgit.scm +++ b/gnu/services/cgit.scm @@ -116,6 +116,10 @@ (define (serialize-file-object field-name val) (serialize-string field-name val)) +(define (project-list? val) + (or (list? val) + (file-object? val))) + ;;; ;;; Serialize @@ -168,7 +172,9 @@ (if (null? val) "" (serialize-field 'project-list - (plain-file "project-list" (string-join val "\n"))))) + (if (file-object? val) + val + (plain-file "project-list" (string-join val "\n")))))) (define (serialize-extra-options extra-options) (string-join extra-options "\n" 'suffix)) @@ -547,7 +553,7 @@ disabled.") "Flag which, when set to @samp{#t}, will make cgit omit the standard header on all pages.") (project-list - (list '()) + (project-list '()) "A list of subdirectories inside of @code{repository-directory}, relative to it, that should loaded as Git repositories. An empty list means that all subdirectories will be loaded.") -- 2.17.0 From debbugs-submit-bounces@debbugs.gnu.org Fri May 18 06:23:43 2018 Received: (at 31277) by debbugs.gnu.org; 18 May 2018 10:23:43 +0000 Received: from localhost ([127.0.0.1]:39181 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fJcY3-00043J-9F for submit@debbugs.gnu.org; Fri, 18 May 2018 06:23:43 -0400 Received: from li622-129.members.linode.com ([212.71.249.129]:38852 helo=mira.cbaines.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fJcY1-00042x-LB for 31277@debbugs.gnu.org; Fri, 18 May 2018 06:23:42 -0400 Received: by mira.cbaines.net (Postfix, from userid 113) id 77D00162BE; Fri, 18 May 2018 11:23:40 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,UNPARSEABLE_RELAY, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from localhost (cpc102582-walt20-2-0-cust14.13-2.cable.virginm.net [86.27.34.15]) by mira.cbaines.net (Postfix) with ESMTPSA id 154331628E for <31277@debbugs.gnu.org>; Fri, 18 May 2018 11:23:40 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 17c17715 for <31277@debbugs.gnu.org>; Fri, 18 May 2018 10:23:39 +0000 (UTC) From: Christopher Baines To: 31277@debbugs.gnu.org Subject: [PATCH 2/3] services: cgit: Improve handling of extra-options. Date: Fri, 18 May 2018 11:23:38 +0100 Message-Id: <20180518102339.26480-2-mail@cbaines.net> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180518102339.26480-1-mail@cbaines.net> References: <20180518102339.26480-1-mail@cbaines.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 31277 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/services/cgit.scm (serialize-cgit-configuration): Add the extra options, one per line, before the scan-path, as this makes it possible to use the extra-options to affect the global behaviour for repositories. (serialize-extra-options): New procedure. --- gnu/services/cgit.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/services/cgit.scm b/gnu/services/cgit.scm index 8ef12cd5a..3183535d4 100644 --- a/gnu/services/cgit.scm +++ b/gnu/services/cgit.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Oleg Pykhalov ;;; Copyright © 2018 Clément Lassieur +;;; Copyright © 2018 Christopher Baines ;;; ;;; This file is part of GNU Guix. ;;; @@ -169,6 +170,9 @@ 'project-list (plain-file "project-list" (string-join val "\n"))))) +(define (serialize-extra-options extra-options) + (string-join extra-options "\n" 'suffix)) + (define repository-directory? string?) (define (serialize-repository-directory _ val) @@ -641,6 +645,7 @@ for cgit to allow access to that repository.") (define (rest? field) (not (memq (configuration-field-name field) '(project-list + extra-options repository-directory repositories)))) #~(string-append @@ -649,6 +654,8 @@ for cgit to allow access to that repository.") #$(serialize-project-list 'project-list (cgit-configuration-project-list config)) + #$(serialize-extra-options + (cgit-configuration-extra-options config)) #$(serialize-repository-directory 'repository-directory (cgit-configuration-repository-directory config)) -- 2.17.0 From debbugs-submit-bounces@debbugs.gnu.org Fri May 18 06:23:49 2018 Received: (at 31277) by debbugs.gnu.org; 18 May 2018 10:23:49 +0000 Received: from localhost ([127.0.0.1]:39183 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fJcY3-00043Q-Hl for submit@debbugs.gnu.org; Fri, 18 May 2018 06:23:49 -0400 Received: from li622-129.members.linode.com ([212.71.249.129]:38854 helo=mira.cbaines.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fJcY1-00042y-L9 for 31277@debbugs.gnu.org; Fri, 18 May 2018 06:23:42 -0400 Received: by mira.cbaines.net (Postfix, from userid 113) id 45DE616297; Fri, 18 May 2018 11:23:41 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,UNPARSEABLE_RELAY, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from localhost (cpc102582-walt20-2-0-cust14.13-2.cable.virginm.net [86.27.34.15]) by mira.cbaines.net (Postfix) with ESMTPSA id E05E716241 for <31277@debbugs.gnu.org>; Fri, 18 May 2018 11:23:39 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id cdaeee22 for <31277@debbugs.gnu.org>; Fri, 18 May 2018 10:23:39 +0000 (UTC) From: Christopher Baines To: 31277@debbugs.gnu.org Subject: [PATCH 1/3] gnu: cgit: Fix included scripts. Date: Fri, 18 May 2018 11:23:37 +0100 Message-Id: <20180518102339.26480-1-mail@cbaines.net> X-Mailer: git-send-email 2.17.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 31277 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Fix the about-formatting.sh, syntax-highlighting.py and html-converters files. * gnu/packages/version-control.scm (cgit)[arguments]: Include about-formatting.sh and the html-converters in the patch-absolute-file-names phase and add a wrap-python-scripts phase to wrap syntax-highlighting.py and the md2html converter. [inputs]: Add groff, python, python-docutils, python-markdown and python-pygments. --- gnu/packages/version-control.scm | 33 +++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index b41529d4f..f53d0f4fa 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2017 Stefan Reichör ;;; Copyright © 2017 Oleg Pykhalov ;;; Copyright © 2018 Sou Bunnbu +;;; Copyright © 2018 Christopher Baines ;;; ;;; This file is part of GNU Guix. ;;; @@ -551,6 +552,21 @@ collaboration using typical untrusted file hosts or services.") (quoted-file-name (assoc-ref inputs "bzip2") "/bin/bzip2")) (("\"xz\"") (quoted-file-name (assoc-ref inputs "xz") "/bin/xz"))) + + (substitute* "filters/about-formatting.sh" + (("$\\(dirname $0\\)") (string-append (assoc-ref outputs "out") + "/lib/cgit/filters")) + (("\\| tr") (string-append "| " (which "tr")))) + + (substitute* "filters/html-converters/txt2html" + (("sed") (which "sed"))) + + (substitute* "filters/html-converters/man2html" + (("groff") (which "groff"))) + + (substitute* "filters/html-converters/rst2html" + (("rst2html\\.py") (which "rst2html.py"))) + #t)) (delete 'configure) ; no configure script (add-after 'build 'build-man @@ -569,7 +585,17 @@ collaboration using typical untrusted file hosts or services.") ;; to get it stripped. (rename-file (string-append out "/share/cgit/cgit.cgi") (string-append out "/lib/cgit/cgit.cgi")) - #t))))))) + #t)))) + (add-after 'install 'wrap-python-scripts + (lambda* (#:key outputs #:allow-other-keys) + (for-each + (lambda (file) + (wrap-program (string-append (assoc-ref outputs "out") + "/lib/cgit/filters/" file) + `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))))) + '("syntax-highlighting.py" + "html-converters/md2html")) + #t))))) (native-inputs ;; For building manpage. `(("asciidoc" ,asciidoc) @@ -588,6 +614,11 @@ collaboration using typical untrusted file hosts or services.") (base32 "1r2aa19gnrvm2y4fqcvpw1g9l72n48axqmpgv18s6d0y2p72vhzj")))) ("openssl" ,openssl) + ("groff" ,groff) + ("python" ,python) + ("python-docutils" ,python-docutils) + ("python-markdown" ,python-markdown) + ("python-pygments" ,python-pygments) ("zlib" ,zlib))) (home-page "https://git.zx2c4.com/cgit/") (synopsis "Web frontend for git repositories") -- 2.17.0 From debbugs-submit-bounces@debbugs.gnu.org Fri May 18 06:55:57 2018 Received: (at 31277) by debbugs.gnu.org; 18 May 2018 10:55:57 +0000 Received: from localhost ([127.0.0.1]:39195 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fJd3F-00058P-9V for submit@debbugs.gnu.org; Fri, 18 May 2018 06:55:57 -0400 Received: from li622-129.members.linode.com ([212.71.249.129]:38876 helo=mira.cbaines.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fJd3D-00058G-7h for 31277@debbugs.gnu.org; Fri, 18 May 2018 06:55:55 -0400 Received: by mira.cbaines.net (Postfix, from userid 113) id 4464C1628E; Fri, 18 May 2018 11:55:54 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from localhost (cpc102582-walt20-2-0-cust14.13-2.cable.virginm.net [86.27.34.15]) by mira.cbaines.net (Postfix) with ESMTPSA id 8025816241; Fri, 18 May 2018 11:55:52 +0100 (BST) Received: from giedi (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 56d3c9d6; Fri, 18 May 2018 10:55:52 +0000 (UTC) References: <87efj1wu0c.fsf@cbaines.net> <20180426212309.10809-1-mail@cbaines.net> <87h8nvin4g.fsf@lassieur.org> User-agent: mu4e 1.0; emacs 25.3.1 From: Christopher Baines To: =?utf-8?Q?Cl=C3=A9ment?= Lassieur Subject: Re: [bug#31277] [PATCH 1/3] gnu: cgit: Fix included scripts. In-reply-to: <87h8nvin4g.fsf@lassieur.org> Date: Fri, 18 May 2018 11:55:49 +0100 Message-ID: <87lgch44i2.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 31277 Cc: 31277@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Cl=C3=A9ment Lassieur writes: > Christopher Baines writes: > >> Fix the about-formatting.sh, syntax-highlighting.py and html-converters = files. >> >> * gnu/packages/version-control.scm (cgit)[arguments]: Include >> about-formatting.sh and the html-converters in the patch-absolute-file-n= ames >> phase and add a wrap-python-scripts phase to wrap syntax-highlighting.py= and >> the md2html converter. >> [inputs]: Add groff, python, python-docutils, python-markdown and >> python-pygments. >> --- >> gnu/packages/version-control.scm | 32 +++++++++++++++++++++++++++++++- >> 1 file changed, 31 insertions(+), 1 deletion(-) >> ... > Great! LGTM :-) > > Cl=C3=A9ment Thanks for taking a look Cl=C3=A9ment, I've now sent another set of patches with some changes. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAlr+sTVfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9XcEJw//VQXABJ5ORmmXDUDqh3HSyGWER8Je2Cjd48iO4LCvfjvK9ogWHnjKME7p WYn+0CQnKceER8xxpWunI54dOThEjWL52TMk9K2iWP1JMaMq2z5IVlYgoGwb1jqg hJsWEC9LgtSS6CnOhvCQIWK8V/iV31seqQkWQidANloqJJV3YBrEcQziHkZTm7uc h0xkHzdW0lUlOaGIss7FCup5zwW/qVWjbbUBUB0JiGJaSYp6DcitmosEmy10GKyu 6QzkUczzg0IB6XXa6gzM+cG+GmQg4AgYZxwC4UKlEdXTGj3HLmof0fhloTr05LG4 sOM2UjWmnC7JjVbGFV/wljOMFahUxRzoH7k+BMOecAM8ur4Jpcv0te/q1DoCrq/u dFBHYuDGpa67Zr3nV5VydCfUZWxLogeGU1BnHUZcaA0jVO1fLYmwIl84VaUqYlDH YoYroHDImOoYlNHTL2wriy7tcORHfPPEvbMNfyEchWEKEkT7gL9XiVeFS30mrAXx /qylmLGeh8OX8ov9QuMPhN56EYING9qjENA2FU7pPPfgsjPKcVf7xDKwN395AJcM CVKRbooSJcjU8io/MMvNILIdNkQqn0HcpRNZxhoB3OaPr3LqokhMR92Pgj2UiP+/ T5Ssjtqn7hwXZc4gGS3ydzdZy4gkmlP+cuVZkrxAoFaw7UByRyM= =Xdbb -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri May 18 06:56:46 2018 Received: (at 31277) by debbugs.gnu.org; 18 May 2018 10:56:46 +0000 Received: from localhost ([127.0.0.1]:39199 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fJd42-00059r-KJ for submit@debbugs.gnu.org; Fri, 18 May 2018 06:56:46 -0400 Received: from li622-129.members.linode.com ([212.71.249.129]:38884 helo=mira.cbaines.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fJd41-00059k-ED for 31277@debbugs.gnu.org; Fri, 18 May 2018 06:56:45 -0400 Received: by mira.cbaines.net (Postfix, from userid 113) id 0276F1628E; Fri, 18 May 2018 11:56:45 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from localhost (cpc102582-walt20-2-0-cust14.13-2.cable.virginm.net [86.27.34.15]) by mira.cbaines.net (Postfix) with ESMTPSA id A905716241; Fri, 18 May 2018 11:56:44 +0100 (BST) Received: from giedi (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 8b0dd1c2; Fri, 18 May 2018 10:56:44 +0000 (UTC) References: <20180426212309.10809-1-mail@cbaines.net> <20180426212309.10809-2-mail@cbaines.net> <87in8bino7.fsf@lassieur.org> User-agent: mu4e 1.0; emacs 25.3.1 From: Christopher Baines To: =?utf-8?Q?Cl=C3=A9ment?= Lassieur Subject: Re: [bug#31277] [PATCH 2/3] services: cgit: Improve handling of extra-options. In-reply-to: <87in8bino7.fsf@lassieur.org> Date: Fri, 18 May 2018 11:56:44 +0100 Message-ID: <87k1s144gj.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 31277 Cc: 31277@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Cl=C3=A9ment Lassieur writes: > Christopher Baines writes: > >> * gnu/services/cgit.scm (serialize-cgit-configuration): Add the extra op= tions, >> one per line, before the scan-path, as this makes it possible to use the >> extra-options to affect the global behaviour for repositories. >> --- >> gnu/services/cgit.scm | 8 +++++++- >> 1 file changed, 7 insertions(+), 1 deletion(-) >> >> diff --git a/gnu/services/cgit.scm b/gnu/services/cgit.scm >> index 8ef12cd5a..bacd6ca16 100644 >> --- a/gnu/services/cgit.scm >> +++ b/gnu/services/cgit.scm >> @@ -642,13 +642,19 @@ for cgit to allow access to that repository.") >> (not (memq (configuration-field-name field) >> '(project-list >> repository-directory >> - repositories)))) >> + repositories >> + extra-options)))) > > ---^ > Very small nitpick: could you put extra-options between project-list and > repository-directory there? So that the order is the same with what > comes below. Sure, this should be fixed now. >> #~(string-append >> #$(let ((rest (filter rest? cgit-configuration-fields))) >> (serialize-configuration config rest)) >> #$(serialize-project-list >> 'project-list >> (cgit-configuration-project-list config)) >> + #$(string-join >> + (append >> + (cgit-configuration-extra-options config) >> + '("")) >> + "\n") > > Could you put the serialization code in a dedicated function? > (e.g. SERIALIZE-EXTRA-OPTION) So that SERIALIZE-CGIT-CONFIGURATION is > only responsible for the field ordering. Done. > Also, I don't understand why you append '(""). If it's just to make > cgitrc look prettier, I'm not sure it's a good idea. But maybe I missed > something? The '("") was to add an extra newline effectively. I've replaced this by using the 'suffix option of string-join in the updated patch. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAlr+sWxfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9XeMfg//Q3G0JDRriOWoBX51ubpLmqidrDeZ+KmIhpw172nV9QVa7pb22SO9skPL eSmeq14LhY0Slivf/w0k7/0jkfRJBQZyR8aJQ/EFySFKpG6XB6DwVZK0p4ksujOG U6RQ0zoHCYed4Ygxmf+kRKgtUwFWGRuFraCkwjIenaNv4kcXDhSYkbQCl6rGuDKW /JldwjaBMV0O6JOrwgTmtNTMg18ZY2vlo8AfjEJeUbPEw8k7McKBbT39liMydm8o 3FqrBpl29pC1rimdHOrxx4kmCme0UcqsPfT5ZqHJBvQ1/bWYa+awjoE9BOsHKW4u ZXVbtvoalS036SsAJPtMR6NluVs85ukWR2bGTV4vYSc+r5RbqLnY9DqNDlDAz0/K klYq0v3nT0LHe5ZJeqes7niQzLgsjZPM1PbTxQ22Aj1qb+uCgzccVAe4QJ27Ii8J eWdp+ijahUU+uSxid1vbJzTJCuI0f1yacvIj53WV1dhjmWnXtau2ayx9Nv9ZokpD DXXNwkSkTXHENn1sJ92Kk+2dA9DKxT0BocZoErqhoLNHqKqAKLlbFUdsn8T17L2P 7XmaXI6IVqs60BpaB73YQVaW7nUgHxlfvMvL+R24R3lJ60qj9SQySi35vaUH1mLd s54RPotQlBiohjWZ8mqEyE0VUE2RuaezIMDJe1oxt0DKT/siyeU= =n6jj -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri May 18 06:57:09 2018 Received: (at 31277) by debbugs.gnu.org; 18 May 2018 10:57:09 +0000 Received: from localhost ([127.0.0.1]:39203 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fJd4O-0005Am-Ts for submit@debbugs.gnu.org; Fri, 18 May 2018 06:57:09 -0400 Received: from li622-129.members.linode.com ([212.71.249.129]:38894 helo=mira.cbaines.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fJd4N-0005Af-Sd for 31277@debbugs.gnu.org; Fri, 18 May 2018 06:57:08 -0400 Received: by mira.cbaines.net (Postfix, from userid 113) id 6ACE81628E; Fri, 18 May 2018 11:57:07 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from localhost (cpc102582-walt20-2-0-cust14.13-2.cable.virginm.net [86.27.34.15]) by mira.cbaines.net (Postfix) with ESMTPSA id 249DD16241; Fri, 18 May 2018 11:57:07 +0100 (BST) Received: from giedi (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id f9bfea3f; Fri, 18 May 2018 10:57:06 +0000 (UTC) References: <20180426212309.10809-1-mail@cbaines.net> <20180426212309.10809-3-mail@cbaines.net> <8736zfd2er.fsf@lassieur.org> User-agent: mu4e 1.0; emacs 25.3.1 From: Christopher Baines To: =?utf-8?Q?Cl=C3=A9ment?= Lassieur Subject: Re: [bug#31277] [PATCH 3/3] services: cgit: Make project-list permit a string. In-reply-to: <8736zfd2er.fsf@lassieur.org> Date: Fri, 18 May 2018 11:57:06 +0100 Message-ID: <87in7l44fx.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 31277 Cc: 31277@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Cl=C3=A9ment Lassieur writes: > Christopher Baines writes: > >> Instead of having the service manage the list, it's useful to be able to= point >> this at an existing file, for example, when using cgit together with git= olite. >> >> * gnu/services/cgit.scm (project-list?): New procedure. >> (serialize-project-list): Handle string values. >> (): Change the predicate for project-list to allow l= ists >> and strings. > > Hi Christopher, > > Good idea! But could you replace 'string?' with 'file-object?', so that > the file can be in the store? > > And could you update the documentation? There is a helper > (generate-cgit-documentation) that might help you do it. Both should be done now :) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAlr+sYJfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9Xcacw//dP/rUJZDQQZnv3g3mEgEY0xJMK8CWat04UWiOAGC20p5xzUrzsihUVDA 8Zru4p+L+LRKFpxlyM9uBQ2F7/M9dt+Dg8ocewQy2TZopdRBdPHyxypDE4SBY91a 8DZN1U3d/ifbvc2S29A6Emkcjw8g2SwBFsSWpyztkLRooNOcfEnkGEw3YIYX2j3f Llc6FSuDJ4CQJXxe6oKcP/4GSxkUffb32fz41qfJIOOz2O8d32mzOkyFYl9mxcS4 DonAYXulr+t7zw3OJWh9wKuUorp7EkQFThxFPHcBNamf99QXo57f9cKw8Qn1vqHC NokIgACEepaKsl7ZylFYrkBJMTXCz2JRvKu0a7Nyzfg3appQ+fRXYWHCz9RlGqf9 rvo3HDAM8S7DDOf4Wz49bwAlSdbnxqK7qMLHdOHDAc1gbzTW6TcBuQqT7arz4ayv mACVZHYgQ85C1+FN/E/ZrLYgptKpoMmJrR9zNnnaniKCGkeGGBntToSHDnnL3l+j rEeVDe3tDCoLhtDo6t/npyuM1v4DDXcFCGFehLJyGtgyVra9NpedMIDubr+1fDXk Rgy8Kg3SYWkEAt6alI8T3oCYgFFSWjgNGNeW7tl3+JN2xRkcf61wFRyFiUwkQcZM I4/GqNr0B+GZ1I6146oqh+v1OiuWhrum3BvYod0MP52GN0WuYFs= =7YNO -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri May 18 11:49:55 2018 Received: (at 31277) by debbugs.gnu.org; 18 May 2018 15:49:55 +0000 Received: from localhost ([127.0.0.1]:39973 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fJhdj-0005bb-0Y for submit@debbugs.gnu.org; Fri, 18 May 2018 11:49:55 -0400 Received: from mail.lassieur.org ([83.152.10.219]:45850) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fJhdh-0005bR-37 for 31277@debbugs.gnu.org; Fri, 18 May 2018 11:49:53 -0400 Received: from newt (46.218.109.88 [46.218.109.88]) by mail.lassieur.org (OpenSMTPD) with ESMTPSA id 2d7c5a13 (TLSv1.2:ECDHE-RSA-CHACHA20-POLY1305:256:NO); Fri, 18 May 2018 15:49:51 +0000 (UTC) References: <87efj1wu0c.fsf@cbaines.net> <20180426212309.10809-1-mail@cbaines.net> <87h8nvin4g.fsf@lassieur.org> <87lgch44i2.fsf@cbaines.net> User-agent: mu4e 1.0; emacs 25.3.1 From: =?utf-8?Q?Cl=C3=A9ment?= Lassieur To: Christopher Baines Subject: Re: [bug#31277] [PATCH 1/3] gnu: cgit: Fix included scripts. In-reply-to: <87lgch44i2.fsf@cbaines.net> Date: Fri, 18 May 2018 17:49:50 +0200 Message-ID: <87lgch9d5t.fsf@lassieur.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 31277 Cc: 31277@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Christopher Baines writes: > Clément Lassieur writes: > >> Christopher Baines writes: >> >>> Fix the about-formatting.sh, syntax-highlighting.py and html-converters files. >>> >>> * gnu/packages/version-control.scm (cgit)[arguments]: Include >>> about-formatting.sh and the html-converters in the patch-absolute-file-names >>> phase and add a wrap-python-scripts phase to wrap syntax-highlighting.py and >>> the md2html converter. >>> [inputs]: Add groff, python, python-docutils, python-markdown and >>> python-pygments. >>> --- >>> gnu/packages/version-control.scm | 32 +++++++++++++++++++++++++++++++- >>> 1 file changed, 31 insertions(+), 1 deletion(-) >>> > > ... > >> Great! LGTM :-) >> >> Clément > > Thanks for taking a look Clément, I've now sent another set of patches > with some changes. Ok, thank you! LGTM then :-) From debbugs-submit-bounces@debbugs.gnu.org Fri May 18 14:13:11 2018 Received: (at 31277-done) by debbugs.gnu.org; 18 May 2018 18:13:11 +0000 Received: from localhost ([127.0.0.1]:40077 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fJjsN-0000Vr-BY for submit@debbugs.gnu.org; Fri, 18 May 2018 14:13:11 -0400 Received: from li622-129.members.linode.com ([212.71.249.129]:39112 helo=mira.cbaines.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fJjsM-0000Vf-7Q for 31277-done@debbugs.gnu.org; Fri, 18 May 2018 14:13:10 -0400 Received: by mira.cbaines.net (Postfix, from userid 113) id 87ED81630A; Fri, 18 May 2018 19:13:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from localhost (cpc102582-walt20-2-0-cust14.13-2.cable.virginm.net [86.27.34.15]) by mira.cbaines.net (Postfix) with ESMTPSA id E564016305; Fri, 18 May 2018 19:13:08 +0100 (BST) Received: from phact (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 3e251759; Fri, 18 May 2018 18:13:08 +0000 (UTC) References: <87efj1wu0c.fsf@cbaines.net> <20180426212309.10809-1-mail@cbaines.net> <87h8nvin4g.fsf@lassieur.org> <87lgch44i2.fsf@cbaines.net> <87lgch9d5t.fsf@lassieur.org> User-agent: mu4e 1.0; emacs 25.3.1 From: Christopher Baines To: =?utf-8?Q?Cl=C3=A9ment?= Lassieur Subject: Re: [bug#31277] [PATCH 1/3] gnu: cgit: Fix included scripts. In-reply-to: <87lgch9d5t.fsf@lassieur.org> Date: Fri, 18 May 2018 19:13:08 +0100 Message-ID: <87efi8g7d7.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 31277-done Cc: 31277-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Cl=C3=A9ment Lassieur writes: > Christopher Baines writes: > >> Cl=C3=A9ment Lassieur writes: >> >>> Christopher Baines writes: >>> >>>> Fix the about-formatting.sh, syntax-highlighting.py and html-converter= s files. >>>> >>>> * gnu/packages/version-control.scm (cgit)[arguments]: Include >>>> about-formatting.sh and the html-converters in the patch-absolute-file= -names >>>> phase and add a wrap-python-scripts phase to wrap syntax-highlighting.= py and >>>> the md2html converter. >>>> [inputs]: Add groff, python, python-docutils, python-markdown and >>>> python-pygments. >>>> --- >>>> gnu/packages/version-control.scm | 32 +++++++++++++++++++++++++++++++- >>>> 1 file changed, 31 insertions(+), 1 deletion(-) >>>> >> >> ... >> >>> Great! LGTM :-) >>> >>> Cl=C3=A9ment >> >> Thanks for taking a look Cl=C3=A9ment, I've now sent another set of patc= hes >> with some changes. > > Ok, thank you! LGTM then :-) Great, I've pushed these patches now :) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAlr/F7RfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9XfY0g//YRoWTmVqYrNZTk3bA0EFrlkOzdY30idvv8hsv2dqW2CMdygePKYSZivx enG25QPUMlos+SYmOs5kCnoA30m2NE8QXUKpTSdb3PuXRYgLnmn/Bb6+hJ4NRVnH t939qw3etFo/adobKRtccviYDQClKoF7jjLqzkUMSsSA97qkId1d9sO/G/IcJ5Zy o18XBLffDdfW/m5p+Poh7Usd77in+Ft7fn9oE4DfrrRReTixJeL+aRqSIN0QMSg3 FE4v1vzlTPLjzEqKc0VC3+WMw8Rt4mXyKzEn468xv4tnQk4aui349SAanAU+9aLJ 5gMBG8UEOT7fKMpRWTHzT2Qp2lWw9X5/HCxp0fwA5T9Ygq7aTxPcZZCX7MwagDP7 yn9aaSh1bpnAbcXZEbBdvICngzxSyCYctqxVXqndykSp9rSLX237OmZJeO1AA6Er XQaS5R4xIPEoDtgEXObZSMgdArk8MeNeXjW3JNNGuXFr/eJSNrF8Z1pcAdRsAtuO unOeYVhTOaOFq17Q9v57dnKJVWVm7G9JOtjLRRbgUghqJeeseH2jn3KnIRvh7hCG IZZY4aTU0V+oSATqLEax/pESjq7B/Hpz3UP7p7ye+yHG9HPpTT9cAKe1/vThYTiB rQT4l4z2xl+UeTEkF4FY/gGNTUN3tQXve9TvxvthgoIdUqSPxaU= =z7DY -----END PGP SIGNATURE----- --=-=-=-- From unknown Sun Jun 15 08:55:07 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 16 Jun 2018 11:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator