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

[Ricardo Wurmus]

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

commit ff9d1a2f0c9cc82ae4c73d8660a87829bae9bf30
Merge: 6f6db02 a01d926
Author: Ricardo Wurmus <address@hidden>
Date:   Sun Feb 18 00:37:46 2018 +0100

    Merge branch 'master' into core-updates

 etc/completion/bash/guix                           |  11 +-
 gnu/local.mk                                       |   1 +
 gnu/packages/bioinformatics.scm                    |   4 +-
 gnu/packages/emacs.scm                             |  72 +++
 gnu/packages/engineering.scm                       |   9 +-
 gnu/packages/games.scm                             |  82 ++-
 gnu/packages/gtk.scm                               |   8 +-
 gnu/packages/libffcall.scm                         |   6 +-
 gnu/packages/linux.scm                             |  10 +-
 gnu/packages/maths.scm                             |   4 +-
 .../patches/ruby-rubygems-276-for-ruby24.patch     | 605 +++++++++++++++++++++
 gnu/packages/pdf.scm                               |  13 +-
 gnu/packages/ruby.scm                              |   1 +
 gnu/packages/scheme.scm                            |   2 +-
 gnu/packages/version-control.scm                   |   6 +-
 gnu/packages/xorg.scm                              |   4 +-
 gnu/services/xorg.scm                              |   1 +
 17 files changed, 812 insertions(+), 27 deletions(-)

diff --cc gnu/packages/games.scm
index 51f158d,6424ede..a53d3ed
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@@ -30,9 -30,9 +30,9 @@@
  ;;; Copyright © 2017 nee <address@hidden>
  ;;; Copyright © 2017 Clément Lassieur <address@hidden>
  ;;; Copyright © 2017 Marius Bakke <address@hidden>
 -;;; Copyright © 2017 Rutger Helling <address@hidden>
 +;;; Copyright © 2017, 2018 Rutger Helling <address@hidden>
  ;;; Copyright © 2017 Roel Janssen <address@hidden>
- ;;; Copyright © 2017 Nicolas Goaziou <address@hidden>
+ ;;; Copyright © 2017, 2018 Nicolas Goaziou <address@hidden>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;
diff --cc gnu/packages/ruby.scm
index 409390b,90e3e4f..b15e1a2
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@@ -61,7 -61,7 +61,8 @@@
                             "/ruby-" version ".tar.xz"))
         (sha256
          (base32
 -         "0dgp4ypk3smrsbh2c249n5pl6nqhpd2igq9484dbsh81sf08k2kl"))
 +         "0l9bv67dgsphk42lmiskhrnh47hbyj6rfg2rcjx22xivpx07srr3"))
++       (patches (search-patches "ruby-rubygems-276-for-ruby24.patch"))
         (modules '((guix build utils)))
         (snippet `(begin
                     ;; Remove bundled libffi