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

[guix-commits]

mbakke pushed a commit to branch core-updates
in repository guix.

commit 2ee70a5b11e83e1abe4b749a21f15852f7fcf5e1
Merge: 96783ed 4678cc4
Author: Marius Bakke <address@hidden>
Date:   Fri Jul 19 01:15:59 2019 +0200

    Merge branch 'master' into core-updates

 doc/guix.texi                                    |   7 +-
 gnu/local.mk                                     |   2 +-
 gnu/machine/ssh.scm                              |   4 +-
 gnu/packages/astronomy.scm                       |  35 ++++++
 gnu/packages/chromium.scm                        |  33 +++++-
 gnu/packages/debug.scm                           |   9 +-
 gnu/packages/dns.scm                             |   4 +-
 gnu/packages/emacs-xyz.scm                       | 136 ++++++++++++++++++++++-
 gnu/packages/games.scm                           |  31 ++++--
 gnu/packages/geo.scm                             |  68 ++++++++++++
 gnu/packages/gnupg.scm                           |  11 +-
 gnu/packages/i2p.scm                             | 105 +++++++++++++++++
 gnu/packages/logging.scm                         |  30 +----
 gnu/packages/patches/glog-gcc-5-demangling.patch |  64 -----------
 gnu/packages/python-xyz.scm                      |   2 +-
 gnu/packages/rdf.scm                             |   8 +-
 gnu/packages/web.scm                             |  35 ++++++
 guix/scripts/pull.scm                            |  13 +--
 18 files changed, 461 insertions(+), 136 deletions(-)

diff --cc gnu/local.mk
index e97ff50,c2b6f14..01ec944
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -881,15 -879,9 +882,14 @@@ dist_patch_DATA =                                
                
    %D%/packages/patches/glibc-versioned-locpath.patch          \
    %D%/packages/patches/glibc-2.27-git-fixes.patch             \
    %D%/packages/patches/glibc-2.28-git-fixes.patch             \
 +  %D%/packages/patches/glibc-2.28-supported-locales.patch             \
 +  %D%/packages/patches/glibc-2.29-git-updates.patch           \
 +  %D%/packages/patches/glibc-supported-locales.patch          \
 +  %D%/packages/patches/glibc-2.27-supported-locales.patch             \
    %D%/packages/patches/glusterfs-use-PATH-instead-of-hardcodes.patch          
\
-   %D%/packages/patches/glog-gcc-5-demangling.patch            \
    %D%/packages/patches/gmp-arm-asm-nothumb.patch              \
    %D%/packages/patches/gmp-faulty-test.patch                  \
 +  %D%/packages/patches/gnome-control-center-udisks.patch      \
    %D%/packages/patches/gnome-shell-theme.patch                        \
    %D%/packages/patches/gnome-tweaks-search-paths.patch                \
    %D%/packages/patches/gnutls-skip-trust-store-test.patch     \