01/01: Merge branch 'master' into python-updates

[Ricardo Wurmus]

rekado pushed a commit to branch python-updates
in repository guix.

commit 82a63cbf789e0a1a9f519d90ec2fe4d95283dd64
Merge: 1a9e471 1621893
Author: Ricardo Wurmus <address@hidden>
Date:   Mon Mar 12 09:20:32 2018 +0100

    Merge branch 'master' into python-updates

 gnu/local.mk                                     |   1 +
 gnu/packages/java.scm                            |  11 +-
 gnu/packages/mingw.scm                           |  20 +-
 gnu/packages/patches/java-jeromq-fix-tests.patch | 253 +++++++++++++++++++++++
 gnu/packages/perl.scm                            |  60 +++---
 gnu/packages/python-crypto.scm                   |   8 +-
 gnu/packages/python.scm                          |  36 ++--
 gnu/packages/serialization.scm                   |   8 +-
 gnu/packages/video.scm                           |   4 +-
 gnu/packages/virtualization.scm                  |   4 +-
 10 files changed, 338 insertions(+), 67 deletions(-)