01/10: Merge branch 'master' into staging

[guix-commits]

mbakke pushed a commit to branch staging
in repository guix.

commit 9b601fc2110193435e61955c04499fed019aac62
Merge: 939c5b2 27664ea
Author: Marius Bakke <address@hidden>
Date:   Wed Dec 11 23:21:27 2019 +0100

    Merge branch 'master' into staging

 gnu/local.mk                                  |   1 +
 gnu/packages/admin.scm                        |   4 +-
 gnu/packages/cluster.scm                      |  18 +-
 gnu/packages/cran.scm                         | 107 ++++++++
 gnu/packages/crypto.scm                       |  17 +-
 gnu/packages/emacs-xyz.scm                    |  48 ++++
 gnu/packages/firmware.scm                     |   6 +-
 gnu/packages/gnome-xyz.scm                    |   4 +-
 gnu/packages/kde.scm                          | 179 +++++--------
 gnu/packages/networking.scm                   |  41 ++-
 gnu/packages/nss.scm                          |   8 +
 gnu/packages/patches/nss-CVE-2019-11745.patch |  24 ++
 gnu/packages/pretty-print.scm                 |   2 +
 gnu/packages/python-xyz.scm                   |  40 ++-
 gnu/packages/ssh.scm                          |  14 +-
 gnu/packages/version-control.scm              |   4 +-
 gnu/packages/video.scm                        |   1 +
 gnu/packages/virtualization.scm               |   4 +-
 gnu/packages/vpn.scm                          |  12 +-
 gnu/packages/xiph.scm                         |   2 +
 guix/import/cran.scm                          |   4 +-
 guix/import/crate.scm                         |  17 +-
 guix/import/utils.scm                         |  84 +++---
 guix/scripts/import/cran.scm                  |   7 +-
 guix/scripts/import/crate.scm                 |   5 +-
 guix/scripts/import/elpa.scm                  |   7 +-
 guix/scripts/import/gem.scm                   |   5 +-
 guix/scripts/import/hackage.scm               |   5 +-
 guix/scripts/import/opam.scm                  |   5 +-
 guix/scripts/import/pypi.scm                  |   5 +-
 guix/scripts/import/stackage.scm              |   5 +-
 tests/crate.scm                               | 357 +++++++++++++++++++++++++-
 tests/gem.scm                                 |  25 +-
 tests/import-utils.scm                        |  23 +-
 34 files changed, 815 insertions(+), 275 deletions(-)