branch staging updated (dd2d3ed -> d79ec4f)

[guix-commits]

mbakke pushed a change to branch staging
in repository guix.

    from dd2d3ed  Merge branch 'master' into staging
     new 4c1ca82  gnu: python2-pyqt: Propagate requireed inputs.
     new 5ded849  gnu: Add python2-pyqtwebengine.
     new 7b7b3ce  gnu: python-html5-parser: Update to 0.4.9.
     new d79ec4f  gnu: calibre: Update to 4.18.0.

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/local.mk                                       |  2 -
 gnu/packages/ebook.scm                             | 51 ++++++++++++++++++----
 gnu/packages/patches/calibre-msgpack-compat.patch  | 18 --------
 gnu/packages/patches/calibre-remove-test-bs4.patch | 34 ---------------
 gnu/packages/python-web.scm                        |  4 +-
 gnu/packages/qt.scm                                | 22 ++++++++++
 6 files changed, 67 insertions(+), 64 deletions(-)
 delete mode 100644 gnu/packages/patches/calibre-msgpack-compat.patch
 delete mode 100644 gnu/packages/patches/calibre-remove-test-bs4.patch