From patchwork Mon Aug 7 14:05:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gemmaro X-Patchwork-Id: 52606 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0627627BBEA; Mon, 7 Aug 2023 15:17:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AFDF227BBE2 for ; Mon, 7 Aug 2023 15:17:07 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qT12K-0001Na-Mm; Mon, 07 Aug 2023 10:16:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qT11e-0000Ud-Ux for guix-patches@gnu.org; Mon, 07 Aug 2023 10:16:07 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qT11e-0005jO-LV for guix-patches@gnu.org; Mon, 07 Aug 2023 10:16:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qT11e-0004kj-HS for guix-patches@gnu.org; Mon, 07 Aug 2023 10:16:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64983] [PATCH v2 2/4] gnu: highlight: Use new package style. Resent-From: gemmaro Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Aug 2023 14:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64983 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64983@debbugs.gnu.org Cc: gemmaro Received: via spool by 64983-submit@debbugs.gnu.org id=B64983.169141771418168 (code B ref 64983); Mon, 07 Aug 2023 14:16:02 +0000 Received: (at 64983) by debbugs.gnu.org; 7 Aug 2023 14:15:14 +0000 Received: from localhost ([127.0.0.1]:34041 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qT10r-0004ix-LH for submit@debbugs.gnu.org; Mon, 07 Aug 2023 10:15:14 -0400 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]:55691) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qT10l-0004hx-BD for 64983@debbugs.gnu.org; Mon, 07 Aug 2023 10:15:10 -0400 Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-1bc6624623cso13169905ad.3 for <64983@debbugs.gnu.org>; Mon, 07 Aug 2023 07:15:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691417701; x=1692022501; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=py2n9f3I1+XI2vucN+p2xhRwa6EexOQaP4JsugfFQC8=; b=FeNugh+1FiYwEL+X9MMxi24M1vft4e/xoseYgoz3pY1ujfv1Esoowm20Sm692JQXpW 4eaahn7L78ow+ZgC2I4fuiumbpQrsr+8vsT8n+1719ReDYhVvbgWappEgnb0CpJkltvE 478bXF3pPaKf0Lnq34IgrXz2sD6RRSO760GoiiNs03cn5ZWN/fJ6bqjUgpEZFhwkOKLL lEPWCOuAovzUSaIK7/zorq7Ld8Wrs5g3ljIQoW9sUxUv0aePv2SQQut4AMB7WRka3fEA tCHpLrv1tL6Gb2ohsPV/2kwI3kUnWHaqgFQli8yzcwow34DiHK31P2dhPWU4AMEsNvzm +puw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691417701; x=1692022501; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=py2n9f3I1+XI2vucN+p2xhRwa6EexOQaP4JsugfFQC8=; b=JljdKGHyYGqlSB9mQeh/KrGHxeKzIVBX90Pp4Ndp+9WsRWY5+eshztzN96SUd8tWck ZxlpdEwO1yaSbuVnpy2AxXPBRNl8gvNVjhB+qCRzqis22/+WhQWWO/kUjWWBkzKtyL22 H+UabtBkS+ORpRMPRn+S6aOlajalOuLLejSiqw8Qu+euhXhXYd3ApTkd7o+DW6gPxak5 BTwR3YHGLmLmxBR4iPASOtLbqsYhPhlQT/29yh0ZpD/5y/Y1QPsWuWqIBl/uxFfhsuc4 7k/my31sEHJUOr/2XXPP8k7w6j1LPGJIWwHTquMv9D9RYcsxQPC1UBJDr9CBSoUUAvD3 IQqA== X-Gm-Message-State: AOJu0YynnryMG5SPC7G0bDdoPWWdQz1rreHXY2QS5LGMYsi7+OtAfYMF y5HaKC52DYFDWsfiNnzM24mwG/fgzTg= X-Google-Smtp-Source: AGHT+IGI58U33h52abDliLLwjRT05Ng1RlO6XSW4gzGDIhT32RsHvJTjRxgfCbJar9L/LLeaqiyARw== X-Received: by 2002:a17:903:18c:b0:1bc:532f:1bf8 with SMTP id z12-20020a170903018c00b001bc532f1bf8mr9943398plg.45.1691417701473; Mon, 07 Aug 2023 07:15:01 -0700 (PDT) Received: from mac.gemmaro.name (ONI-202-70-254-104.oninet.ne.jp. [202.70.254.104]) by smtp.gmail.com with ESMTPSA id ja4-20020a170902efc400b001b8013ed362sm6985191plb.96.2023.08.07.07.15.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Aug 2023 07:15:01 -0700 (PDT) From: gemmaro Date: Mon, 7 Aug 2023 23:05:40 +0900 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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+)))