[bug#60824] [PATCH 1/2] gnu: perl-xml-xpath: Wrap xpath command.

[bug#60824] [PATCH 1/2] gnu: perl-xml-xpath: Wrap xpath command.

[Bruno Victal]

* 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@posteo.net>
 ;;; Copyright © 2021 David Larsson <david.larsson@selfhosted.xyz>
 ;;; Copyright © 2021 Matthew James Kraai <kraai@ftbfs.org>
+;;; Copyright © 2023 Bruno Victal <mirai@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

[bug#60824] [PATCH 2/2] gnu: perl-xml-xpath: Update to 1.48.

[Bruno Victal]

* 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

[bug#60824] bump

[Bruno Victal]

Patch still applies to master (1cb0dee3a31c6d235389d4d9787fa583c2babc30)

[bug#60824] [PATCH v2 1/2] gnu: perl-xml-xpath: Wrap xpath command.

[Bruno Victal]

* 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@posteo.net>
 ;;; Copyright © 2021 David Larsson <david.larsson@selfhosted.xyz>
 ;;; Copyright © 2021 Matthew James Kraai <kraai@ftbfs.org>
+;;; Copyright © 2023 Bruno Victal <mirai@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

[bug#60824] [PATCH v2 2/2] gnu: perl-xml-xpath: Update to 1.48.

[Bruno Victal]

* 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

[bug#60824] [PATCH v3 1/2] gnu: perl-xml-xpath: Wrap xpath command.

[Bruno Victal]

* 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@posteo.net>
 ;;; Copyright © 2021 David Larsson <david.larsson@selfhosted.xyz>
 ;;; Copyright © 2021 Matthew James Kraai <kraai@ftbfs.org>
+;;; Copyright © 2023 Bruno Victal <mirai@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

[bug#60824] [PATCH v3 2/2] gnu: perl-xml-xpath: Update to 1.48.

[Bruno Victal]

* 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

[bug#60824] [PATCH core-updates v4 0/2] Wrap and upgrade perl-xml-xpath

[Bruno Victal]

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

[bug#60824] [PATCH core-updates v4 1/2] gnu: perl-xml-xpath: Wrap xpath command.

[Bruno Victal]

* 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@posteo.net>
 ;;; Copyright © 2021 David Larsson <david.larsson@selfhosted.xyz>
 ;;; Copyright © 2021 Matthew James Kraai <kraai@ftbfs.org>
+;;; Copyright © 2023 Bruno Victal <mirai@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

[bug#60824] [PATCH core-updates v4 2/2] gnu: perl-xml-xpath: Update to 1.48.

[Bruno Victal]

* 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

[bug#60824] [PATCH core-updates] Update and wrap perl-xml-xpath.

[Maxim Cournoyer]

Hello,

Bruno Victal <mirai@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