Package: guix-patches;
Reported by: Arun Isaac <arunisaac <at> systemreboot.net>
Date: Thu, 17 Aug 2023 13:53:01 UTC
Severity: normal
Tags: patch
Done: Arun Isaac <arunisaac <at> systemreboot.net>
Bug is archived. No further changes may be made.
View this message in rfc822 format
From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Arun Isaac <arunisaac <at> systemreboot.net>, "(" <paren <at> disroot.org>
Cc: 65351 <at> debbugs.gnu.org, jgart <jgart <at> dismail.de>
Subject: [bug#65351] [PATCH 4/7] gnu: cgit: Use G-expressions.
Date: Fri, 18 Aug 2023 19:04:10 +0200
Am Freitag, dem 18.08.2023 um 10:03 +0100 schrieb Arun Isaac:
> * gnu/packages/version-control.scm (cgit)[arguments]: Rewrite using
> G-expressions.
> ---
> gnu/packages/version-control.scm | 120 +++++++++++++++--------------
> --
> 1 file changed, 60 insertions(+), 60 deletions(-)
>
> diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-
> control.scm
> index 73c4d8f2df..e2afd92286 100644
> --- a/gnu/packages/version-control.scm
> +++ b/gnu/packages/version-control.scm
> @@ -1039,66 +1039,66 @@ (define-public cgit
>
> "193d990ym10qlslk0p8mjwp2j6rhqa7fq0y1iff65lvbyv914pss"))))
> (build-system gnu-build-system)
> (arguments
> - '(#:tests? #f ; XXX: fail to build the in-source git.
> - #: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.
> - (invoke "tar" "--strip-components=1" "-C" "git" "-xf"
> - (assoc-ref inputs "git-source"))))
> - (add-after 'unpack 'patch-absolute-file-names
> - (lambda* (#:key inputs #:allow-other-keys)
> - (define (quoted-file-name input path)
> - (string-append "\"" input path "\""))
> - (substitute* "ui-snapshot.c"
> - (("\"gzip\"")
> - (quoted-file-name (assoc-ref inputs "gzip")
> "/bin/gzip"))
> - (("\"bzip2\"")
> - (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")))))
> - (delete 'configure) ; no configure script
> - (add-after 'build 'build-man
> - (lambda* (#:key make-flags #:allow-other-keys)
> - (apply invoke "make" "doc-man" make-flags)))
> - (replace 'install
> - (lambda* (#:key make-flags outputs #:allow-other-keys)
> - (let ((out (assoc-ref outputs "out")))
> - (apply invoke
> - "make" "install" "install-man"
> - (string-append "prefix=" out)
> - (string-append "CGIT_SCRIPT_PATH=" out
> "/share/cgit")
> - make-flags)
> - ;; 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")))))
> - (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)
> - `("GUIX_PYTHONPATH" ":" prefix (,(getenv
> "GUIX_PYTHONPATH")))))
> - '("syntax-highlighting.py"
> - "html-converters/md2html")))))))
> + (list #:tests? #f ; XXX: fail to build the in-source git.
You probably want a line break after list, because you're tending to
the column limit pretty hard.
> + #:test-target "test"
> + #:make-flags #~(list "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.
> + (invoke "tar" "--strip-components=1" "-C" "git"
> "-xf"
> + (assoc-ref inputs "git-source"))))
> + (add-after 'unpack 'patch-absolute-file-names
> + (lambda* (#:key inputs #:allow-other-keys)
> + (define (quoted-file-name input path)
> + (string-append "\"" input path "\""))
> + (substitute* "ui-snapshot.c"
> + (("\"gzip\"")
> + (quoted-file-name (assoc-ref inputs "gzip")
> "/bin/gzip"))
> + (("\"bzip2\"")
> + (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")))))
> + (delete 'configure) ; no configure script
> + (add-after 'build 'build-man
> + (lambda* (#:key make-flags #:allow-other-keys)
> + (apply invoke "make" "doc-man" make-flags)))
> + (replace 'install
> + (lambda* (#:key make-flags outputs #:allow-other-
> keys)
> + (let ((out (assoc-ref outputs "out")))
> + (apply invoke
> + "make" "install" "install-man"
> + (string-append "prefix=" out)
> + (string-append "CGIT_SCRIPT_PATH=" out
> "/share/cgit")
> + make-flags)
> + ;; 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")))))
> + (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)
> + `("GUIX_PYTHONPATH" ":" prefix (,(getenv
> "GUIX_PYTHONPATH")))))
> + '("syntax-highlighting.py"
> + "html-converters/md2html")))))))
> (native-inputs
> `(;; Building cgit requires a Git source tree.
> ("git-source"
Cheers
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.