01/01: Merge branch 'master' into staging

[guix-commits]

mbakke pushed a commit to branch staging
in repository guix.

commit d614f0bba90c86c836131eea3ebb9cbd30f19abf
Merge: 7fe9627 20c8713
Author: Marius Bakke <address@hidden>
AuthorDate: Fri Feb 28 19:07:46 2020 +0100

    Merge branch 'master' into staging

 gnu/packages/android.scm                   |   66 +-
 gnu/packages/aux-files/emacs/guix-emacs.el |    5 +-
 gnu/packages/bioinformatics.scm            |   50 +-
 gnu/packages/bootloaders.scm               |   15 +-
 gnu/packages/crates-io.scm                 | 1783 ++++++++++++++++++++++++++--
 gnu/packages/emacs-xyz.scm                 |  131 +-
 gnu/packages/emacs.scm                     |   49 +-
 gnu/packages/engineering.scm               |  296 +++--
 gnu/packages/firmware.scm                  |   12 +-
 gnu/packages/freedesktop.scm               |   43 +-
 gnu/packages/gnome-xyz.scm                 |  159 ++-
 gnu/packages/gnuzilla.scm                  |   18 +-
 gnu/packages/guile-xyz.scm                 |   36 +-
 gnu/packages/haskell-apps.scm              |    4 +-
 gnu/packages/linux.scm                     |   30 +-
 gnu/packages/mail.scm                      |    2 +-
 gnu/packages/package-management.scm        |    6 +-
 gnu/packages/python-xyz.scm                |    4 +-
 gnu/packages/terminals.scm                 |  182 +++
 gnu/packages/tls.scm                       |    4 +-
 gnu/packages/web.scm                       |   69 +-
 guix/build/copy-build-system.scm           |    8 +-
 guix/build/emacs-build-system.scm          |   22 +-
 guix/build/emacs-utils.scm                 |   10 +-
 guix/scripts.scm                           |   12 +-
 guix/scripts/describe.scm                  |   15 +-
 guix/scripts/package.scm                   |    7 +-
 guix/ui.scm                                |    2 +-
 tests/swh.scm                              |   10 +-
 29 files changed, 2583 insertions(+), 467 deletions(-)

diff --cc gnu/packages/linux.scm
index 10e27dc,9f2a818..b95aec9
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@@ -36,9 -36,10 +36,10 @@@
  ;;; Copyright © 2019, 2020 Maxim Cournoyer <address@hidden>
  ;;; Copyright © 2019 Stefan Stefanović <address@hidden>
  ;;; Copyright © 2019 Pierre Langlois <address@hidden>
 -;;; Copyright © 2019 Brice Waegeneire <address@hidden>
 +;;; Copyright © 2019, 2020 Brice Waegeneire <address@hidden>
  ;;; Copyright © 2019 Kei Kebreau <address@hidden>
  ;;; Copyright © 2020 Oleg Pykhalov <address@hidden>
+ ;;; Copyright © 2020 Pierre Neidhardt <address@hidden>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;