Merge branch 'staging' into core-updates

diff --cc gnu/local.mk
Simple merge

diff --cc gnu/packages/build-tools.scm
Simple merge

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

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

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

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

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

diff --cc gnu/packages/package-management.scm
Simple merge

diff --cc gnu/packages/patches/meson-for-build-rpath.patch
index 04c07d0,59249e2..ef9a73f
--- 1/gnu/packages/patches/meson-for-build-rpath.patch
--- 2/gnu/packages/patches/meson-for-build-rpath.patch
+++ b/gnu/packages/patches/meson-for-build-rpath.patch
@@@ -2,11 -2,10 +2,10 @@@ This patch removes a part of meson tha
  This will only be applied to a special version of meson, used for the
  meson-build-system.
  
- Patch for Meson 0.42.0 by Peter Mikkelsen <petermikkelsen10@gmail.com>
- Adjusted for Meson 0.47.1 by Ricardo Wurmus <rekado@elephly.net>
 -Patch by Peter Mikkelsen <petermikkelsen10@gmail.com>
++Original patch for Meson 0.42.0 by Peter Mikkelsen <petermikkelsen10@gmail.com>
  
 ---- meson-0.42.0/mesonbuild/minstall.py.orig  2017-09-09 01:49:39.147374148 +0200
 -+++ meson-0.42.0/mesonbuild/minstall.py       2017-09-09 01:51:01.209134717 +0200
 +--- meson-0.47.1/mesonbuild/minstall.py.old   2018-08-10 11:01:27.812327013 +0200
 ++++ meson-0.47.1/mesonbuild/minstall.py       2018-08-10 11:01:51.940368505 +0200
  @@ -436,15 +436,6 @@
                           print("Symlink creation does not work on this platform. "
                                 "Skipping all symlinking.")

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

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

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

diff --cc guix/build/meson-build-system.scm
index 9724764,80e5472..f6b8b49
--- 1/guix/build/meson-build-system.scm
--- 2/guix/build/meson-build-system.scm
+++ b/guix/build/meson-build-system.scm
@@@ -1,6 -1,6 +1,7 @@@
  ;;; GNU Guix --- Functional package management for GNU
  ;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com>
 +;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
+ ;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;