GNU bug report logs -
#60824
[PATCH core-updates] Update and wrap perl-xml-xpath.
Previous Next
Reported by: Bruno Victal <mirai <at> makinata.eu>
Date: Sun, 15 Jan 2023 01:22:02 UTC
Severity: normal
Tags: patch
Done: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 60824 in the body.
You can then email your comments to 60824 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
Report forwarded
to
guix-patches <at> gnu.org
:
bug#60824
; Package
guix-patches
.
(Sun, 15 Jan 2023 01:22:02 GMT)
Full text and
rfc822 format available.
Acknowledgement sent
to
Bruno Victal <mirai <at> makinata.eu>
:
New bug report received and forwarded. Copy sent to
guix-patches <at> gnu.org
.
(Sun, 15 Jan 2023 01:22:02 GMT)
Full text and
rfc822 format available.
Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/xml.scm (perl-xml-xpath)[arguments]: Wrap xpath.
[description]: Document xpath command presence.
---
gnu/packages/xml.scm | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index b5065f9f30..7fdc3a2e32 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -33,6 +33,7 @@
;;; Copyright © 2021 Guillaume Le Vaillant <glv <at> posteo.net>
;;; Copyright © 2021 David Larsson <david.larsson <at> selfhosted.xyz>
;;; Copyright © 2021 Matthew James Kraai <kraai <at> ftbfs.org>
+;;; Copyright © 2023 Bruno Victal <mirai <at> makinata.eu>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1050,6 +1051,16 @@ (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 _
+ (wrap-program (string-append #$output "/bin/xpath")
+ `("PERL5LIB" ":" prefix
+ ,(cons (string-append #$output "/lib/perl5/site_perl")
+ (string-split (getenv "PERL5LIB") #\:)))))))))
(native-inputs
(list perl-path-tiny))
(propagated-inputs
@@ -1059,7 +1070,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: fb3085e80fd3d4559057b60d9e2c1c1f1ff51022
--
2.38.1
Information forwarded
to
guix-patches <at> gnu.org
:
bug#60824
; Package
guix-patches
.
(Sun, 15 Jan 2023 01:24:02 GMT)
Full text and
rfc822 format available.
Message #8 received at 60824 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/xml.scm (perl-xml-xpath): Update to 1.48.
---
gnu/packages/xml.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 7fdc3a2e32..e022932782 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -1042,14 +1042,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
--
2.38.1
Information forwarded
to
guix-patches <at> gnu.org
:
bug#60824
; Package
guix-patches
.
(Sat, 06 May 2023 16:08:02 GMT)
Full text and
rfc822 format available.
Message #11 received at 60824 <at> debbugs.gnu.org (full text, mbox):
Patch still applies to master (1cb0dee3a31c6d235389d4d9787fa583c2babc30)
Information forwarded
to
guix-patches <at> gnu.org
:
bug#60824
; Package
guix-patches
.
(Thu, 18 May 2023 17:34:01 GMT)
Full text and
rfc822 format available.
Message #14 received at 60824 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/xml.scm (perl-xml-xpath)[arguments]: Wrap xpath.
[description]: Document xpath command presence.
---
gnu/packages/xml.scm | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 2bc4f66c01..3c94937f49 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -33,6 +33,7 @@
;;; Copyright © 2021 Guillaume Le Vaillant <glv <at> posteo.net>
;;; Copyright © 2021 David Larsson <david.larsson <at> selfhosted.xyz>
;;; Copyright © 2021 Matthew James Kraai <kraai <at> ftbfs.org>
+;;; Copyright © 2023 Bruno Victal <mirai <at> makinata.eu>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1044,6 +1045,16 @@ (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 _
+ (wrap-program (string-append #$output "/bin/xpath")
+ `("PERL5LIB" ":" prefix
+ ,(cons (string-append #$output "/lib/perl5/site_perl")
+ (string-split (getenv "PERL5LIB") #\:)))))))))
(native-inputs
(list perl-path-tiny))
(propagated-inputs
@@ -1053,7 +1064,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: 5b700945fb0b33eec410de8979cae2fbf0d4f118
--
2.39.2
Information forwarded
to
guix-patches <at> gnu.org
:
bug#60824
; Package
guix-patches
.
(Thu, 18 May 2023 17:34:02 GMT)
Full text and
rfc822 format available.
Message #17 received at 60824 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/xml.scm (perl-xml-xpath): Update to 1.48.
---
gnu/packages/xml.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 3c94937f49..c1cc561ccd 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
--
2.39.2
Information forwarded
to
guix-patches <at> gnu.org
:
bug#60824
; Package
guix-patches
.
(Sat, 27 May 2023 18:14:01 GMT)
Full text and
rfc822 format available.
Message #20 received at 60824 <at> debbugs.gnu.org (full text, mbox):
* 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 <glv <at> posteo.net>
;;; Copyright © 2021 David Larsson <david.larsson <at> selfhosted.xyz>
;;; Copyright © 2021 Matthew James Kraai <kraai <at> ftbfs.org>
+;;; Copyright © 2023 Bruno Victal <mirai <at> makinata.eu>
;;;
;;; 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
Information forwarded
to
guix-patches <at> gnu.org
:
bug#60824
; Package
guix-patches
.
(Sat, 27 May 2023 18:33:02 GMT)
Full text and
rfc822 format available.
Message #23 received at 60824 <at> debbugs.gnu.org (full text, mbox):
* 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 ec622cec63..5f0290d007 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
@@ -1068,7 +1068,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")
--
2.39.2
Information forwarded
to
maxim.cournoyer <at> gmail.com, guix-patches <at> gnu.org
:
bug#60824
; Package
guix-patches
.
(Thu, 24 Aug 2023 16:08:02 GMT)
Full text and
rfc822 format available.
Message #26 received at 60824 <at> debbugs.gnu.org (full text, mbox):
Notable changes since v3:
* Rebased against core-updates.
* Use search-path-as-list for wrapping.
Bruno Victal (2):
gnu: perl-xml-xpath: Wrap xpath command.
gnu: perl-xml-xpath: Update to 1.48.
gnu/packages/xml.scm | 28 ++++++++++++++++++++++++----
1 file changed, 24 insertions(+), 4 deletions(-)
base-commit: c365cc69881f3aec633b88ba22c7fe8faec3597e
--
2.41.0
Information forwarded
to
guix-patches <at> gnu.org
:
bug#60824
; Package
guix-patches
.
(Thu, 24 Aug 2023 16:10:02 GMT)
Full text and
rfc822 format available.
Message #29 received at 60824 <at> debbugs.gnu.org (full text, mbox):
* 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 <glv <at> posteo.net>
;;; Copyright © 2021 David Larsson <david.larsson <at> selfhosted.xyz>
;;; Copyright © 2021 Matthew James Kraai <kraai <at> ftbfs.org>
+;;; Copyright © 2023 Bruno Victal <mirai <at> makinata.eu>
;;;
;;; 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
Information forwarded
to
guix-patches <at> gnu.org
:
bug#60824
; Package
guix-patches
.
(Thu, 24 Aug 2023 16:10:02 GMT)
Full text and
rfc822 format available.
Message #32 received at 60824 <at> debbugs.gnu.org (full text, mbox):
* 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")
--
2.40.1
Changed bug title to '[PATCH core-updates] Update and wrap perl-xml-xpath.' from '[PATCH 1/2] gnu: perl-xml-xpath: Wrap xpath command.'
Request was from
Bruno Victal <mirai <at> makinata.eu>
to
control <at> debbugs.gnu.org
.
(Sat, 23 Sep 2023 14:17:01 GMT)
Full text and
rfc822 format available.
Information forwarded
to
guix-patches <at> gnu.org
:
bug#60824
; Package
guix-patches
.
(Mon, 09 Oct 2023 13:17:02 GMT)
Full text and
rfc822 format available.
Message #37 received at 60824 <at> debbugs.gnu.org (full text, mbox):
Hello,
Bruno Victal <mirai <at> makinata.eu> writes:
> Notable changes since v3:
> * Rebased against core-updates.
> * Use search-path-as-list for wrapping.
>
> Bruno Victal (2):
> gnu: perl-xml-xpath: Wrap xpath command.
> gnu: perl-xml-xpath: Update to 1.48.
>
> gnu/packages/xml.scm | 28 ++++++++++++++++++++++++----
> 1 file changed, 24 insertions(+), 4 deletions(-)
LGTM!
--
Thanks,
Maxim
bug closed, send any further explanations to
60824 <at> debbugs.gnu.org and Bruno Victal <mirai <at> makinata.eu>
Request was from
Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
to
control <at> debbugs.gnu.org
.
(Mon, 09 Oct 2023 14:14:01 GMT)
Full text and
rfc822 format available.
bug archived.
Request was from
Debbugs Internal Request <help-debbugs <at> gnu.org>
to
internal_control <at> debbugs.gnu.org
.
(Tue, 07 Nov 2023 12:24:08 GMT)
Full text and
rfc822 format available.
This bug report was last modified 142 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.