From 47b6451eb55d74161d6e5899f0079e219cfa8a00 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Fri, 8 Apr 2022 20:32:36 -0700 Subject: gnu: libxmlb: Update to 0.3.8. * gnu/packages/xlm.scm (libxmlb): Update to 0.3.8. --- gnu/packages/xml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/xml.scm') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 49275c3e0c..64092b8d2d 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -88,7 +88,7 @@ (define-module (gnu packages xml) (define-public libxmlb (package (name "libxmlb") - (version "0.1.15") + (version "0.3.8") (source (origin (method git-fetch) @@ -98,7 +98,7 @@ (define-public libxmlb (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1mb73pnfwqc4mm0lm16yfn0lj495h8hcciprb2v6wgy3ifnnjxib")))) + (base32 "0znz2y1ig2kvlda44a3kxa8x7f222nbg50rjz6nlngzka0ccsgxx")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t)) -- cgit v1.2.3 From ee617c4800c84c21a976a36b9f612e5a7d05d9f2 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 15 Apr 2022 15:45:27 +0200 Subject: gnu: python-lxml: Add 4.7.1. * gnu/packages/xml.scm (python-lxml-4.7): New variable. --- gnu/packages/xml.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'gnu/packages/xml.scm') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 64092b8d2d..db004c11b6 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2018, 2019 Ludovic Courtès +;;; Copyright © 2013-2016, 2018-2019, 2022 Ludovic Courtès ;;; Copyright © 2013, 2015 Andreas Enge ;;; Copyright © 2015 Eric Bavier ;;; Copyright © 2015 Sou Bunnbu @@ -2529,6 +2529,18 @@ (define-public python-lxml libxml2 and libxslt.") (license license:bsd-3))) ; and a few more, see LICENSES.txt +(define-public python-lxml-4.7 + (package + (inherit python-lxml) + (version "4.7.1") + (source + (origin + (inherit (package-source python-lxml)) + (uri (pypi-uri "lxml" version)) + (sha256 + (base32 + "090viyanaki4q7w7i000xl0qh4in52bkl3qal55sz2bbm8w3hqd1")))))) + (define-public python2-lxml (package-with-python2 python-lxml)) -- cgit v1.2.3 From bd1f8cdf52c8a93630015d70281817a8cae1aa39 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 10 Apr 2022 21:15:03 -0400 Subject: gnu: Add python-untangle. * gnu/packages/xml.scm (python-untangle): New variable. --- gnu/packages/xml.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages/xml.scm') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index db004c11b6..a0d8d20102 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -72,6 +72,7 @@ (define-module (gnu packages xml) #:use-module (gnu packages tls) #:use-module (gnu packages web) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) @@ -2544,6 +2545,35 @@ (define-public python-lxml-4.7 (define-public python2-lxml (package-with-python2 python-lxml)) +(define-public python-untangle + ;; The latest tagged release is from 2014; use the latest commit. + (let ((revision "1") + (commit "fb916a9621175d000a3b0ca9322d3b3ebf8570c0")) + (package + (name "python-untangle") + ;; PyPI currently offers some untagged 1.1.1 version. + (version (git-version "1.1.1" revision commit)) + (source + (origin + (method git-fetch) ;no tests in pypi archive + (uri (git-reference + (url "https://github.com/stchris/untangle") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0dn2jz9ajncbqx3pdlgqaxmngl6pdiaz03nj8mkddasckdq9lbrh")))) + (build-system python-build-system) + (arguments (list #:phases #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "python" "tests/tests.py"))))))) + (home-page "http://0chris.com/untangle") + (synopsis "XML to Python objects conversion library") + (description "@code{untangle} is a tiny Python library which converts an +XML document to a Python object.") + (license license:expat)))) + (define-public python-xmlschema (package (name "python-xmlschema") -- cgit v1.2.3 From de68877a517ba058f67086d444d7265c9c803679 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sat, 14 May 2022 17:06:48 -0700 Subject: gnu: libxmlb: Install xb-tool in bin dir. * gnu/packages/patches/libxmlb-install-xb-tool-into-bindir.patch: New file. * gnu/packages/xml.scm (libxmlb)[source]: Add patch. * gnu/local.mk (dist_patch_DATA): Add patch. * gnu/packages/diffoscope.scm (diffoscope)[arguments]: Add 'xb-tool-external-tool phase. --- gnu/local.mk | 1 + gnu/packages/diffoscope.scm | 7 ++ .../libxmlb-install-xb-tool-into-bindir.patch | 100 +++++++++++++++++++++ gnu/packages/xml.scm | 4 +- 4 files changed, 111 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/libxmlb-install-xb-tool-into-bindir.patch (limited to 'gnu/packages/xml.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 4ef12fd68e..d5b60bdba3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1426,6 +1426,7 @@ dist_patch_DATA = \ %D%/packages/patches/libxml2-terminating-newline.patch \ %D%/packages/patches/libxml2-xpath-recursion-limit.patch \ %D%/packages/patches/libxml2-xpath0-Add-option-xpath0.patch \ + %D%/packages/patches/libxmlb-install-xb-tool-into-bindir.patch \ %D%/packages/patches/libxslt-generated-ids.patch \ %D%/packages/patches/libxt-guix-search-paths.patch \ %D%/packages/patches/lierolibre-check-unaligned-access.patch \ diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index da4de83373..b4279a3fb5 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -111,6 +111,13 @@ (define-public diffoscope (string-append "['" (which "stat") "',")) (("\\['getfacl',") (string-append "['" (which "getfacl") "',"))))) + (add-after 'unpack 'xb-tool-external-tool + ;; Fixed upstream, remove this phase when updating to + ;; diffoscope 213 + (lambda _ + (substitute* "diffoscope/external_tools.py" + ((".debian.: .libxmlb-dev.") + "\"debian\": \"libxmlb-dev\", \"guix\": \"libxmlb\"")))) (add-after 'build 'build-man-page (lambda* (#:key (make-flags '()) #:allow-other-keys) (apply invoke "make" "-C" "doc" make-flags))) diff --git a/gnu/packages/patches/libxmlb-install-xb-tool-into-bindir.patch b/gnu/packages/patches/libxmlb-install-xb-tool-into-bindir.patch new file mode 100644 index 0000000000..97f0f5fbd3 --- /dev/null +++ b/gnu/packages/patches/libxmlb-install-xb-tool-into-bindir.patch @@ -0,0 +1,100 @@ +From f91a9cfcd70178404ac2aafdfa124c9a4efe8866 Mon Sep 17 00:00:00 2001 +From: Richard Hughes +Date: Mon, 18 Apr 2022 10:50:42 +0100 +Subject: [PATCH 11/11] Install xb-tool into bindir + +Fixes https://github.com/hughsie/libxmlb/issues/123 +--- + contrib/libxmlb.spec.in | 3 ++- + meson.build | 4 +++- + src/meson.build | 9 ++++++++- + src/xb-tool.1 | 19 +++++++++++++++++++ + 4 files changed, 32 insertions(+), 3 deletions(-) + create mode 100644 src/xb-tool.1 + +diff --git a/contrib/libxmlb.spec.in b/contrib/libxmlb.spec.in +index 6be65d1..24478fe 100644 +--- a/contrib/libxmlb.spec.in ++++ b/contrib/libxmlb.spec.in +@@ -71,7 +71,8 @@ Executable and data files for installed tests. + %files + %doc README.md + %license LICENSE +-%{_libexecdir}/xb-tool ++%{_bindir}/xb-tool ++%{_mandir}/man1/xb-tool.1* + %dir %{_libdir}/girepository-1.0 + %{_libdir}/girepository-1.0/Xmlb-2.0.typelib + %{_libdir}/libxmlb.so.2* +diff --git a/meson.build b/meson.build +index 6870907..53b1324 100644 +--- a/meson.build ++++ b/meson.build +@@ -103,16 +103,18 @@ add_project_link_arguments( + ) + + if host_machine.system() == 'windows' +- libexecdir = get_option('libexecdir') ++ bindir = get_option('bindir') + installed_test_bindir = get_option('libexecdir') + installed_test_datadir = get_option('datadir') + else + prefix = get_option('prefix') + datadir = join_paths(prefix, get_option('datadir')) ++ bindir = join_paths(prefix, get_option('bindir')) + libexecdir = join_paths(prefix, get_option('libexecdir')) + installed_test_bindir = join_paths(libexecdir, 'installed-tests', meson.project_name()) + installed_test_datadir = join_paths(datadir, 'installed-tests', meson.project_name()) + endif ++mandir = join_paths(prefix, get_option('mandir')) + + gio = dependency('gio-2.0', version : '>= 2.45.8') + giounix = dependency('gio-unix-2.0', version : '>= 2.45.8', required: false) +diff --git a/src/meson.build b/src/meson.build +index d7a1401..93fb8ba 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -96,7 +96,14 @@ xb_tool = executable( + libxmlb, + ], + install : true, +- install_dir : libexecdir ++ install_dir : bindir ++) ++configure_file( ++ input : 'xb-tool.1', ++ output : 'xb-tool.1', ++ configuration : conf, ++ install: true, ++ install_dir: join_paths(mandir, 'man1'), + ) + endif + +diff --git a/src/xb-tool.1 b/src/xb-tool.1 +new file mode 100644 +index 0000000..348d1b1 +--- /dev/null ++++ b/src/xb-tool.1 +@@ -0,0 +1,19 @@ ++.\" Report problems in https://github.com/hughsie/libxmlb ++.TH man 1 "18 April 2022" @PACKAGE_VERSION@ "xb-tool man page" ++.SH NAME ++xb-tool \- standalone XMLb utility ++.SH SYNOPSIS ++xb-tool [CMD] ++.SH DESCRIPTION ++This tool allows creating, dumping and querying binary XML blobs. ++.PP ++Additionally \fBxb-tool\fR can be used to profile specfic tokenized queries. ++.SH OPTIONS ++The xb-tool command takes various options depending on the action. ++Run \fBxb-tool --help\fR for the full list. ++.SH EXIT STATUS ++Commands that successfully execute will return "0", otherwise "1". ++.SH BUGS ++No known bugs. ++.SH AUTHOR ++Richard Hughes (richard@hughsie.com) +-- +2.35.1 + diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index a0d8d20102..11b0a4ef54 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -99,7 +99,9 @@ (define-public libxmlb (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0znz2y1ig2kvlda44a3kxa8x7f222nbg50rjz6nlngzka0ccsgxx")))) + (base32 "0znz2y1ig2kvlda44a3kxa8x7f222nbg50rjz6nlngzka0ccsgxx")) + ;; Drop xb-tool patch after libxmlb 0.3.8, merged upstream + (patches (search-patches "libxmlb-install-xb-tool-into-bindir.patch")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t)) -- cgit v1.2.3 From 6068b83b82475566acd4162467bcf54270f338f9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 22 May 2022 02:00:02 +0200 Subject: gnu: java-jdom: Update to 2.0.6.1 [fixes CVE-2021-33813]. * gnu/packages/xml.scm (java-jdom): Update to 2.0.6.1. --- gnu/packages/xml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/xml.scm') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 11b0a4ef54..ecc19a7eb8 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -2238,7 +2238,7 @@ (define-public java-jettison (define-public java-jdom2 (package (name "java-jdom") - (version "2.0.6") + (version "2.0.6.1") (source (origin (method git-fetch) (uri (git-reference @@ -2247,7 +2247,7 @@ (define-public java-jdom2 (file-name (git-file-name name version)) (sha256 (base32 - "14vv1kxrsdvwi4cz3rx6r48w5y6fvk9cymil8qhvxwp56xxrgxiq")))) + "1r4pwl0z7hm45v9l2wbq3fjmqi13zmwzbrggyqizrwv31kghhx56")))) (build-system ant-build-system) (arguments `(#:build-target "package" -- cgit v1.2.3 From f162273a2cb730526785ca5edd55b52c82a2ea91 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:50:38 -0400 Subject: gnu: Remove python2-pyxb. * gnu/packages/xml.scm (python2-pyxb): Delete variable. --- gnu/packages/xml.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/xml.scm') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index ecc19a7eb8..6dbcf67d8c 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -1119,9 +1119,6 @@ (define-public python-pyxb license:gpl2 ; bundled jquery in doc is dual MIT/GPL2 license:psfl)))) ; pyxb/utils/activestate.py -(define-public python2-pyxb - (package-with-python2 python-pyxb)) - (define-public xmlto (package (name "xmlto") -- cgit v1.2.3 From 709c0244e45ddfd19cfb318ab63a04c220b33eb7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:50:41 -0400 Subject: gnu: xlsx2csv: Update to 0.7.8. * gnu/packages/xml.scm (xlsx2csv): Update to 0.7.8. [python]: Delete argument. --- gnu/packages/xml.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages/xml.scm') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 6dbcf67d8c..a9bf07de96 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -27,7 +27,7 @@ ;;; Copyright © 2020 Brett Gilio ;;; Copyright © 2020 Pierre Langlois ;;; Copyright © 2021 Michael Rohleder -;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021, 2022 Maxim Cournoyer ;;; Copyright © 2021 Julien Lepiller ;;; Copyright © 2021 Felix Gruber ;;; Copyright © 2021 Guillaume Le Vaillant @@ -1421,7 +1421,7 @@ (define-public html-xml-utils (define-public xlsx2csv (package (name "xlsx2csv") - (version "0.7.4") + (version "0.7.8") (source (origin (method git-fetch) @@ -1430,17 +1430,17 @@ (define-public xlsx2csv (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "168dm6p7w6pvgd87yb9hcxv9y0liv6mxgril202nfva68cp8y939")))) + (base32 "1p10571295f8zw1lsma8k5z07hrk9aspar0lsz8zpgjl7v35zcq7")))) (build-system python-build-system) (arguments - `(#:python ,python-2 ; use python-2 for the test script - #:phases + `(#:phases (modify-phases %standard-phases (replace 'check (lambda _ (substitute* "test/run" ;; Run tests with `python' only. - (("^(PYTHON_VERSIONS = ).*" all m) (string-append m "['']"))) + (("^(PYTHON_VERSIONS = ).*" all m) + (string-append m "['']"))) (invoke "test/run")))))) (home-page "https://github.com/dilshod/xlsx2csv") (synopsis "XLSX to CSV converter") -- cgit v1.2.3 From 41efd94c3e8dca19446906f69a7543abd9a0fa3e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 13 May 2022 11:58:10 -0400 Subject: gnu: Remove python2-lxml. * gnu/packages/xml.scm (python2-lxml): Delete variable. --- gnu/packages/xml.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/xml.scm') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index a9bf07de96..99cb02a09a 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -2541,9 +2541,6 @@ (define-public python-lxml-4.7 (base32 "090viyanaki4q7w7i000xl0qh4in52bkl3qal55sz2bbm8w3hqd1")))))) -(define-public python2-lxml - (package-with-python2 python-lxml)) - (define-public python-untangle ;; The latest tagged release is from 2014; use the latest commit. (let ((revision "1") -- cgit v1.2.3 From afde361377478ad9d2b12467e9e8890f227629bd Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 13 May 2022 15:00:02 -0400 Subject: gnu: Remove python2-libxml2. * gnu/packages/xml.scm (python2-libxml2): Delete variable. --- gnu/packages/xml.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/xml.scm') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 99cb02a09a..c26ca68672 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -345,9 +345,6 @@ (define-public python-libxml2 (inputs `(("libxml2" ,libxml2))) (synopsis "Python bindings for the libxml2 library"))) -(define-public python2-libxml2 - (package-with-python2 python-libxml2)) - (define-public libxslt (package (name "libxslt") -- cgit v1.2.3 From f6eab5abce95fdb5b604764b3b216fe8ba4451bb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 5 Jun 2022 02:00:00 +0200 Subject: gnu: perl-xml-compile-soap: Update to 3.27. * gnu/packages/xml.scm (perl-xml-compile-soap): Update to 3.27. [propagated-inputs]: Replace perl-file-slurp-tiny with perl-file-slurper. --- gnu/packages/xml.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/xml.scm') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index c26ca68672..0ae51d2e2b 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2016, 2017 Nikita -;;; Copyright © 2016–2021 Tobias Geerinckx-Rice +;;; Copyright © 2016–2022 Tobias Geerinckx-Rice ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Marius Bakke ;;; Copyright © 2017 Adriano Peluso ;;; Copyright © 2017 Gregor Giesen @@ -955,17 +955,17 @@ (define-public perl-xml-compile-cache (define-public perl-xml-compile-soap (package (name "perl-xml-compile-soap") - (version "3.24") + (version "3.27") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/M/MA/MARKOV/" "XML-Compile-SOAP-" version ".tar.gz")) (sha256 (base32 - "0pkcph562l2ij7rlwlvm58v6y062qsbydfpaz2qnph2ixqy0xfd1")))) + "1a3650al287x781i3flylwbik1ss3xfw7sgdcaz5qrjqvhpn6mnn")))) (build-system perl-build-system) (propagated-inputs - (list perl-file-slurp-tiny + (list perl-file-slurper perl-libwww perl-log-report perl-xml-compile -- cgit v1.2.3