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

[guix-commits]

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

commit 4d8d2fbaf3025337f7feff627282447db82a99d5
Merge: e08902d fa984fa
Author: Ludovic Courtès <address@hidden>
Date:   Mon Oct 7 17:06:13 2019 +0200

    Merge branch 'master' into core-updates

 gnu/local.mk                                   |   1 -
 gnu/packages/audio.scm                         |  42 +++---
 gnu/packages/bioconductor.scm                  |  13 +-
 gnu/packages/bioinformatics.scm                |  13 +-
 gnu/packages/bittorrent.scm                    |  13 +-
 gnu/packages/cran.scm                          |  49 +++----
 gnu/packages/emacs-xyz.scm                     |  75 ++++++++---
 gnu/packages/java.scm                          |  15 ++-
 gnu/packages/linux.scm                         |   8 +-
 gnu/packages/lisp.scm                          | 178 ++++++++++++++++++++++++-
 gnu/packages/openldap.scm                      |   6 +-
 gnu/packages/patches/aria2-CVE-2019-3500.patch |  55 --------
 gnu/packages/statistics.scm                    |   4 +-
 13 files changed, 315 insertions(+), 157 deletions(-)

diff --cc gnu/local.mk
index 898d22f,ffe697c..39b8e00
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -693,9 -695,7 +693,8 @@@ dist_patch_DATA =                                  
        
    %D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch \
    %D%/packages/patches/antlr3-3_3-fix-java8-compilation.patch \
    %D%/packages/patches/apr-skip-getservbyname-test.patch      \
-   %D%/packages/patches/aria2-CVE-2019-3500.patch              \
    %D%/packages/patches/aspell-default-dict-dir.patch          \
 +  %D%/packages/patches/aspell-gcc-compat.patch                        \
    %D%/packages/patches/ath9k-htc-firmware-binutils.patch      \
    %D%/packages/patches/ath9k-htc-firmware-gcc.patch           \
    %D%/packages/patches/ath9k-htc-firmware-objcopy.patch               \