From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id AMP0BvCA52Q8PwEASxT56A (envelope-from ) for ; Thu, 24 Aug 2023 18:10:24 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id IBugBvCA52Q/PgEAauVa8A (envelope-from ) for ; Thu, 24 Aug 2023 18:10:24 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C520263659 for ; Thu, 24 Aug 2023 18:10:23 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1692893423; a=rsa-sha256; cv=none; b=Z2PeVvzJejxbuKi/5LmvvmRoVqKhivZi+EnNmLSe3QG8heLVqw3KoYvAcldfv7cjh8dv2T w24H2aXHUCdafYpxrPyK2k3q/BmW7ASbaxj3+mbbv2cgNl8KGmSpLQHe7182q14qM1A6D/ KH5jb1kgSMN6ZflyYqOY95eKvD4NuAxJ3HzQ188DP5Z30oN3FbE4OGgjpxLPtXpjTp3fDO U54G3SVZFtCG9JyONvDXHB0Y44cxJRWjZJW8WFQEeTdXTRs0mcxcOqBFyrTPlE8h7x8K8K Yy7Qa+SRIo/smL4pGI34BiVpoMbcF9BKnTiizcxmR/h5LYt7UUSM5dmlIYtkZQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1692893423; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=TCeTHUSBFexVAQ0BIsqCiI1diCRAL4EE3PIkTmGmtkc=; b=foGesY7Sfd2hQ7L3EwaL4zgKqNjnANIcPsH4z1b3n6x7PvL4SLzBhGNWScaD/d5Q6qSN/0 poPNP/u+C1HLiSWDMmROXjatW6SB0uDiyXcWvNY6TfDmjayz58W7QPYCWozviU1BnDgKgR 8qR1dhRZ0SRYn4p69AESn798xAXfVv1j0HzAdsB+WTx+0sk6lB07s4IJEZPYfBS048RJXG iV1TXShf+NC+vMHXng3LdWeUR56oUnM+BBDkmdUa68CMswrB6JZE/mur4JcslH4zNMo9ff msBHTAZSXmXbBajeR8AC5/bp4aBARDaPBWTHw+VJ7+uN9iZBD+D5hk2svMAO+Q== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qZCuF-0001ir-Pa; Thu, 24 Aug 2023 12:09:59 -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 1qZCuE-0001iL-J8 for guix-patches@gnu.org; Thu, 24 Aug 2023 12:09:58 -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 1qZCuE-0002cT-BC for guix-patches@gnu.org; Thu, 24 Aug 2023 12:09:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qZCuI-0002NU-2i for guix-patches@gnu.org; Thu, 24 Aug 2023 12:10:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#60824] [PATCH core-updates v4 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: Thu, 24 Aug 2023 16:10:02 +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.16928933489036 (code B ref 60824); Thu, 24 Aug 2023 16:10:02 +0000 Received: (at 60824) by debbugs.gnu.org; 24 Aug 2023 16:09:08 +0000 Received: from localhost ([127.0.0.1]:38463 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qZCtQ-0002Lf-1H for submit@debbugs.gnu.org; Thu, 24 Aug 2023 12:09:08 -0400 Received: from smtpm2.myservices.hosting ([185.26.105.233]:37210) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qZCtN-0002LT-4Q for 60824@debbugs.gnu.org; Thu, 24 Aug 2023 12:09:06 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm2.myservices.hosting (Postfix) with ESMTP id 2FB3320DD2 for <60824@debbugs.gnu.org>; Thu, 24 Aug 2023 18:08:59 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 6156C8009B; Thu, 24 Aug 2023 18:08:59 +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 JsZIW1V4ZDxJ; Thu, 24 Aug 2023 18:08:58 +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 B39AF8009A; Thu, 24 Aug 2023 18:08:58 +0200 (CEST) From: Bruno Victal Date: Thu, 24 Aug 2023 17:08:56 +0100 Message-Id: <523126c228f088aa1fccf0ed28c47593f94b27bf.1692893331.git.mirai@makinata.eu> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx0.migadu.com X-Spam-Score: -5.21 X-Migadu-Queue-Id: C520263659 X-Migadu-Spam-Score: -5.21 X-TUID: 2CSTEtD8Pnkg * gnu/packages/xml.scm (perl-xml-xpath)[arguments]: Wrap xpath. Add test for wrapped xpath. [description]: Document xpath command presence. --- gnu/packages/xml.scm | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 555f0ab624..ca7aaf29ed 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,25 @@ (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 + (search-path-as-list + '("/lib/perl5/site_perl") + (list #$(this-package-input "perl-xml-parser") + #$output)))) + (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 +1073,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 base-commit: c365cc69881f3aec633b88ba22c7fe8faec3597e -- 2.40.1