diff options
author | Marius Bakke <marius@gnu.org> | 2022-06-27 20:35:48 +0200 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2022-06-27 23:48:00 +0200 |
commit | e51c78d5605da114389cb992666829b1f3d82da6 (patch) | |
tree | 4900319adc887aabecd7ffac5eca791bbef21e61 | |
parent | a83c462752649b058bef00bd3207451048f7d75e (diff) |
gnu: python-libxml2: Move definition closer to its inherited origin.
* gnu/packages/xml.scm (python-libxml2): Move package definition after the
libxml2 variants.
-rw-r--r-- | gnu/packages/xml.scm | 59 |
1 files changed, 30 insertions, 29 deletions
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 9435e21d92..0e0d714a1c 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -181,6 +181,7 @@ binary extension of XML for the purpose of storing and manipulating data in a hierarchical form with variable field lengths.") (license license:lgpl2.1))) +;; Note: Remember to check python-libxml2 when updating this package. (define-public libxml2 (package (name "libxml2") @@ -251,6 +252,35 @@ project (but it is usable outside of the Gnome platform).") provides an @code{--xpath0} option to @command{xmllint} that enables it to output XPath results with a null delimiter."))) +(define-public python-libxml2 + (package/inherit libxml2 + (name "python-libxml2") + (source (origin + (inherit (package-source libxml2)) + (patches + (append (search-patches "python-libxml2-utf8.patch") + (origin-patches (package-source libxml2)))))) + (build-system python-build-system) + (outputs '("out")) + (arguments + `(;; XXX: Tests are specified in 'Makefile.am', but not in 'setup.py'. + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-before + 'build 'configure + (lambda* (#:key inputs #:allow-other-keys) + (chdir "python") + (let ((glibc (assoc-ref inputs ,(if (%current-target-system) + "cross-libc" "libc"))) + (libxml2 (assoc-ref inputs "libxml2"))) + (substitute* "setup.py" + ;; For libxml2 headers. + (("/opt/include") + (string-append libxml2 "/include"))))))))) + (inputs `(("libxml2" ,libxml2))) + (synopsis "Python bindings for the libxml2 library"))) + (define-public libxlsxwriter (package (name "libxlsxwriter") @@ -293,35 +323,6 @@ formulas and hyperlinks to multiple worksheets in an Excel 2007+ XLSX file.") (license (list license:bsd-2 license:public-domain)))) ; third_party/md5 -(define-public python-libxml2 - (package/inherit libxml2 - (name "python-libxml2") - (source (origin - (inherit (package-source libxml2)) - (patches - (append (search-patches "python-libxml2-utf8.patch") - (origin-patches (package-source libxml2)))))) - (build-system python-build-system) - (outputs '("out")) - (arguments - `(;; XXX: Tests are specified in 'Makefile.am', but not in 'setup.py'. - #:tests? #f - #:phases - (modify-phases %standard-phases - (add-before - 'build 'configure - (lambda* (#:key inputs #:allow-other-keys) - (chdir "python") - (let ((glibc (assoc-ref inputs ,(if (%current-target-system) - "cross-libc" "libc"))) - (libxml2 (assoc-ref inputs "libxml2"))) - (substitute* "setup.py" - ;; For libxml2 headers. - (("/opt/include") - (string-append libxml2 "/include"))))))))) - (inputs `(("libxml2" ,libxml2))) - (synopsis "Python bindings for the libxml2 library"))) - (define-public libxslt (package (name "libxslt") |