01/02: Merge branch 'master' into staging

[guix-commits]

mbakke pushed a commit to branch staging
in repository guix.

commit f339df425eb00cb8d9418b3a338d7e03afd4a09c
Merge: e21bd8d 7016e62
Author: Marius Bakke <address@hidden>
Date:   Wed Mar 6 16:31:58 2019 +0100

    Merge branch 'master' into staging

 gnu/artwork.scm                               |   4 +-
 gnu/build/linux-modules.scm                   |  29 ++-
 gnu/local.mk                                  |   1 +
 gnu/packages/admin.scm                        |   6 +-
 gnu/packages/bioconductor.scm                 |  26 +++
 gnu/packages/bioinformatics.scm               | 184 +++++++++++++----
 gnu/packages/emacs-xyz.scm                    |   4 +-
 gnu/packages/emacs.scm                        |   6 +-
 gnu/packages/fonts.scm                        |  47 ++---
 gnu/packages/games.scm                        |  19 +-
 gnu/packages/gimp.scm                         |   4 +-
 gnu/packages/gl.scm                           |   7 +-
 gnu/packages/gnome.scm                        |   8 +-
 gnu/packages/golang.scm                       |   4 +-
 gnu/packages/guile-xyz.scm                    |  57 ++++++
 gnu/packages/java.scm                         |  37 +++-
 gnu/packages/linux.scm                        | 178 +++++++++++------
 gnu/packages/man.scm                          |   4 +-
 gnu/packages/maths.scm                        |   4 +-
 gnu/packages/mpd.scm                          |   4 +-
 gnu/packages/patches/rust-1.30-gdb-llvm.patch |  89 +++++++++
 gnu/packages/perl.scm                         |  26 ++-
 gnu/packages/python-xyz.scm                   |   6 +-
 gnu/packages/ruby.scm                         | 166 ++++++++++++++-
 gnu/packages/rust.scm                         |  83 +++++++-
 gnu/packages/syncthing.scm                    |   4 +-
 gnu/packages/uml.scm                          |   7 +-
 gnu/packages/valgrind.scm                     |  16 +-
 gnu/packages/video.scm                        |  69 ++++++-
 gnu/packages/virtualization.scm               |  12 +-
 gnu/packages/vulkan.scm                       | 278 +++++++++++++-------------
 gnu/packages/wget.scm                         |  90 +++++----
 gnu/packages/xorg.scm                         |   4 +-
 33 files changed, 1089 insertions(+), 394 deletions(-)

diff --cc gnu/packages/gl.scm
index 8a336a5,08ba3c8..c3cb9ca
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@@ -8,8 -8,8 +8,8 @@@
  ;;; Copyright © 2016 David Thompson <address@hidden>
  ;;; Copyright © 2017, 2018 Efraim Flashner <address@hidden>
  ;;; Copyright © 2017 Arun Isaac <address@hidden>
 -;;; Copyright © 2017, 2018 Rutger Helling <address@hidden>
 +;;; Copyright © 2017, 2018, 2019 Rutger Helling <address@hidden>
- ;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
+ ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <address@hidden>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;