From df4eaca403b7d39cfb14dfad03331a9abec2e7c5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 20 Apr 2021 00:13:32 +0200 Subject: gnu: libxlsxwriter: Update to 1.0.2. * gnu/packages/xml.scm (libxlsxwriter): Update to 1.0.2. --- gnu/packages/xml.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/xml.scm') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 1c34fe499a..db92f1b589 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, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2016–2021 Tobias Geerinckx-Rice ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Marius Bakke ;;; Copyright © 2017 Adriano Peluso ;;; Copyright © 2017 Gregor Giesen @@ -221,7 +221,7 @@ (define-public libxml2 (define-public libxlsxwriter (package (name "libxlsxwriter") - (version "1.0.1") + (version "1.0.2") (source (origin (method git-fetch) @@ -230,7 +230,7 @@ (define-public libxlsxwriter (commit (string-append "RELEASE_" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0dsqv4qdd582fhwj6m80iz50gkyw4m8n9h4mkd2871csa03sbilf")) + (base32 "1snjka62mdqkj9r34kw8wxw2144imb58qx3iahaibg0vxmjjjhsg")) (modules '((guix build utils))) (snippet ;; Remove bundled minizip source -- cgit v1.2.3 From f3eb13df696487a72f48a2aa0675cc65d261bf70 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 22 Apr 2021 02:21:32 +0200 Subject: gnu: libxlsxwriter: Update to 1.0.3. * gnu/packages/xml.scm (libxlsxwriter): Update to 1.0.3. --- 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 db92f1b589..19e7ac07b6 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -221,7 +221,7 @@ (define-public libxml2 (define-public libxlsxwriter (package (name "libxlsxwriter") - (version "1.0.2") + (version "1.0.3") (source (origin (method git-fetch) @@ -230,7 +230,7 @@ (define-public libxlsxwriter (commit (string-append "RELEASE_" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1snjka62mdqkj9r34kw8wxw2144imb58qx3iahaibg0vxmjjjhsg")) + (base32 "14c5rgx87nhzasr0j7mcfr1w7ifz0gmdiqy2xq59di5xvcdrpxpv")) (modules '((guix build utils))) (snippet ;; Remove bundled minizip source -- cgit v1.2.3 From c242052e295af8a0f2b48aaacbdf4de0a21f8e4a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 23 Apr 2021 18:17:20 +0200 Subject: gnu: xmlsec: Update to 1.2.32. * gnu/packages/xml.scm (xmlsec): Update to 1.2.32. --- 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 19e7ac07b6..04cb09779b 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -1210,14 +1210,14 @@ (define-public xmlto (define-public xmlsec (package (name "xmlsec") - (version "1.2.31") + (version "1.2.32") (source (origin (method url-fetch) (uri (string-append "https://www.aleksey.com/xmlsec/download/" "xmlsec1-" version ".tar.gz")) (sha256 (base32 - "09hbbaz2d9hw645q27apkjs1mdr6vd85x5z3c9hzgr1iri9bq44v")))) + "0hy0nwz57n9r5wwab9xa66gzwlwvzs54nhlfn3jh8q13acl710z3")))) (build-system gnu-build-system) (propagated-inputs ; according to xmlsec1.pc `(("libxml2" ,libxml2) -- cgit v1.2.3 From 9c3986ffafad113be1cc9061d1f6c56ef1a06647 Mon Sep 17 00:00:00 2001 From: Simon Josefsson Date: Mon, 3 May 2021 13:49:33 +0200 Subject: gnu: Add xmlsec-openssl. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xml.scm (xmlsec-openssl): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/xml.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu/packages/xml.scm') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 04cb09779b..931698a575 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -1253,6 +1253,14 @@ (define-public xmlsec-nss '(#:configure-flags '("--disable-md5"))) (synopsis "XML Security Library (using NSS instead of GnuTLS)"))) +(define-public xmlsec-openssl + (package/inherit xmlsec + (name "xmlsec-openssl") + (inputs + `(("openssl" ,openssl) + ("libltdl" ,libltdl))) + (synopsis "XML Security Library (using OpenSSL instead of GnuTLS)"))) + (define-public minixml (package (name "minixml") -- cgit v1.2.3 From d592ee27a814da1026bb6d742298d6bbf9cefcd3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 18 May 2021 22:24:52 +0300 Subject: gnu: perl-xml-compile: Remove unneeded input. * gnu/packages/xml.scm (perl-xml-compile)[propagated-inputs]: Remove perl-carp. --- gnu/packages/xml.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages/xml.scm') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 931698a575..05cbb74fcf 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -962,8 +962,7 @@ (define-public perl-xml-compile "0psr5pwsk2biz2bfkigmx04v2rfhs6ybwcfmcrrg7gvh9bpp222b")))) (build-system perl-build-system) (propagated-inputs - `(("perl-carp" ,perl-carp) - ("perl-log-report" ,perl-log-report) + `(("perl-log-report" ,perl-log-report) ("perl-xml-compile-tester" ,perl-xml-compile-tester) ("perl-xml-libxml" ,perl-xml-libxml) ("perl-scalar-list-utils" ,perl-scalar-list-utils) -- cgit v1.2.3 From e2fbf29e6de80b0e5f62615f8c2f9b211a6eb604 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 18 May 2021 22:43:57 +0300 Subject: gnu: perl-xml-atom: Update to 0.43. * gnu/packages/xml.scm (perl-xml-atom): Update to 0.43. --- gnu/packages/xml.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/xml.scm') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 05cbb74fcf..26d306f8dd 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2015 Sou Bunnbu ;;; Copyright © 2015, 2016, 2017, 2018, 2020 Ricardo Wurmus ;;; Copyright © 2015, 2016, 2017 Mark H Weaver -;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018, 2021 Efraim Flashner ;;; Copyright © 2015 Raimon Grau ;;; Copyright © 2016 Mathieu Lirzin ;;; Copyright © 2016, 2017 Leo Famulari @@ -522,14 +522,14 @@ (define-public perl-graph-readwrite (define-public perl-xml-atom (package (name "perl-xml-atom") - (version "0.42") + (version "0.43") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/M/MI/MIYAGAWA/" "XML-Atom-" version ".tar.gz")) (sha256 (base32 - "1wa8kfy1w4mg7kzxim4whyprkn48a2il6fap0b947zywknw4c6y6")))) + "0b8bpdnvz9sqwjhjkydbzy4karb7nn6i15b8g4mczrznlsb3hnaf")))) (build-system perl-build-system) (arguments `(#:phases -- cgit v1.2.3 From 1c1fbbe56fbffcfcb4a4ca6f0ac57292c81e05fe Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 18 May 2021 22:44:05 +0300 Subject: gnu: perl-xml-libxml-simple: Update to 1.01. * gnu/packages/xml.scm (perl-xml-libxml-simple): Update to 1.01. --- 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 26d306f8dd..40a4ea0e82 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -696,14 +696,14 @@ (define-public perl-xml-libxml (define-public perl-xml-libxml-simple (package (name "perl-xml-libxml-simple") - (version "0.99") + (version "1.01") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/M/MA/MARKOV/" "XML-LibXML-Simple-" version ".tar.gz")) (sha256 (base32 - "0i4ybiqdnvnbfxqslw2y392kvy7i752dl8n99bqiqv5kzk4lbzhl")))) + "19k50d80i9dipsl6ln0f4awv9wmdg0xm3d16z8mngmvh9c8ci66d")))) (build-system perl-build-system) (propagated-inputs `(("perl-file-slurp-tiny" ,perl-file-slurp-tiny) -- cgit v1.2.3 From 5c97a5edbbba34d985d6b3447cf45f961a3f8c34 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 18 May 2021 22:44:06 +0300 Subject: gnu: perl-xml-rss: Update to 1.62. * gnu/packages/xml.scm (perl-xml-rss): Update to 1.62. --- 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 40a4ea0e82..a6d54c6f65 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -762,14 +762,14 @@ (define-public perl-xml-namespacesupport (define-public perl-xml-rss (package (name "perl-xml-rss") - (version "1.61") + (version "1.62") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/S/SH/SHLOMIF/" "XML-RSS-" version ".tar.gz")) (sha256 (base32 - "03f983l2dnkvcw6iyg1s0xmv5wn793d3kvqlshmhm01ibp7ffvzs")))) + "0klb8ghd405pdkmn25lp3i4j2lfydz8w581sk51p3zy788s0c9yk")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build) -- cgit v1.2.3 From 7eb171ab8b2524fe272d9ded8ac6940c25770896 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 18 May 2021 22:44:06 +0300 Subject: gnu: perl-xml-feed: Update to 0.61. * gnu/packages/xml.scm (perl-xml-feed): Update to 0.61. --- 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 a6d54c6f65..fd3ea8c0ae 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -1056,14 +1056,14 @@ (define-public perl-xml-compile-wsdl11 (define-public perl-xml-feed (package (name "perl-xml-feed") - (version "0.59") + (version "0.61") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/D/DA/DAVECROSS/" "XML-Feed-" version ".tar.gz")) (sha256 (base32 - "1z1a88bpy64j42bbyl8acbfl3dn9iaz47gx6clkgy5sbn4kr0kgk")))) + "1zrslg7wz15sm1k28i3gp108cszh062ac24m3ydvr59pwfqs9br6")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build) -- cgit v1.2.3 From b58efbc6611550ad9234163e198ff71ace5306ea Mon Sep 17 00:00:00 2001 From: David Larsson Date: Sat, 15 May 2021 20:52:50 +0200 Subject: gnu: Add libxml2-xpath0. * gnu/packages/patches/libxml2-xpath0-Add-option-xpath0.patch: New file... * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/xml.scm (libxml2-xpath0): New variable. Signed-off-by: Marius Bakke --- gnu/local.mk | 1 + .../patches/libxml2-xpath0-Add-option-xpath0.patch | 129 +++++++++++++++++++++ gnu/packages/xml.scm | 14 +++ 3 files changed, 144 insertions(+) create mode 100644 gnu/packages/patches/libxml2-xpath0-Add-option-xpath0.patch (limited to 'gnu/packages/xml.scm') diff --git a/gnu/local.mk b/gnu/local.mk index e502a6519a..dd68bb5957 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1368,6 +1368,7 @@ dist_patch_DATA = \ %D%/packages/patches/libutils-remove-damaging-includes.patch \ %D%/packages/patches/libvdpau-va-gl-unbundle.patch \ %D%/packages/patches/libvpx-CVE-2016-2818.patch \ + %D%/packages/patches/libxml2-xpath0-Add-option-xpath0.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/patches/libxml2-xpath0-Add-option-xpath0.patch b/gnu/packages/patches/libxml2-xpath0-Add-option-xpath0.patch new file mode 100644 index 0000000000..e83642eb37 --- /dev/null +++ b/gnu/packages/patches/libxml2-xpath0-Add-option-xpath0.patch @@ -0,0 +1,129 @@ +This patch adds an "--xpath0" option to xmllint so that NUL characters +can be used as separators. + +See . + +diff --git a/doc/xmllint.xml b/doc/xmllint.xml +--- a/doc/xmllint.xml ++++ b/doc/xmllint.xml +@@ -70,6 +70,7 @@ + + + ++ + + + +@@ -537,6 +538,21 @@ + node set is serialized in full in the output. In case + of an empty node set the "XPath set is empty" result + will be shown and an error exit code will be returned. ++ Results are separated by the newline character. ++ ++ ++ ++ ++ ++ ++ ++ ++ Run an XPath expression given as argument and print the ++ result. In case of a nodeset result, each node in the ++ node set is serialized in full in the output. In case ++ of an empty node set the "XPath set is empty" result ++ will be shown and an error exit code will be returned. ++ Results are separated by the null character. + + + +diff --git a/xmllint.c b/xmllint.c +--- a/xmllint.c ++++ b/xmllint.c +@@ -194,6 +194,7 @@ static int sax1 = 0; + #endif /* LIBXML_SAX1_ENABLED */ + #ifdef LIBXML_XPATH_ENABLED + static const char *xpathquery = NULL; ++static const char *xpathsep = "\n"; + #endif + static int options = XML_PARSE_COMPACT | XML_PARSE_BIG_LINES; + static int sax = 0; +@@ -2095,7 +2096,7 @@ static void doXPathDump(xmlXPathObjectPtr cur) { + for (i = 0;i < cur->nodesetval->nodeNr;i++) { + node = cur->nodesetval->nodeTab[i]; + xmlNodeDumpOutput(buf, NULL, node, 0, 0, NULL); +- xmlOutputBufferWrite(buf, 1, "\n"); ++ xmlOutputBufferWrite(buf, 1, xpathsep); + } + xmlOutputBufferClose(buf); + #else +@@ -2104,27 +2105,27 @@ static void doXPathDump(xmlXPathObjectPtr cur) { + break; + } + case XPATH_BOOLEAN: +- if (cur->boolval) printf("true\n"); +- else printf("false\n"); ++ if (cur->boolval) printf("true%s", xpathsep); ++ else printf("false%s", xpathsep); + break; + case XPATH_NUMBER: + switch (xmlXPathIsInf(cur->floatval)) { + case 1: +- printf("Infinity\n"); ++ printf("Infinity%s", xpathsep); + break; + case -1: +- printf("-Infinity\n"); ++ printf("-Infinity%s", xpathsep); + break; + default: + if (xmlXPathIsNaN(cur->floatval)) { +- printf("NaN\n"); ++ printf("NaN%s", xpathsep); + } else { +- printf("%0g\n", cur->floatval); ++ printf("%0g%s", cur->floatval, xpathsep); + } + } + break; + case XPATH_STRING: +- printf("%s\n", (const char *) cur->stringval); ++ printf("%s%s", (const char *) cur->stringval, xpathsep); + break; + case XPATH_UNDEFINED: + fprintf(stderr, "XPath Object is uninitialized\n"); +@@ -3098,7 +3099,8 @@ static void usage(FILE *f, const char *name) { + fprintf(f, "\t--sax: do not build a tree but work just at the SAX level\n"); + fprintf(f, "\t--oldxml10: use XML-1.0 parsing rules before the 5th edition\n"); + #ifdef LIBXML_XPATH_ENABLED +- fprintf(f, "\t--xpath expr: evaluate the XPath expression, imply --noout\n"); ++ fprintf(f, "\t--xpath expr: evaluate the XPath expression, results are separated by \\n, imply --noout\n"); ++ fprintf(f, "\t--xpath0 expr: evaluate the XPath expression, results are separated by \\0, imply --noout\n"); + #endif + + fprintf(f, "\nLibxml project home page: http://xmlsoft.org/\n"); +@@ -3480,6 +3482,13 @@ main(int argc, char **argv) { + i++; + noout++; + xpathquery = argv[i]; ++ xpathsep = "\n"; ++ } else if ((!strcmp(argv[i], "-xpath0")) || ++ (!strcmp(argv[i], "--xpath0"))) { ++ i++; ++ noout++; ++ xpathquery = argv[i]; ++ xpathsep = "\0"; + #endif + } else if ((!strcmp(argv[i], "-oldxml10")) || + (!strcmp(argv[i], "--oldxml10"))) { +@@ -3712,6 +3721,11 @@ main(int argc, char **argv) { + i++; + continue; + } ++ if ((!strcmp(argv[i], "-xpath0")) || ++ (!strcmp(argv[i], "--xpath0"))) { ++ i++; ++ continue; ++ } + #endif + if ((timing) && (repeat)) + startTimer(); diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index fd3ea8c0ae..ad2e3ec6c9 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -31,6 +31,7 @@ ;;; Copyright © 2021 Julien Lepiller ;;; Copyright © 2021 Felix Gruber ;;; Copyright © 2021 Guillaume Le Vaillant +;;; Copyright © 2021 David Larsson ;;; ;;; This file is part of GNU Guix. ;;; @@ -218,6 +219,19 @@ (define-public libxml2 project (but it is usable outside of the Gnome platform).") (license license:x11))) +(define-public libxml2-xpath0 + (package/inherit libxml2 + (name "libxml2-xpath0") + (source (origin + (inherit (package-source libxml2)) + (patches (append (search-patches + "libxml2-xpath0-Add-option-xpath0.patch") + (origin-patches (package-source libxml2)))))) + (description + "Libxml2-xpath0 is like libxml2 but with a patch applied that +provides an @code{--xpath0} option to @command{xmllint} that enables it +to output XPath results with a null delimiter."))) + (define-public libxlsxwriter (package (name "libxlsxwriter") -- cgit v1.2.3 From 6d71f6a73cd27d61d3302b9658893428af6314d2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 23 May 2021 14:22:16 +0200 Subject: gnu: expat: Replace with 2.4.1 [fixes CVE-2013-0340]. * gnu/packages/xml.scm (expat-2.4.1): New variable. (expat)[replacement]: New field. Co-authored-by: Leo Famulari --- gnu/packages/xml.scm | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'gnu/packages/xml.scm') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index ad2e3ec6c9..9743086b1e 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2016, 2017 Nikita ;;; Copyright © 2016–2021 Tobias Geerinckx-Rice -;;; Copyright © 2016, 2017, 2018, 2019, 2020 Marius Bakke +;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Marius Bakke ;;; Copyright © 2017 Adriano Peluso ;;; Copyright © 2017 Gregor Giesen ;;; Copyright © 2017 Alex Vong @@ -121,6 +121,7 @@ (define-public expat (package (name "expat") (version "2.2.9") + (replacement expat-2.4.1) (source (let ((dot->underscore (lambda (c) (if (char=? #\. c) #\_ c)))) (origin (method url-fetch) @@ -144,6 +145,24 @@ (define-public expat things the parser might find in the XML document (like start tags).") (license license:expat))) +;; Replacement package to fix CVE-2013-0340. +(define expat-2.4.1 + (package + (inherit expat) + (version "2.4.1") + (source (let ((dot->underscore (lambda (c) (if (char=? #\. c) #\_ c)))) + (origin + (method url-fetch) + (uri (list (string-append "mirror://sourceforge/expat/expat/" + version "/expat-" version ".tar.xz") + (string-append + "https://github.com/libexpat/libexpat/releases/download/R_" + (string-map dot->underscore version) + "/expat-" version ".tar.xz"))) + (sha256 + (base32 + "0spvyb9d3hijs4ys3x64cfmilsynl8kv6clfahv8d4lvp86js0yg"))))))) + (define-public libebml (package (name "libebml") -- cgit v1.2.3 From 2d80844e122282f1fc599cb8e1856caa3bcbaa4c Mon Sep 17 00:00:00 2001 From: Matthew James Kraai Date: Sun, 6 Jun 2021 22:14:38 -0700 Subject: gnu: perl-xml-feed: Update to 0.63. * gnu/packages/xml.scm (perl-xml-feed): Update to 0.63. Signed-off-by: Efraim Flashner --- gnu/packages/xml.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/xml.scm') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 9743086b1e..9ddd02a613 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -32,6 +32,7 @@ ;;; Copyright © 2021 Felix Gruber ;;; Copyright © 2021 Guillaume Le Vaillant ;;; Copyright © 2021 David Larsson +;;; Copyright © 2021 Matthew James Kraai ;;; ;;; This file is part of GNU Guix. ;;; @@ -1089,14 +1090,14 @@ (define-public perl-xml-compile-wsdl11 (define-public perl-xml-feed (package (name "perl-xml-feed") - (version "0.61") + (version "0.63") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/D/DA/DAVECROSS/" "XML-Feed-" version ".tar.gz")) (sha256 (base32 - "1zrslg7wz15sm1k28i3gp108cszh062ac24m3ydvr59pwfqs9br6")))) + "04frqhikmyq0i9ldraisbvppyjhqg6gz83l2rqpmp4f2h9n9k2lw")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build) -- cgit v1.2.3 From 483f537081b9b5ccf026373d6743761aba6946e3 Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Sun, 6 Jun 2021 19:55:50 -0400 Subject: doc, gnu, guix: Fix typos. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * doc/guix.texi: Fix various typos and reword a sentence. * gnu/packages/cpp.scm (cpplint)[description]: Fix typo. * gnu/packages/dns.scm (ldns): Fix typo in comment. * gnu/packages/games.scm (yamagi-quake2): Fix typo in comment. * gnu/packages/qt.scm (python-pyqtwebengine): Fix typo in comment. * gnu/packages/rails.scm (ruby-autoprefixer-rails): Fix typo in comment. * gnu/packages/syndication.scm (quiterss)[description]: Fix typo. * gnu/packages/terminals.scm (kmscon): Fix typo in comment. * gnu/packages/xml.scm (perl-xml-sax-base)[description]: Fix typo. (python-elementpath)[description]: Fix typo. * guix/build/asdf-build-system.scm (output-translation): Fix typo in docstring. Signed-off-by: Ludovic Courtès --- doc/guix.texi | 8 ++++---- gnu/packages/cpp.scm | 2 +- gnu/packages/dns.scm | 2 +- gnu/packages/games.scm | 2 +- gnu/packages/qt.scm | 2 +- gnu/packages/rails.scm | 4 ++-- gnu/packages/syndication.scm | 2 +- gnu/packages/terminals.scm | 2 +- gnu/packages/xml.scm | 4 ++-- guix/build/asdf-build-system.scm | 3 +-- 10 files changed, 15 insertions(+), 16 deletions(-) (limited to 'gnu/packages/xml.scm') diff --git a/doc/guix.texi b/doc/guix.texi index 59b4ac11b4..e7c783bd95 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -7807,7 +7807,7 @@ MbedTLS package: Some older packages that aren't using @file{Package.toml} yet, will require this file to be created, too. The function @code{julia-create-package-toml} helps creating the file. You need to pass the outputs and the source of the -package, it's name (the same as the @code{file-name} parameter), the package +package, its name (the same as the @code{file-name} parameter), the package uuid, the package version, and a list of dependencies specified by their name and their uuid. @end defvr @@ -21755,7 +21755,7 @@ Available @code{getmail-options-configuration} fields are: If set to @samp{0}, getmail will only print warnings and errors. A value of @samp{1} means that messages will be printed about retrieving and deleting messages. If set to @samp{2}, getmail will print messages -about each of it's actions. +about each of its actions. Defaults to @samp{1}. @@ -25502,7 +25502,7 @@ directives} for comprehensive documentation on the acceptable @deftp {Data type} php-fpm-dynamic-process-manager-configuration Data Type for the @code{dynamic} php-fpm process manager. With the @code{dynamic} process manager, spare worker processes are kept around -based on it's configured limits. +based on its configured limits. @table @asis @item @code{max-children} (default: @code{5}) Maximum of worker processes. @@ -31570,7 +31570,7 @@ notifications. The kernel module loader service allows one to load loadable kernel modules at boot. This is especially useful for modules that don't -autoload and need to be manually loaded, as it's the case with +autoload and need to be manually loaded, as is the case with @code{ddcci}. @deffn {Scheme Variable} kernel-module-loader-service-type diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 3089094eb8..54f9da4b27 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -587,7 +587,7 @@ (define-public cpplint (synopsis "Static code checker for C++") (description "@code{cpplint} is a command-line tool to check C/C++ files for style issues following Google’s C++ style guide. While Google maintains -it's own version of the tool, this is a fork that aims to be more responsive +its own version of the tool, this is a fork that aims to be more responsive and make @code{cpplint} usable in wider contexts.") (license license:bsd-3))) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 641681320c..199b876369 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -101,7 +101,7 @@ (define-public ldns (base32 "0ac242n7996fswq1a3nlh1bbbhrsdwsq4mx7xq8ffq6aplb4rj4a")) (patches (search-patches - ;; To create make-flag vairables, + ;; To create make-flag variables, ;; for splitting installation of drill and examples. "ldns-drill-examples.patch")))) (build-system gnu-build-system) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 2eaea5868e..26d3567024 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -7151,7 +7151,7 @@ (define-public yamagi-quake2 (mkdir-p (string-append out "/lib")) (mkdir-p (string-append out "/bin")) ;; The yamagi-quake2 binary must be in the same directory - ;; as it's engine libraries, but symlinking it to /bin is okay + ;; as its engine libraries, but symlinking it to /bin is okay. ;; https://github.com/yquake2/yquake2/blob/master/stuff/packaging.md (copy-recursively "release" (string-append out "/lib/yamagi-quake2")) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 6bb1281570..f992314777 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2068,7 +2068,7 @@ (define-public python-pyqtwebengine "--sipdir" sipdir "--pyqt-sipdir" pyqt-sipdir)))) ;; Because this has a different prefix than python-pyqt then we need - ;; to make this a namespace of it's own + ;; to make this a namespace of its own. (add-after 'install 'make-namespace (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((__init__.py (string-append diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index e9c390a1a0..76ed4df6e4 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -142,8 +142,8 @@ (define-public ruby-autoprefixer-rails (modify-phases %standard-phases (add-after 'extract-gemspec 'remove-unnecessary-dependencies (lambda _ - ;; Remove the testing of compass, as it's use is deprecated, and - ;; it's unpackaged for Guix + ;; Remove the testing of compass, as its use is deprecated, and + ;; it's unpackaged for Guix. (substitute* "autoprefixer-rails.gemspec" ((".*%q.*") "\n") (("\"spec/compass_spec\\.rb\"\\.freeze, ") "")) diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index fc4efb24f6..9d4325ffdf 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -576,7 +576,7 @@ (define-public quiterss (home-page "https://quiterss.org/") (synopsis "RSS/Atom news feeds reader written on Qt/C++") (description "QuiteRSS is an RSS/Atom news feeds reader written on Qt/C++ -that aims to be quite fast and comfortable to it's user.") +that aims to be quite fast and comfortable to its user.") (license license:gpl3+))) (define-public gfeeds diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 37636c7cdc..06ace5e238 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -326,7 +326,7 @@ (define-public kmscon ("libxkbcommon" ,libxkbcommon) ("logind" ,elogind) ;; MESA can be used for accelerated video output via OpenGLESv2, but - ;; it's a bit dependency that we'd rather avoid in the installation + ;; it's a big dependency that we'd rather avoid in the installation ;; image. ;; ("mesa" ,mesa) ("pango" ,pango) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 9ddd02a613..e2d5ca8176 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -878,7 +878,7 @@ (define-public perl-xml-sax-base (home-page "https://metacpan.org/release/XML-SAX-Base") (synopsis "Base class for SAX Drivers and Filters") (description "This module has a very simple task - to be a base class for -PerlSAX drivers and filters. It's default behaviour is to pass the input +PerlSAX drivers and filters. Its default behaviour is to pass the input directly to the output unchanged. It can be useful to use this module as a base class so you don't have to, for example, implement the characters() callback.") @@ -2587,7 +2587,7 @@ (define-public python-elementpath ElementTree library and for the @uref{http://lxml.de, lxml.etree} library. For lxml.etree this package can be useful for providing XPath 2.0 selectors, -because lxml.etree already has it's own implementation of XPath 1.0.") +because lxml.etree already has its own implementation of XPath 1.0.") (license license:expat))) (define-public python-lxml diff --git a/guix/build/asdf-build-system.scm b/guix/build/asdf-build-system.scm index 7f1037c4f9..6186613e52 100644 --- a/guix/build/asdf-build-system.scm +++ b/guix/build/asdf-build-system.scm @@ -72,8 +72,7 @@ (define (library-directory output) (define (output-translation source-path object-output) - "Return a translation for the system's source path -to it's binary output." + "Return a translation for the system's source path to its binary output." `((,source-path :**/ :*.*.*) (,(library-directory object-output) -- cgit v1.2.3 From c3c003be69319667b34b030fa52974e25aef0c9b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 23 Jul 2021 23:28:33 +0200 Subject: gnu: java-xmlpull2: Use mirrored source and archived home page. * gnu/packages/xml.scm (java-xmlpull2)[source]: Download from a Gentoo distfiles mirror. [home-page]: Point to an archive.org snapshot. --- gnu/packages/xml.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu/packages/xml.scm') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index e2d5ca8176..ed443413d0 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -2070,8 +2070,9 @@ (define-public java-xmlpull2 (version "2.1.10") (source (origin (method url-fetch) - (uri (string-append "http://www.extreme.indiana.edu/xgws/xsoap/" - "PullParser/PullParser" version ".tgz")) + ;; Unfortunately, archive.org does not have a copy of this file. + (uri (string-append "https://ftp.fau.de/gentoo/distfiles/" + "PullParser" version ".tgz")) (sha256 (base32 "1kw9nhyqb7bzhn2zjbwlpi5vp5rzj89amzi3hadw2acyh2dmd0md")) @@ -2087,7 +2088,8 @@ (define-public java-xmlpull2 #:phases (modify-phases %standard-phases (replace 'install (install-jars "build/lib"))))) - (home-page "http://www.extreme.indiana.edu/xgws/xsoap/xpp/") + (home-page (string-append "https://web.archive.org/web/20210225153105/" + "https://www.extreme.indiana.edu/")) (synopsis "Streaming pull XML parser") (description "Xml Pull Parser (in short XPP) is a streaming pull XML parser and should be used when there is a need to process quickly and -- cgit v1.2.3 From 716448d7ab408e70aced70f2b86dcefd5f926343 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 12 Sep 2021 13:52:09 +0200 Subject: gnu: Remove duplicate libxml++ packages. Reported-by: Guillaume Le Vaillant * gnu/packages/engineering.scm (freecad)[inputs]: Replace libxmlplusplus-2 with libxml++-2. * gnu/packages/music.scm (tascam-gtk)[inputs]: Replace libxmlplusplus with libxml++. * gnu/packages/xml.scm (libxmlplusplus, libxmlplusplus-2.4): Remove unused variables. --- gnu/packages/engineering.scm | 2 +- gnu/packages/music.scm | 2 +- gnu/packages/xml.scm | 75 -------------------------------------------- 3 files changed, 2 insertions(+), 77 deletions(-) (limited to 'gnu/packages/xml.scm') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 33c124a2ea..46622f3a1f 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2415,7 +2415,7 @@ (define-public freecad ("libtheora" ,libtheora) ("libtiff" ,libtiff) ("libxi" ,libxi) - ("libxmlplusplus" ,libxmlplusplus) + ("libxml++" ,libxml++) ("libxmu" ,libxmu) ("lz4" ,lz4) ("netcdf" ,netcdf) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index c1f03863b3..fcf3c6361a 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1895,7 +1895,7 @@ (define-public tascam-gtk `(("liblo" ,liblo) ("gtkmm" ,gtkmm) ("alsa-lib" ,alsa-lib) - ("libxmlplusplus" ,libxmlplusplus-2.6))) + ("libxml++" ,libxml++-2))) (native-inputs `(("glib:bin" ,glib "bin") ("pkg-config" ,pkg-config))) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index ed443413d0..8c87760323 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -294,81 +294,6 @@ (define-public libxlsxwriter (license (list license:bsd-2 license:public-domain)))) ; third_party/md5 -;; This is the latest stable release. -(define-public libxmlplusplus - (package - (name "libxmlplusplus") - (version "3.2.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/libxmlplusplus/libxmlplusplus") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0wjz591rjlgbah7dcq8i0yn0zw9d62b7g6r0pppx81ic0cx8n8ga")))) - (build-system gnu-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-documentation - (lambda* (#:key inputs #:allow-other-keys) - (let ((xmldoc (string-append (assoc-ref inputs "docbook-xml") - "/xml/dtd/docbook")) - (xsldoc (string-append (assoc-ref inputs "docbook-xsl") - "/xml/xsl/docbook-xsl-" - ,(package-version docbook-xsl)))) - (substitute* '("examples/dom_xpath/example.xml" - "docs/manual/libxml++_without_code.xml") - (("http://.*/docbookx\\.dtd") - (string-append xmldoc "/docbookx.dtd"))) - (setenv "SGML_CATALOG_FILES" - (string-append xmldoc "/catalog.xml")) - (substitute* "docs/manual/docbook-customisation.xsl" - (("http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl") - (string-append xsldoc "/html/chunk.xsl")))) - #t))))) - (propagated-inputs - `(("libxml2" ,libxml2))) - (inputs - `(("glibmm" ,glibmm))) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("doxygen" ,doxygen) - ("docbook-xml" ,docbook-xml) - ("docbook-xsl" ,docbook-xsl) - ("graphviz" ,graphviz) ; for dot - ("libtool" ,libtool) - ("libxslt" ,libxslt) - ("mm-common" ,mm-common) - ("perl" ,perl) - ("pkg-config" ,pkg-config))) - (home-page "https://github.com/libxmlplusplus/libxmlplusplus/") - (synopsis "C++ bindings for libxml2") - (description - "libxml++ (a.k.a. libxmlplusplus) provides a C++ interface to XML files. -It uses libxml2 to access the XML files.") - (license license:lgpl2.1+))) - -;; This is the last release providing the 2.6 API, hence the name. -;; This is needed by tascam-gtk -(define-public libxmlplusplus-2.6 - (package - (inherit libxmlplusplus) - (name "libxmlplusplus") - (version "2.40.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/libxmlplusplus/libxmlplusplus") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0gbfi4l88w828gmyc9br11l003ylyi4vigp5d1kfgsn0k4cig3y9")))))) - (define-public python-libxml2 (package/inherit libxml2 (name "python-libxml2") -- cgit v1.2.3