Merge branch 'master' into core-updates

diff --cc gnu/packages/base.scm
Simple merge

diff --cc gnu/packages/bioinformatics.scm
Simple merge

diff --cc gnu/packages/bootloaders.scm
Simple merge

diff --cc gnu/packages/check.scm
index dd54bca,1276c0f..1e2eabe
--- 1/gnu/packages/check.scm
--- 2/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@@ -49,7 -49,7 +49,8 @@@
    #:use-module (gnu packages autotools)
    #:use-module (gnu packages bash)
    #:use-module (gnu packages compression)
 +  #:use-module (gnu packages llvm)
+   #:use-module (gnu packages golang)
    #:use-module (gnu packages python)
    #:use-module (gnu packages python-web)
    #:use-module (gnu packages time)

diff --cc gnu/packages/databases.scm
Simple merge

diff --cc gnu/packages/emacs.scm
index faf4b13,9523f14..62cc916
--- 1/gnu/packages/emacs.scm
--- 2/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@@ -1,7 -1,7 +1,7 @@@
  ;;; GNU Guix --- Functional package management for GNU
  ;;; Copyright © 2014 Taylan Ulrich Bayirli/Kammer <taylanbayirli@gmail.com>
- ;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
+ ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
 -;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
 +;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver <mhw@netris.org>
  ;;; Copyright © 2014, 2015, 2016, 2017 Alex Kost <alezost@gmail.com>
  ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
  ;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net>

diff --cc gnu/packages/haskell.scm
Simple merge

diff --cc gnu/packages/linux.scm
Simple merge

diff --cc gnu/packages/machine-learning.scm
Simple merge

diff --cc gnu/packages/man.scm
Simple merge

diff --cc gnu/packages/maths.scm
Simple merge

diff --cc gnu/packages/multiprecision.scm
Simple merge

diff --cc gnu/packages/networking.scm
Simple merge

diff --cc gnu/packages/ocaml.scm
Simple merge

diff --cc gnu/packages/python-web.scm
Simple merge

diff --cc gnu/packages/python.scm
Simple merge