01/01: Merge remote-tracking branch 'origin/version-1.2.0' into master

[guix-commits]

apteryx pushed a commit to branch master
in repository guix.

commit 129b9b16d9b588316cc997cf8f4fefe30961a417
Merge: 5f9c92d 9113de2
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Tue Nov 17 18:00:28 2020 -0500

    Merge remote-tracking branch 'origin/version-1.2.0' into master
    
    Conflicts:
        gnu/packages/bioinformatics.scm
    
    The python-pysam package fixed in master was kept instead of the update done
    in the version-1.2.0 branch.

 .dir-locals.el                                |   1 -
 Makefile.am                                   |  23 ++--
 NEWS                                          |   4 +
 build-aux/update-guix-package.scm             |  73 ++++++++---
 doc/contributing.texi                         |  11 +-
 etc/guix-daemon.cil.in                        | 180 +++++++++++++++++++++++---
 gnu/local.mk                                  |   1 +
 gnu/packages/glib.scm                         |  14 +-
 gnu/packages/package-management.scm           |  16 ++-
 gnu/packages/patches/glib-appinfo-watch.patch |  92 +++++++++++++
 gnu/packages/python-web.scm                   |  33 +++--
 gnu/services/base.scm                         |  21 ++-
 guix/scripts/build.scm                        |   4 +-
 guix/scripts/pack.scm                         |   5 +
 guix/scripts/publish.scm                      |  28 +++-
 guix/scripts/pull.scm                         |   2 +-
 guix/self.scm                                 |  10 +-
 tests/build-utils.scm                         |   4 +-
 18 files changed, 431 insertions(+), 91 deletions(-)