From patchwork Thu Aug 24 16:08:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 53197 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 7CF2127BBEA; Thu, 24 Aug 2023 17:10:24 +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=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 B2E1B27BBE2 for ; Thu, 24 Aug 2023 17:10:23 +0100 (BST) 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 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. --- gnu/packages/xml.scm | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) base-commit: c365cc69881f3aec633b88ba22c7fe8faec3597e 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 From patchwork Thu Aug 24 16:08:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 53196 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 822DF27BBE9; Thu, 24 Aug 2023 17:10:20 +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,URIBL_BLOCKED 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 417D127BBE2 for ; Thu, 24 Aug 2023 17:10:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qZCuF-0001is-PR; 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-0001iM-Lz 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-0002cV-EL 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-0002Nb-Em 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 2/2] gnu: perl-xml-xpath: Update to 1.48. 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.16928933539057 (code B ref 60824); Thu, 24 Aug 2023 16:10:02 +0000 Received: (at 60824) by debbugs.gnu.org; 24 Aug 2023 16:09:13 +0000 Received: from localhost ([127.0.0.1]:38466 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qZCtV-0002M1-G5 for submit@debbugs.gnu.org; Thu, 24 Aug 2023 12:09:13 -0400 Received: from smtpm2.myservices.hosting ([185.26.105.233]:37232) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qZCtT-0002Lq-6u for 60824@debbugs.gnu.org; Thu, 24 Aug 2023 12:09:12 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm2.myservices.hosting (Postfix) with ESMTP id 935C620DD2 for <60824@debbugs.gnu.org>; Thu, 24 Aug 2023 18:09:06 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id D1A788009B; Thu, 24 Aug 2023 18:09:02 +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 NCdsxTYH11ac; Thu, 24 Aug 2023 18:09:02 +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 418D38009A; Thu, 24 Aug 2023 18:09:02 +0200 (CEST) From: Bruno Victal Date: Thu, 24 Aug 2023 17:08:57 +0100 Message-Id: X-Mailer: git-send-email 2.40.1 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/xml.scm (perl-xml-xpath): Update to 1.48. [native-inputs]: Add perl-test-leaktrace. --- gnu/packages/xml.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index ca7aaf29ed..2f33a777cd 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -1036,14 +1036,14 @@ (define-public perl-xml-feed (define-public perl-xml-xpath (package (name "perl-xml-xpath") - (version "1.44") + (version "1.48") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/M/MA/MANWAR/" "XML-XPath-" version ".tar.gz")) (sha256 (base32 - "03yxj7w5a43ibbpiqsvb3lswj2b71dydsx4rs2fw0p8n0l3i3j8w")))) + "1kch6w4zk7rzfimbwakz8qyhjhrvnp97158af0p5p7i3dgimpivv")))) (build-system perl-build-system) (arguments (list @@ -1065,7 +1065,7 @@ (define-public perl-xml-xpath (unsetenv "PERL5LIB") (invoke/quiet (string-append #$output "/bin/xpath")))))))) (native-inputs - (list perl-path-tiny)) + (list perl-path-tiny perl-test-leaktrace)) (propagated-inputs (list perl-xml-parser)) (home-page "https://metacpan.org/release/XML-XPath")