Merge branch 'master' into staging

diff --cc doc/guix.texi
Simple merge

diff --cc gnu/local.mk
Simple merge

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

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

diff --cc gnu/packages/databases.scm
index a6c8179,79bc173..a831692
--- 1/gnu/packages/databases.scm
--- 2/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@@ -1307,8 -1323,7 +1307,7 @@@ organized in a hash table or B+ tree."
  
      (native-inputs `(("bc" ,bc)
                       ("bash:include" ,bash "include")
 -                     ("check" ,check)
 +                     ("check" ,check-0.14)
-                      ("libuuid" ,util-linux)
                       ("pkg-config" ,pkg-config)))
  
      ;; TODO: Add more optional inputs.

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

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

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

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

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

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

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

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

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

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