[bug#31277] [PATCH 1/3] gnu: cgit: Fix included scripts.

[Clément Lassieur]

Christopher Baines <address@hidden> 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