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

[Leo Famulari]

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

commit e8bd1946ec1df9f52f87292172af5b4e4a4e0023
Merge: cf6db76 a18accb
Author: Leo Famulari <address@hidden>
Date:   Sun Oct 7 20:49:14 2018 -0400

    Merge branch 'master' into core-updates

 gnu/local.mk                                       |   5 +-
 gnu/packages/android.scm                           |   4 +-
 gnu/packages/astronomy.scm                         |   7 +-
 gnu/packages/audio.scm                             |  15 +-
 gnu/packages/backup.scm                            |   1 +
 gnu/packages/batik.scm                             | 250 +++++++
 gnu/packages/bioinformatics.scm                    |  91 ++-
 gnu/packages/ftp.scm                               |   8 +-
 gnu/packages/games.scm                             |  64 ++
 gnu/packages/gnucash.scm                           |  47 +-
 gnu/packages/golang.scm                            | 128 +---
 gnu/packages/haskell-web.scm                       |   1 -
 gnu/packages/haskell.scm                           | 723 +++++++++++++++++++++
 gnu/packages/java.scm                              |  33 +
 gnu/packages/libreoffice.scm                       |   3 -
 gnu/packages/mes.scm                               |   5 +-
 gnu/packages/mpd.scm                               |  16 +-
 gnu/packages/music.scm                             |  14 +-
 .../bastet-change-source-of-unordered_set.patch    |  40 ++
 .../patches/borg-respect-storage-quota.patch       |  32 +
 .../patches/gnucash-disable-failing-tests.patch    |  39 ++
 .../patches/gnucash-price-quotes-perl.patch        |   5 +-
 gnu/packages/patches/mes-nyacc-0.86.0.patch        | 197 ------
 gnu/packages/ruby.scm                              |  62 +-
 gnu/packages/version-control.scm                   |  10 +-
 guix/build-system/glib-or-gtk.scm                  |   2 +-
 guix/progress.scm                                  |  11 +-
 27 files changed, 1426 insertions(+), 387 deletions(-)

diff --cc gnu/local.mk
index d4e986c,ea2d650..15c8159
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -591,14 -592,16 +592,16 @@@ dist_patch_DATA =                               
                
    %D%/packages/patches/awesome-reproducible-png.patch         \
    %D%/packages/patches/azr3.patch                             \
    %D%/packages/patches/bash-completion-directories.patch      \
+   %D%/packages/patches/bastet-change-source-of-unordered_set.patch    \
    %D%/packages/patches/bazaar-CVE-2017-14176.patch            \
    %D%/packages/patches/beignet-correct-file-names.patch               \
 -  %D%/packages/patches/binutils-aarch64-symbol-relocation.patch       \
    %D%/packages/patches/binutils-loongson-workaround.patch     \
    %D%/packages/patches/blast+-fix-makefile.patch              \
    %D%/packages/patches/boost-fix-icu-build.patch              \
+   %D%/packages/patches/borg-respect-storage-quota.patch               \
    %D%/packages/patches/byobu-writable-status.patch            \
    %D%/packages/patches/cairo-CVE-2016-9082.patch                      \
 +  %D%/packages/patches/cairo-setjmp-wrapper.patch             \
    %D%/packages/patches/calibre-no-updates-dialog.patch                \
    %D%/packages/patches/calibre-use-packaged-feedparser.patch  \
    %D%/packages/patches/catdoc-CVE-2017-11110.patch            \