Browse Source

gnu: python-lxml: Move to (gnu packages xml).

* gnu/packages/python-xyz.scm (python-lxml): Move from here ...
* gnu/packages/xml.scm (python-lxml): ... to here.
* gnu/packages/django.scm, gnu/packages/drones.scm,
gnu/packages/libreoffice.scm, gnu/packages/nutrition.scm,
gnu/packages/openstack.scm, gnu/packages/pulseaudio.scm,
gnu/packages/python-science.scm, gnu/packages/tryton.scm,
gnu/packages/wireservice.scm: Adjust module imports.
gn-latest-20200428
Marius Bakke 2 years ago
parent
commit
55e1475cb5
No known key found for this signature in database GPG Key ID: A2A06DF2A33A54FA
11 changed files with 40 additions and 33 deletions
  1. +2
    -1
      gnu/packages/django.scm
  2. +1
    -0
      gnu/packages/drones.scm
  3. +0
    -1
      gnu/packages/libreoffice.scm
  4. +2
    -1
      gnu/packages/nutrition.scm
  5. +1
    -0
      gnu/packages/openstack.scm
  6. +1
    -0
      gnu/packages/pulseaudio.scm
  7. +1
    -0
      gnu/packages/python-science.scm
  8. +0
    -29
      gnu/packages/python-xyz.scm
  9. +1
    -0
      gnu/packages/tryton.scm
  10. +2
    -1
      gnu/packages/wireservice.scm
  11. +29
    -0
      gnu/packages/xml.scm

+ 2
- 1
gnu/packages/django.scm View File

@ -36,7 +36,8 @@
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages sphinx)
#:use-module (gnu packages time))
#:use-module (gnu packages time)
#:use-module (gnu packages xml))
(define-public python-django
(package


+ 1
- 0
gnu/packages/drones.scm View File

@ -23,6 +23,7 @@
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages xml)
#:use-module (guix download)
#:use-module (guix utils)
#:use-module (guix git-download)


+ 0
- 1
gnu/packages/libreoffice.scm View File

@ -75,7 +75,6 @@
#:use-module (gnu packages perl-compression)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages rdf)
#:use-module (gnu packages scanner)
#:use-module (gnu packages tls)


+ 2
- 1
gnu/packages/nutrition.scm View File

@ -29,7 +29,8 @@
#:use-module (gnu packages glib)
#:use-module (gnu packages image)
#:use-module (gnu packages python)
#:use-module (gnu packages python-xyz))
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages xml))
(define-public gourmet
(package


+ 1
- 0
gnu/packages/openstack.scm View File

@ -33,6 +33,7 @@
#:use-module (gnu packages time)
#:use-module (gnu packages tls)
#:use-module (gnu packages version-control)
#:use-module (gnu packages xml)
#:use-module (guix build-system python)
#:use-module (guix download)
#:use-module ((guix licenses)


+ 1
- 0
gnu/packages/pulseaudio.scm View File

@ -51,6 +51,7 @@
#:use-module (gnu packages python-web)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages xiph)
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg))
(define-public libsndfile


+ 1
- 0
gnu/packages/python-science.scm View File

@ -37,6 +37,7 @@
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages sphinx)
#:use-module (gnu packages time)
#:use-module (gnu packages xml)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix utils)


+ 0
- 29
gnu/packages/python-xyz.scm View File

@ -5784,35 +5784,6 @@ the GObject Introspection bindings to libnotify for non-GTK applications.")
(define-public python2-notify2
(package-with-python2 python-notify2))
(define-public python-lxml
(package
(name "python-lxml")
(version "4.4.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "lxml" version))
(sha256
(base32 "01nvb5j8vs9nk4z5s3250b1m22b4d08kffa36if3g1mdygdrvxpg"))))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
(replace 'check
(lambda _
(invoke "make" "test"))))))
(inputs
`(("libxml2" ,libxml2)
("libxslt" ,libxslt)))
(home-page "https://lxml.de/")
(synopsis "Python XML processing library")
(description
"The lxml XML toolkit is a Pythonic binding for the C libraries
libxml2 and libxslt.")
(license license:bsd-3))) ; and a few more, see LICENSES.txt
(define-public python2-lxml
(package-with-python2 python-lxml))
;; beautifulsoup4 has a totally different namespace than 3.x,
;; and pypi seems to put it under its own name, so I guess we should too
(define-public python-beautifulsoup4


+ 1
- 0
gnu/packages/tryton.scm View File

@ -27,6 +27,7 @@
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages time)
#:use-module (gnu packages xml)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system python))


+ 2
- 1
gnu/packages/wireservice.scm View File

@ -28,7 +28,8 @@
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages sphinx)
#:use-module (gnu packages time))
#:use-module (gnu packages time)
#:use-module (gnu packages xml))
;; Common package definition for packages from https://github.com/wireservice.
(define-syntax-rule (wireservice-package extra-fields ...)


+ 29
- 0
gnu/packages/xml.scm View File

@ -2076,6 +2076,35 @@ 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.")
(license license:expat)))
(define-public python-lxml
(package
(name "python-lxml")
(version "4.4.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "lxml" version))
(sha256
(base32 "01nvb5j8vs9nk4z5s3250b1m22b4d08kffa36if3g1mdygdrvxpg"))))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
(replace 'check
(lambda _
(invoke "make" "test"))))))
(inputs
`(("libxml2" ,libxml2)
("libxslt" ,libxslt)))
(home-page "https://lxml.de/")
(synopsis "Python XML processing library")
(description
"The lxml XML toolkit is a Pythonic binding for the C libraries
libxml2 and libxslt.")
(license license:bsd-3))) ; and a few more, see LICENSES.txt
(define-public python2-lxml
(package-with-python2 python-lxml))
(define-public python-xmltodict
(package
(name "python-xmltodict")


Loading…
Cancel
Save