From patchwork Sat May 27 18:11:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 50362 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 6319B27BBE9; Sat, 27 May 2023 19:14:23 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable 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 A3FF527BBE2 for ; Sat, 27 May 2023 19:14:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q2yQY-0005N1-8f; Sat, 27 May 2023 14:14:06 -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 1q2yQV-0005Mr-5T for guix-patches@gnu.org; Sat, 27 May 2023 14:14:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q2yQU-0007Ur-AC for guix-patches@gnu.org; Sat, 27 May 2023 14:14:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q2yQT-00050o-KF for guix-patches@gnu.org; Sat, 27 May 2023 14:14:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#60824] [PATCH v3 1/2] gnu: perl-xml-xpath: Wrap xpath command. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 27 May 2023 18:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60824 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60824@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 60824-submit@debbugs.gnu.org id=B60824.168521123019240 (code B ref 60824); Sat, 27 May 2023 18:14:01 +0000 Received: (at 60824) by debbugs.gnu.org; 27 May 2023 18:13:50 +0000 Received: from localhost ([127.0.0.1]:52551 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q2yQI-00050G-Cl for submit@debbugs.gnu.org; Sat, 27 May 2023 14:13:50 -0400 Received: from smtpm4.myservices.hosting ([185.26.105.235]:32796) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q2yQG-000506-A4 for 60824@debbugs.gnu.org; Sat, 27 May 2023 14:13:49 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm4.myservices.hosting (Postfix) with ESMTP id 6624C20D54 for <60824@debbugs.gnu.org>; Sat, 27 May 2023 20:13:46 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id C2ED58009A; Sat, 27 May 2023 20:13:42 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id C4_46vhrKZzr; Sat, 27 May 2023 20:13:42 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 2563B80098; Sat, 27 May 2023 20:13:42 +0200 (CEST) From: Bruno Victal Date: Sat, 27 May 2023 19:11:28 +0100 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: <024ddbe123ad4d22ca508e1cb998da48fb16338b.1673745598.git.mirai@makinata.eu> References: <024ddbe123ad4d22ca508e1cb998da48fb16338b.1673745598.git.mirai@makinata.eu> 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/xml.scm (perl-xml-xpath)[arguments]: Wrap xpath. Add test for wrapped xpath. [description]: Document xpath command presence. --- Notable changes since v2: * Wrap xpath minimally. * Add a phase to check if the wrapped xpath works. * Add missing test dependency. gnu/packages/xml.scm | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) base-commit: b96b82bcd4bc24529941ff74a91432481f1a71b5 diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 2bc4f66c01..ec622cec63 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -33,6 +33,7 @@ ;;; Copyright © 2021 Guillaume Le Vaillant ;;; Copyright © 2021 David Larsson ;;; Copyright © 2021 Matthew James Kraai +;;; Copyright © 2023 Bruno Victal ;;; ;;; This file is part of GNU Guix. ;;; @@ -1044,6 +1045,28 @@ (define-public perl-xml-xpath (base32 "03yxj7w5a43ibbpiqsvb3lswj2b71dydsx4rs2fw0p8n0l3i3j8w")))) (build-system perl-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'wrap 'wrap-xpath + (lambda _ + (let ((xpath (string-append #$output "/bin/xpath")) + (perl5lib + (list #$@(map (lambda (i) + (file-append (this-package-input i) + "/lib/perl5/site_perl")) + '("perl-xml-parser")) + (string-append #$output + "/lib/perl5/site_perl/" + #$(package-version perl))))) + (wrap-program xpath + `("PERL5LIB" ":" prefix ,perl5lib))))) + (add-after 'wrap-xpath 'check-wrap + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (unsetenv "PERL5LIB") + (invoke/quiet (string-append #$output "/bin/xpath")))))))) (native-inputs (list perl-path-tiny)) (propagated-inputs @@ -1053,7 +1076,7 @@ (define-public perl-xml-xpath (description "This module aims to comply exactly to the @url{XPath specification, https://www.w3.org/TR/xpath} and yet allow extensions to be added in -the form of functions.") +the form of functions. It also provides the command @command{xpath}.") (license license:perl-license))) (define-public pugixml