From: gemmaro <gemmaro.dev@gmail.com>
To: 64983@debbugs.gnu.org
Cc: gemmaro <gemmaro.dev@gmail.com>
Subject: [bug#64983] [PATCH v2 2/4] gnu: highlight: Use new package style.
Date: Mon, 7 Aug 2023 23:05:40 +0900 [thread overview]
Message-ID: <e9533764d884f7006fa4886afc7e39ab46d79bee.1691417142.git.gemmaro.dev@gmail.com> (raw)
In-Reply-To: <cover.1691417142.git.gemmaro.dev@gmail.com>
* gnu/packages/pretty-print.scm (highlight) Use new package style.
[arguments]: Use G-expression. Drop trailing #t from phases.
[source, inputs, native-inputs, description]: Reformat with guix style.
---
gnu/packages/pretty-print.scm | 89 ++++++++++++++++++-----------------
1 file changed, 45 insertions(+), 44 deletions(-)
diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm
index 9896824f01..1b2cf4becf 100644
--- a/gnu/packages/pretty-print.scm
+++ b/gnu/packages/pretty-print.scm
@@ -352,54 +352,55 @@ (define-public highlight
(package
(name "highlight")
(version "4.7")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "http://www.andre-simon.de/zip/highlight-"
- version ".tar.bz2"))
- (sha256
- (base32 "1cl21qpgy92w1x53vrn1bgq84mkh6fgayc9k38mz4xmz2yw01nv1"))))
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "http://www.andre-simon.de/zip/highlight-"
+ version ".tar.bz2"))
+ (sha256
+ (base32
+ "1cl21qpgy92w1x53vrn1bgq84mkh6fgayc9k38mz4xmz2yw01nv1"))))
(build-system gnu-build-system)
(arguments
- `(#:tests? #f ; no tests
- #:make-flags
- (let ((confdir (string-append %output "/share/highlight/config/")))
- (list (string-append "PREFIX=" %output)
- (string-append "HL_CONFIG_DIR=" confdir)
- (string-append "conf_dir=" confdir)))
- #:phases
- (modify-phases %standard-phases
- (delete 'configure) ; no configure script
- (add-after 'unpack 'fix-search-for-lua
- (lambda _
- (substitute* "src/makefile"
- (("(LUA_PKG_NAME=).*" _ assignment)
- (string-append assignment "lua-" ,(version-major+minor
- (package-version lua))
- "\n")))
- (substitute* "extras/swig/makefile"
- (("lua") (string-append "lua-" ,(version-major+minor
- (package-version lua)))))
- #t))
- (add-after 'install 'install-perl-bindings
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((perldir (string-append (assoc-ref outputs "out")
- "/lib/perl5/site_perl/"
- ,(package-version perl)))
- (autodir (string-append perldir "/auto/highlight")))
- (with-directory-excursion "extras/swig"
- (invoke "make" "perl")
- (invoke "perl" "-I" "." "testmod.pl")
- (install-file "highlight.pm" perldir)
- (install-file "highlight.so" autodir))
- #t))))))
- (inputs
- (list lua boost perl))
- (native-inputs
- (list pkg-config swig))
+ (list #:tests? #f ;no tests
+ #:make-flags #~(let ((confdir (string-append %output
+ "/share/highlight/config/")))
+ (list (string-append "PREFIX=" %output)
+ (string-append "HL_CONFIG_DIR=" confdir)
+ (string-append "conf_dir=" confdir)))
+ #:phases #~(modify-phases %standard-phases
+ (delete 'configure) ;no configure script
+ (add-after 'unpack 'fix-search-for-lua
+ (lambda _
+ (substitute* "src/makefile"
+ (("(LUA_PKG_NAME=).*" _ assignment)
+ (string-append assignment "lua-"
+ #$(version-major+minor (package-version
+ lua))
+ "\n")))
+ (substitute* "extras/swig/makefile"
+ (("lua")
+ (string-append "lua-"
+ #$(version-major+minor (package-version
+ lua)))))))
+ (add-after 'install 'install-perl-bindings
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((perldir (string-append (assoc-ref outputs
+ "out")
+ "/lib/perl5/site_perl/"
+ #$(package-version perl)))
+ (autodir (string-append perldir
+ "/auto/highlight")))
+ (with-directory-excursion "extras/swig"
+ (invoke "make" "perl")
+ (invoke "perl" "-I" "." "testmod.pl")
+ (install-file "highlight.pm" perldir)
+ (install-file "highlight.so" autodir))))))))
+ (inputs (list lua boost perl))
+ (native-inputs (list pkg-config swig))
(home-page "http://www.andre-simon.de/doku/highlight/en/highlight.php")
(synopsis "Convert code to documents with syntax highlighting")
- (description "Highlight converts source code to HTML, XHTML, RTF, LaTeX,
+ (description
+ "Highlight converts source code to HTML, XHTML, RTF, LaTeX,
TeX, SVG, BBCode and terminal escape sequences with colored syntax
highlighting. Language definitions and color themes are customizable.")
(license gpl3+)))
--
2.41.0
next prev parent reply other threads:[~2023-08-07 14:17 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-31 23:43 [bug#64983] [PATCH 0/3] gnu: highlight: Update to 4.7 and add GUI package gemmaro
2023-07-31 23:45 ` [bug#64983] [PATCH 1/3] gnu: highlight: Update to 4.7 gemmaro
2023-07-31 23:45 ` [bug#64983] [PATCH 2/3] gnu: highlight: Use new package style gemmaro
2023-07-31 23:45 ` [bug#64983] [PATCH 3/3] gnu: Add highlight-gui gemmaro
2023-08-04 0:42 ` gemmaro
2023-08-07 14:05 ` [bug#64983] [PATCH v2 0/4] gnu: highlight: Add gui output gemmaro
2023-08-07 14:05 ` [bug#64983] [PATCH v2 1/4] gnu: highlight: Update to 4.7 gemmaro
2023-08-07 14:05 ` gemmaro [this message]
2023-08-07 14:05 ` [bug#64983] [PATCH v2 3/4] gnu: highlight: Add gui output gemmaro
2023-08-07 14:05 ` [bug#64983] [PATCH v2 4/4] gnu: highlight: Fix paths for Perl bindings gemmaro
2023-08-14 22:26 ` bug#64983: [PATCH 0/3] gnu: highlight: Update to 4.7 and add GUI package Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e9533764d884f7006fa4886afc7e39ab46d79bee.1691417142.git.gemmaro.dev@gmail.com \
--to=gemmaro.dev@gmail.com \
--cc=64983@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).