* [bug#72060] [PATCH] gnu: Add xml-namespace-xsd.
@ 2024-07-11 13:13 gemmaro
2024-07-12 12:50 ` [bug#72060] [PATCH v2] " gemmaro
2024-07-12 23:02 ` [bug#72060] [PATCH v3] " gemmaro
0 siblings, 2 replies; 6+ messages in thread
From: gemmaro @ 2024-07-11 13:13 UTC (permalink / raw)
To: 72060; +Cc: gemmaro
* gnu/packages/xml.scm (xml-namespace-xsd): New variable.
Change-Id: Iec2d68f1d9190ba9e1723ca10adf1de0dfd2d722
---
gnu/packages/xml.scm | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index c6ddae50ae..dee2b3287b 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -1953,3 +1953,40 @@ (define-public python-xmltodict
(description "This package provides a Python library to convert XML to
@code{OrderedDict}.")
(license license:expat)))
+
+(define-public xml-namespace-xsd
+ (package
+ (name "xml-namespace-xsd")
+ (version "2009-01")
+ (source
+ (origin
+ (method url-fetch)
+ (uri "https://www.w3.org/2009/01/xml.xsd")
+ (sha256
+ (base32 "0agqmxbhk2q9xa38m02z7ggbb124z6avnqyhz8k43iicqhv1fw6c"))))
+ (build-system copy-build-system)
+ (arguments
+ (list
+ #:install-plan #~'(("xml.xsd" "/xml/dtd/namespace/xml.xsd"))
+ #:phases #~(modify-phases %standard-phases
+ (add-before 'install 'create-catalog
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((out (string-append #$output "/xml/dtd/namespace")))
+ (mkdir-p out)
+ (invoke (search-input-file inputs "/bin/xmlcatalog")
+ "--noout"
+ "--create"
+ "--add"
+ "uri"
+ "http://www.w3.org/2001/xml.xsd"
+ (string-append out "/xml.xsd")
+ (string-append out "/catalog.xml"))))))))
+ (native-inputs (list libxml2))
+ (home-page "https://www.w3.org/XML/1998/namespace")
+ (synopsis "XML Schema for XML namespace")
+ (description
+ "This package provides an XML Schema fragment and its catalog. The schema
+constrains the syntax of @code{xml:lang}, @code{xml:spec}, @code{xml:base}, and
+@code{xml:id} in the schema language defined by the XML Schema Recommendation Second
+Edition of 28 October 2004.")
+ (license license:w3c)))
base-commit: af4c90dc736295b19fda88cd8652f67f138409a1
prerequisite-patch-id: 89c3b2360d6de55e0ffcf0e9fd2bd04c0674be62
prerequisite-patch-id: 62fc54ed554df985530503c8e8c5b718c16b709b
prerequisite-patch-id: c22785847e70bf2f4c94547dd7851ad7de06b92a
--
2.45.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [bug#72060] [PATCH v2] gnu: Add xml-namespace-xsd.
2024-07-11 13:13 [bug#72060] [PATCH] gnu: Add xml-namespace-xsd gemmaro
@ 2024-07-12 12:50 ` gemmaro
2024-07-12 20:01 ` Liliana Marie Prikler
2024-07-12 23:02 ` [bug#72060] [PATCH v3] " gemmaro
1 sibling, 1 reply; 6+ messages in thread
From: gemmaro @ 2024-07-12 12:50 UTC (permalink / raw)
To: 72060; +Cc: gemmaro
* gnu/packages/xml.scm (xml-namespace-xsd): New variable.
Change-Id: Iec2d68f1d9190ba9e1723ca10adf1de0dfd2d722
---
I forgot to add copy-build-system in the first revision.
gnu/packages/xml.scm | 39 +++++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index c6ddae50ae..71344dea0f 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 © 2024 gemmaro <gemmaro.dev@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -76,6 +77,7 @@ (define-module (gnu packages xml)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system cmake)
+ #:use-module (guix build-system copy)
#:use-module (guix build-system gnu)
#:use-module (guix build-system meson)
#:use-module (guix build-system perl)
@@ -1953,3 +1955,40 @@ (define-public python-xmltodict
(description "This package provides a Python library to convert XML to
@code{OrderedDict}.")
(license license:expat)))
+
+(define-public xml-namespace-xsd
+ (package
+ (name "xml-namespace-xsd")
+ (version "2009-01")
+ (source
+ (origin
+ (method url-fetch)
+ (uri "https://www.w3.org/2009/01/xml.xsd")
+ (sha256
+ (base32 "0agqmxbhk2q9xa38m02z7ggbb124z6avnqyhz8k43iicqhv1fw6c"))))
+ (build-system copy-build-system)
+ (arguments
+ (list
+ #:install-plan #~'(("xml.xsd" "/xml/dtd/namespace/xml.xsd"))
+ #:phases #~(modify-phases %standard-phases
+ (add-before 'install 'create-catalog
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((out (string-append #$output "/xml/dtd/namespace")))
+ (mkdir-p out)
+ (invoke (search-input-file inputs "/bin/xmlcatalog")
+ "--noout"
+ "--create"
+ "--add"
+ "uri"
+ "http://www.w3.org/2001/xml.xsd"
+ (string-append out "/xml.xsd")
+ (string-append out "/catalog.xml"))))))))
+ (native-inputs (list libxml2))
+ (home-page "https://www.w3.org/XML/1998/namespace")
+ (synopsis "XML Schema for XML namespace")
+ (description
+ "This package provides an XML Schema fragment and its catalog. The schema
+constrains the syntax of @code{xml:lang}, @code{xml:spec}, @code{xml:base}, and
+@code{xml:id} in the schema language defined by the XML Schema Recommendation Second
+Edition of 28 October 2004.")
+ (license license:w3c)))
base-commit: 2d6a3799fcda5c017f653c6e96b91964b07a7ee0
prerequisite-patch-id: 62fc54ed554df985530503c8e8c5b718c16b709b
prerequisite-patch-id: c22785847e70bf2f4c94547dd7851ad7de06b92a
--
2.45.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [bug#72060] [PATCH v2] gnu: Add xml-namespace-xsd.
2024-07-12 12:50 ` [bug#72060] [PATCH v2] " gemmaro
@ 2024-07-12 20:01 ` Liliana Marie Prikler
2024-07-21 2:46 ` gemmaro
0 siblings, 1 reply; 6+ messages in thread
From: Liliana Marie Prikler @ 2024-07-12 20:01 UTC (permalink / raw)
To: gemmaro, 72060
Am Freitag, dem 12.07.2024 um 21:50 +0900 schrieb gemmaro:
> * gnu/packages/xml.scm (xml-namespace-xsd): New variable.
>
> Change-Id: Iec2d68f1d9190ba9e1723ca10adf1de0dfd2d722
> ---
> I forgot to add copy-build-system in the first revision.
>
> gnu/packages/xml.scm | 39 +++++++++++++++++++++++++++++++++++++++
> 1 file changed, 39 insertions(+)
>
> diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
> index c6ddae50ae..71344dea0f 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 © 2024 gemmaro <gemmaro.dev@gmail.com>
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -76,6 +77,7 @@ (define-module (gnu packages xml)
> #:use-module (guix download)
> #:use-module (guix git-download)
> #:use-module (guix build-system cmake)
> + #:use-module (guix build-system copy)
> #:use-module (guix build-system gnu)
> #:use-module (guix build-system meson)
> #:use-module (guix build-system perl)
> @@ -1953,3 +1955,40 @@ (define-public python-xmltodict
> (description "This package provides a Python library to convert
> XML to
> @code{OrderedDict}.")
> (license license:expat)))
> +
> +(define-public xml-namespace-xsd
> + (package
> + (name "xml-namespace-xsd")
> + (version "2009-01")
> + (source
> + (origin
> + (method url-fetch)
> + (uri "https://www.w3.org/2009/01/xml.xsd")
It's a good idea to formulate URI in terms of version. In this case,
replacing the dash with a slash.
> + (sha256
> + (base32
> "0agqmxbhk2q9xa38m02z7ggbb124z6avnqyhz8k43iicqhv1fw6c"))))
> + (build-system copy-build-system)
> + (arguments
> + (list
> + #:install-plan #~'(("xml.xsd" "/xml/dtd/namespace/xml.xsd"))
> + #:phases #~(modify-phases %standard-phases
> + (add-before 'install 'create-catalog
> + (lambda* (#:key inputs #:allow-other-keys)
> + (let ((out (string-append #$output
> "/xml/dtd/namespace")))
> + (mkdir-p out)
> + (invoke (search-input-file inputs
> "/bin/xmlcatalog")
You can probably invoke the command by command name. Otherwise you'd
need to go through (or native-inputs inputs)
> + "--noout"
> + "--create"
> + "--add"
> + "uri"
> + "http://www.w3.org/2001/xml.xsd"
> + (string-append out "/xml.xsd")
> + (string-append out
> "/catalog.xml"))))))))
Don't forget that you can write to the local directory. You should
also do so and reflect the added file in the install-plan.
> + (native-inputs (list libxml2))
> + (home-page "https://www.w3.org/XML/1998/namespace")
> + (synopsis "XML Schema for XML namespace")
> + (description
> + "This package provides an XML Schema fragment and its catalog.
An XML Schema fragment?
> The schema
> +constrains the syntax of @code{xml:lang}, @code{xml:spec},
> @code{xml:base}, and
> +@code{xml:id} in the schema language defined by the XML Schema
> Recommendation Second
> +Edition of 28 October 2004.")
> + (license license:w3c)))
Cheers
^ permalink raw reply [flat|nested] 6+ messages in thread
* [bug#72060] [PATCH v3] gnu: Add xml-namespace-xsd.
2024-07-11 13:13 [bug#72060] [PATCH] gnu: Add xml-namespace-xsd gemmaro
2024-07-12 12:50 ` [bug#72060] [PATCH v2] " gemmaro
@ 2024-07-12 23:02 ` gemmaro
1 sibling, 0 replies; 6+ messages in thread
From: gemmaro @ 2024-07-12 23:02 UTC (permalink / raw)
To: 72060; +Cc: gemmaro
* gnu/packages/xml.scm (xml-namespace-xsd): New variable.
Change-Id: Iec2d68f1d9190ba9e1723ca10adf1de0dfd2d722
---
gnu/packages/xml.scm | 40 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index c6ddae50ae..85edcf0f7d 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 © 2024 gemmaro <gemmaro.dev@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -76,6 +77,7 @@ (define-module (gnu packages xml)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system cmake)
+ #:use-module (guix build-system copy)
#:use-module (guix build-system gnu)
#:use-module (guix build-system meson)
#:use-module (guix build-system perl)
@@ -1953,3 +1955,41 @@ (define-public python-xmltodict
(description "This package provides a Python library to convert XML to
@code{OrderedDict}.")
(license license:expat)))
+
+(define-public xml-namespace-xsd
+ (package
+ (name "xml-namespace-xsd")
+ (version "2009-01")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://www.w3.org/"
+ (string-replace-substring version "-" "/")
+ "/xml.xsd"))
+ (sha256
+ (base32 "0agqmxbhk2q9xa38m02z7ggbb124z6avnqyhz8k43iicqhv1fw6c"))))
+ (build-system copy-build-system)
+ (arguments
+ (list
+ #:install-plan #~'(("xml.xsd" "/xml/dtd/namespace/xml.xsd")
+ ("catalog.xml" "/xml/dtd/namespace/catalog.xml"))
+ #:phases #~(modify-phases %standard-phases
+ (add-before 'install 'create-catalog
+ (lambda _
+ (invoke "xmlcatalog"
+ "--noout"
+ "--create"
+ "--add"
+ "uri"
+ "http://www.w3.org/2001/xml.xsd"
+ "xml.xsd"
+ "catalog.xml"))))))
+ (native-inputs (list libxml2))
+ (home-page "https://www.w3.org/XML/1998/namespace")
+ (synopsis "XML Schema for XML namespace")
+ (description
+ "This package provides an XML Schema and its catalog. The schema constrains the
+syntax of @code{xml:lang}, @code{xml:spec}, @code{xml:base}, and @code{xml:id} in the
+schema language defined by the XML Schema Recommendation Second Edition of 28 October
+2004.")
+ (license license:w3c)))
base-commit: ff82e0f7b48cd0d4dd906f5d52ba5d4940222086
prerequisite-patch-id: 62fc54ed554df985530503c8e8c5b718c16b709b
prerequisite-patch-id: c22785847e70bf2f4c94547dd7851ad7de06b92a
--
2.45.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [bug#72060] [PATCH v2] gnu: Add xml-namespace-xsd.
2024-07-12 20:01 ` Liliana Marie Prikler
@ 2024-07-21 2:46 ` gemmaro
2024-07-21 10:04 ` bug#72060: " Liliana Marie Prikler
0 siblings, 1 reply; 6+ messages in thread
From: gemmaro @ 2024-07-21 2:46 UTC (permalink / raw)
To: 72060; +Cc: Liliana Marie Prikler
Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> Am Freitag, dem 12.07.2024 um 21:50 +0900 schrieb gemmaro:
>> * gnu/packages/xml.scm (xml-namespace-xsd): New variable.
>>
>> Change-Id: Iec2d68f1d9190ba9e1723ca10adf1de0dfd2d722
>> ---
>> I forgot to add copy-build-system in the first revision.
>>
>> gnu/packages/xml.scm | 39 +++++++++++++++++++++++++++++++++++++++
>> 1 file changed, 39 insertions(+)
>>
>> diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
>> index c6ddae50ae..71344dea0f 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 © 2024 gemmaro <gemmaro.dev@gmail.com>
>> ;;;
>> ;;; This file is part of GNU Guix.
>> ;;;
>> @@ -76,6 +77,7 @@ (define-module (gnu packages xml)
>> #:use-module (guix download)
>> #:use-module (guix git-download)
>> #:use-module (guix build-system cmake)
>> + #:use-module (guix build-system copy)
>> #:use-module (guix build-system gnu)
>> #:use-module (guix build-system meson)
>> #:use-module (guix build-system perl)
>> @@ -1953,3 +1955,40 @@ (define-public python-xmltodict
>> (description "This package provides a Python library to convert
>> XML to
>> @code{OrderedDict}.")
>> (license license:expat)))
>> +
>> +(define-public xml-namespace-xsd
>> + (package
>> + (name "xml-namespace-xsd")
>> + (version "2009-01")
>> + (source
>> + (origin
>> + (method url-fetch)
>> + (uri "https://www.w3.org/2009/01/xml.xsd")
> It's a good idea to formulate URI in terms of version. In this case,
> replacing the dash with a slash.
>> + (sha256
>> + (base32
>> "0agqmxbhk2q9xa38m02z7ggbb124z6avnqyhz8k43iicqhv1fw6c"))))
>> + (build-system copy-build-system)
>> + (arguments
>> + (list
>> + #:install-plan #~'(("xml.xsd" "/xml/dtd/namespace/xml.xsd"))
>> + #:phases #~(modify-phases %standard-phases
>> + (add-before 'install 'create-catalog
>> + (lambda* (#:key inputs #:allow-other-keys)
>> + (let ((out (string-append #$output
>> "/xml/dtd/namespace")))
>> + (mkdir-p out)
>> + (invoke (search-input-file inputs
>> "/bin/xmlcatalog")
> You can probably invoke the command by command name. Otherwise you'd
> need to go through (or native-inputs inputs)
>> + "--noout"
>> + "--create"
>> + "--add"
>> + "uri"
>> + "http://www.w3.org/2001/xml.xsd"
>> + (string-append out "/xml.xsd")
>> + (string-append out
>> "/catalog.xml"))))))))
> Don't forget that you can write to the local directory. You should
> also do so and reflect the added file in the install-plan.
>> + (native-inputs (list libxml2))
>> + (home-page "https://www.w3.org/XML/1998/namespace")
>> + (synopsis "XML Schema for XML namespace")
>> + (description
>> + "This package provides an XML Schema fragment and its catalog.
> An XML Schema fragment?
>> The schema
>> +constrains the syntax of @code{xml:lang}, @code{xml:spec},
>> @code{xml:base}, and
>> +@code{xml:id} in the schema language defined by the XML Schema
>> Recommendation Second
>> +Edition of 28 October 2004.")
>> + (license license:w3c)))
> Cheers
Thank you for your review.
I sent revision 3 [1].
I may have forgotten to include your email address in X-Debbugs-Cc.
If that is the case, I apologise for the inconvenience.
[1] https://issues.guix.gnu.org/72060#3
Regards,
gemmaro.
^ permalink raw reply [flat|nested] 6+ messages in thread
* bug#72060: [PATCH v2] gnu: Add xml-namespace-xsd.
2024-07-21 2:46 ` gemmaro
@ 2024-07-21 10:04 ` Liliana Marie Prikler
0 siblings, 0 replies; 6+ messages in thread
From: Liliana Marie Prikler @ 2024-07-21 10:04 UTC (permalink / raw)
To: gemmaro, 72060-done
Am Sonntag, dem 21.07.2024 um 11:46 +0900 schrieb gemmaro:
> Thank you for your review.
> I sent revision 3 [1].
>
> I may have forgotten to include your email address in X-Debbugs-Cc.
> If that is the case, I apologise for the inconvenience.
>
> [1] https://issues.guix.gnu.org/72060#3
Thanks for the hint. I've pushed v3 just now.
Cheers
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-07-21 10:06 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-11 13:13 [bug#72060] [PATCH] gnu: Add xml-namespace-xsd gemmaro
2024-07-12 12:50 ` [bug#72060] [PATCH v2] " gemmaro
2024-07-12 20:01 ` Liliana Marie Prikler
2024-07-21 2:46 ` gemmaro
2024-07-21 10:04 ` bug#72060: " Liliana Marie Prikler
2024-07-12 23:02 ` [bug#72060] [PATCH v3] " gemmaro
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).