From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id YL52M31IcmTMfwEASxT56A (envelope-from ) for ; Sat, 27 May 2023 20:14:21 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id yPVjM31IcmTd8AAA9RJhRA (envelope-from ) for ; Sat, 27 May 2023 20:14:21 +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 6041E3EB2C for ; Sat, 27 May 2023 20:14:21 +0200 (CEST) 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 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-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1685211261; a=rsa-sha256; cv=none; b=XEzf/AKVEIscEe3ICBvFXWpNFFEdwsTX3ChcOBbbqaW7VL/Z99C4Cugf8BnuXlAb30bPd/ h6Myqv/gJVc2KuMNAlTfrT7/5Ab2S/ZQ+oDTaZXfvyTGGJBzwnurMkaWFbrm3uNh8cAlLD N+VOlth3SRcY/E0iRsqJJvY2FVh4OHAZQKnX8W5IfwtNJBDlnPq4Ulig8u+TCAKHVhDsiN iTw+Ik02W4OGijrIpL4M5NZb6WkMtr7W79CktukHxlXo4JvVL3+XRgH3vyaromUfLlyYTl 5GuTI3JXmKsJ3SckAWyozKjmowzGx8R4PewvZs8dDGbKW4cdrCVHqPtFJz6AYg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1685211261; 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=MRtiyWf/keMvD2y/sJk2fooUUtGx2PWsVSC9kiuOHuI=; b=bmFdgOCq+nrNHRp4NXtrZxx1Bl+bj5HtY6/zC2GaLYA93dtKbDF9pBOA4UpDXFcux3oCXA Z5gOH5voD9vaCOyv89UtATVXnlHD/raT0wpLaHBf0VZM6ILwukb3x+sfabEsTcb7dx/3GA /19Yn22LCyPRwPt67uqGdci0Y3tZddaBjXvHSSipBI7oH6Nf8s+dV6HMKlk5vJv5znJMV6 5LGBBq5hvPQt/pmSc48oDe+3KTbRMPv3fM0P6n8qxmwdzAVez5XVyr8799wktbGDm4C0Li u488nLLWHG+GWZGqa5leI2XuQZ/Sn9zCWSe0f1OF4KsqZ6aVE4lU61wpWxp9pA== X-Migadu-Spam-Score: -3.66 X-Spam-Score: -3.66 X-Migadu-Queue-Id: 6041E3EB2C X-Migadu-Scanner: scn0.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=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" X-TUID: XgjfWqjizic2 * 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(-) 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 base-commit: b96b82bcd4bc24529941ff74a91432481f1a71b5 -- 2.39.2